com php-src: Revert "Attempt to fix bug35437.phpt fails": Zend/zend_vm_def.h Zend/zend_vm_execute.h
| From: | Xinchen Hui | Date: | Tue, 28 Jul 2015 06:54:20 +0000 |
| Subject: | com php-src: Revert "Attempt to fix bug35437.phpt fails": Zend/zend_vm_def.h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88196@lists.php.net to get a copy of this message | ||
Commit: df23dd78a5e6c62d20789eb477d637e989c0d024
Author: Xinchen Hui <laruence@php.net> Tue, 28 Jul 2015 14:54:20 +0800
Parents: ef04c5c584d7eb7b0c9cdc7219945120d0192589
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=df23dd78a5e6c62d20789eb477d637e989c0d024
Log:
Revert "Attempt to fix bug35437.phpt fails"
This reverts commit 16d6dfddef5ac43de3b20ffa7818d5b11f4e6a4b.
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 9273333..ce5d520 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 3f800b1..da2eead 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();
}
}