mirror of
https://github.com/php/php-src.git
synced 2024-11-23 18:04:36 +08:00
Merge branch 'PHP-7.4'
* PHP-7.4: Remove redundant variable rv and optimize code
This commit is contained in:
commit
742aaaa150
@ -972,7 +972,7 @@ ZEND_API ZEND_COLD void zend_exception_error(zend_object *ex, int severity) /* {
|
||||
zend_class_entry *ce_exception;
|
||||
|
||||
ZVAL_OBJ(&exception, ex);
|
||||
ce_exception = Z_OBJCE(exception);
|
||||
ce_exception = ex->ce;
|
||||
EG(exception) = NULL;
|
||||
if (ce_exception == zend_ce_parse_error || ce_exception == zend_ce_compile_error) {
|
||||
zend_string *message = zval_get_string(GET_PROPERTY(&exception, ZEND_STR_MESSAGE));
|
||||
@ -986,7 +986,7 @@ ZEND_API ZEND_COLD void zend_exception_error(zend_object *ex, int severity) /* {
|
||||
zend_string_release_ex(file, 0);
|
||||
zend_string_release_ex(message, 0);
|
||||
} else if (instanceof_function(ce_exception, zend_ce_throwable)) {
|
||||
zval tmp, rv;
|
||||
zval tmp;
|
||||
zend_string *str, *file = NULL;
|
||||
zend_long line = 0;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user