com php-src: Attempt to fix bug35437.phpt fails: Zend/zend_vm _def.h Zend/zend_vm_execute.h

Commit: 16d6dfddef5ac43de3b20ffa7818d5b11f4e6a4b Author: Xinchen Hui <laruence@php.net> Tue, 28 Jul 2015 11:06:52 +0800 Parents: 11613a1b58a5a890ddc99d81cefc6fdced8f1af8 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=16d6dfddef5ac43de3b20ffa7818d5b11f4e6a4b Log: Attempt to fix bug35437.phpt fails Bugs: https://bugs.php.net/35437 Changed paths: M Zend/zend_vm_def.h M Zend/zend_vm_execute.h Diff: diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index ce5d520..9273333 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 da2eead..3f800b1 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(); } }