diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-07-01 15:50:53 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-07-01 15:50:53 +0300 |
| commit | 39a0854307cd63685b2fe158207727a2b8c06cd7 (patch) | |
| tree | b98c5528848b93b03db1aa4cc3af9f2fe143546f | |
| parent | 30c1c53164f8546f906f7200840c4af48f246701 (diff) | |
| download | php-git-39a0854307cd63685b2fe158207727a2b8c06cd7.tar.gz | |
Fixed GOTO VM
| -rw-r--r-- | Zend/zend_vm_def.h | 6 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index a5e888a1b4..bf799f5684 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -830,12 +830,12 @@ ZEND_VM_COLD_HELPER(zend_this_not_in_object_context_helper, ANY, ANY) HANDLE_EXCEPTION(); } -ZEND_VM_COLD_HELPER(zend_abstract_method_helper, ANY, ANY, zend_function *fbc) +ZEND_VM_COLD_HELPER(zend_abstract_method_helper, ANY, ANY, zend_function *func) { USE_OPLINE SAVE_OPLINE(); - zend_throw_error(NULL, "Cannot call abstract method %s::%s()", ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name)); + zend_throw_error(NULL, "Cannot call abstract method %s::%s()", ZSTR_VAL(func->common.scope->name), ZSTR_VAL(func->common.function_name)); UNDEF_RESULT(); HANDLE_EXCEPTION(); } @@ -3936,7 +3936,7 @@ ZEND_VM_HOT_HANDLER(60, ZEND_DO_FCALL, ANY, ANY, SPEC(RETVAL)) EX(call) = call->prev_execute_data; if (UNEXPECTED((fbc->common.fn_flags & (ZEND_ACC_ABSTRACT|ZEND_ACC_DEPRECATED)) != 0)) { if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_ABSTRACT) != 0)) { - ZEND_VM_DISPATCH_TO_HELPER(zend_abstract_method_helper, fbc, fbc); + ZEND_VM_DISPATCH_TO_HELPER(zend_abstract_method_helper, func, fbc); } else { zend_deprecated_function(fbc); if (UNEXPECTED(EG(exception) != NULL)) { diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index addf769b8a..468cf4fc5c 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -460,12 +460,12 @@ static zend_never_inline ZEND_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_th HANDLE_EXCEPTION(); } -static zend_never_inline ZEND_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_abstract_method_helper_SPEC(zend_function *fbc ZEND_OPCODE_HANDLER_ARGS_DC) +static zend_never_inline ZEND_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_abstract_method_helper_SPEC(zend_function *func ZEND_OPCODE_HANDLER_ARGS_DC) { USE_OPLINE SAVE_OPLINE(); - zend_throw_error(NULL, "Cannot call abstract method %s::%s()", ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name)); + zend_throw_error(NULL, "Cannot call abstract method %s::%s()", ZSTR_VAL(func->common.scope->name), ZSTR_VAL(func->common.function_name)); UNDEF_RESULT(); HANDLE_EXCEPTION(); } |