From: Xinchen Hui Date: Tue, 28 Jul 2015 06:54:20 +0000 (+0800) Subject: Revert "Attempt to fix bug35437.phpt fails" X-Git-Tag: php-7.0.0beta3~5^2~85 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df23dd78a5e6c62d20789eb477d637e989c0d024;p=php Revert "Attempt to fix bug35437.phpt fails" This reverts commit 16d6dfddef5ac43de3b20ffa7818d5b11f4e6a4b. --- diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 9273333117..ce5d520aa2 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -3096,8 +3096,8 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, CONST|VAR, CONST|TMPVAR|UNUSE zend_ce_error, "Non-static method %s::%s() cannot be called statically", ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name)); + HANDLE_EXCEPTION(); } - HANDLE_EXCEPTION(); } } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 3f800b120d..da2eeada13 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -5663,8 +5663,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C zend_ce_error, "Non-static method %s::%s() cannot be called statically", ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name)); + HANDLE_EXCEPTION(); } - HANDLE_EXCEPTION(); } }