diff options
| author | Xinchen Hui <laruence@php.net> | 2015-03-03 18:29:26 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-03-03 18:29:26 +0800 |
| commit | aa63449b6e1b7c3cf82ae7a65be01580525643af (patch) | |
| tree | 9547ccc066e0105383c1a69c91630dec5abc9a2f | |
| parent | 2702739ceb384f9254aa182b237d0d3bf4d65ebd (diff) | |
| download | php-git-aa63449b6e1b7c3cf82ae7a65be01580525643af.tar.gz | |
Remove wrong commit committed by accident
| -rw-r--r-- | Zend/zend_API.c | 1 | ||||
| -rw-r--r-- | Zend/zend_vm_def.h | 4 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 12 |
3 files changed, 0 insertions, 17 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 88687796cc..3a6dbe5058 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -3173,7 +3173,6 @@ again: } 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 index 497f76d666..2e9ffd6448 100644 --- 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 index c4bd7b7d0a..465ecc6dd4 100644 --- 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); |