Reverted "Rebind closure when binding to property"

Author: dstogov

Zend/tests/closure_034.phpt

@@ -118,26 +118,6 @@ ZEND_API zval* zend_get_closure_this_ptr(zval *obj TSRMLS_DC) /* {{{ */
 }
 /* }}} */
 
-ZEND_API zval* zend_closure_copy(zval *closure_obj, zval *this_ptr TSRMLS_DC) /* {{{ */
-{
-	zend_closure *closure;
-
-	zval_copy_ctor(closure_obj);
-	closure = (zend_closure *)zend_object_store_get_object(closure_obj TSRMLS_CC);
-	if (closure->this_ptr) {
-		zval_ptr_dtor(&closure->this_ptr);
-	}
-	closure->this_ptr = this_ptr;
-	if (this_ptr) {
-		Z_ADDREF_P(this_ptr);
-		closure->func.common.scope = Z_OBJCE_P(this_ptr);
-	} else {
-		closure->func.common.scope = NULL;
-	}
-	return closure_obj;
-}
-/* }}} */
-
 static zend_function *zend_closure_get_method(zval **object_ptr, char *method_name, int method_len TSRMLS_DC) /* {{{ */
 {
 	char *lc_name;

Zend/tests/closure_035.phpt

@@ -35,7 +35,6 @@ ZEND_API int zend_get_closure(zval *obj, zend_class_entry **ce_ptr, zend_functio
 ZEND_API zend_function *zend_get_closure_invoke_method(zval *obj TSRMLS_DC);
 ZEND_API const zend_function *zend_get_closure_method_def(zval *obj TSRMLS_DC);
 ZEND_API zval* zend_get_closure_this_ptr(zval *obj TSRMLS_DC);
-ZEND_API zval* zend_closure_copy(zval *closure, zval *this_ptr TSRMLS_DC);
 
 END_EXTERN_C()
 

Zend/tests/closure_036.phpt

@@ -405,10 +405,6 @@ static void zend_std_write_property(zval *object, zval *member, zval *value TSRM
 		member = tmp_member;
 	}
 
-	if (value && Z_TYPE_P(value) == IS_OBJECT && Z_OBJCE_P(value) == zend_ce_closure && zend_get_closure_this_ptr(value TSRMLS_CC) != object) {
-		value = zend_closure_copy(value, object TSRMLS_CC);
-	}
-
 	property_info = zend_get_property_info(zobj->ce, member, (zobj->ce->__set != NULL) TSRMLS_CC);
 
 	if (property_info && zend_hash_quick_find(zobj->properties, property_info->name, property_info->name_length+1, property_info->h, (void **) &variable_ptr) == SUCCESS) {