Remove wrong commit committed by accident

laruence · laruence · commit aa63449b6e1b · 2015-03-03T18:29:26.000+08:00
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -3173,7 +3173,6 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zend_object *object, uint
 				}
 				return 1;
 			}
-			/* break missing intentionally */
 			if (callable_name) {
 				*callable_name = zval_get_string(callable);
 			}
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -2735,10 +2735,6 @@ ZEND_VM_HANDLER(118, ZEND_INIT_USER_CALL, CONST, CONST|TMPVAR|CV)
 	zend_class_entry *called_scope;
 	zend_object *object;
 
-	if (OP2_TYPE & (IS_VAR|IS_CV)) {
-		ZVAL_DEREF(function_name);
-	}
-
 	if (zend_is_callable_ex(function_name, NULL, 0, NULL, &fcc, &error)) {
 		if (error) {
 			efree(error);
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -4587,10 +4587,6 @@ static int ZEND_FASTCALL  ZEND_INIT_USER_CALL_SPEC_CONST_CONST_HANDLER(ZEND_OPCO
 	zend_class_entry *called_scope;
 	zend_object *object;
 
-	if (IS_CONST & (IS_VAR|IS_CV)) {
-		ZVAL_DEREF(function_name);
-	}
-
 	if (zend_is_callable_ex(function_name, NULL, 0, NULL, &fcc, &error)) {
 		if (error) {
 			efree(error);
@@ -7496,10 +7492,6 @@ static int ZEND_FASTCALL  ZEND_INIT_USER_CALL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_
 	zend_class_entry *called_scope;
 	zend_object *object;
 
-	if (IS_CV & (IS_VAR|IS_CV)) {
-		ZVAL_DEREF(function_name);
-	}
-
 	if (zend_is_callable_ex(function_name, NULL, 0, NULL, &fcc, &error)) {
 		if (error) {
 			efree(error);
@@ -8654,10 +8646,6 @@ static int ZEND_FASTCALL  ZEND_INIT_USER_CALL_SPEC_CONST_TMPVAR_HANDLER(ZEND_OPC
 	zend_class_entry *called_scope;
 	zend_object *object;
 
-	if ((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_CV)) {
-		ZVAL_DEREF(function_name);
-	}
-
 	if (zend_is_callable_ex(function_name, NULL, 0, NULL, &fcc, &error)) {
 		if (error) {
 			efree(error);

Original file line number	Diff line number	Diff line change
`@@ -3173,7 +3173,6 @@ ZEND_API zend_bool zend_is_callable_ex(zval callable, zend_object object, uint`
`3173`	`3173`	`}`
`3174`	`3174`	`return 1;`
`3175`	`3175`	`}`
`3176`		`- /* break missing intentionally */`
`3177`	`3176`	`if (callable_name) {`
`3178`	`3177`	`*callable_name = zval_get_string(callable);`
`3179`	`3178`	`}`