diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-28 11:42:57 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-28 11:42:57 +0100 |
| commit | 742aaaa150952221cffece991a346f2c3166fcd2 (patch) | |
| tree | da414674d22ab18d7460e087fa821efe2b65796b /Zend/zend_exceptions.c | |
| parent | e7ff590d0d3306e513abc6ace58cb3dbd9ac077d (diff) | |
| parent | 99c84cd92aabbb4cfea585346242ff3e40941cc0 (diff) | |
| download | php-git-742aaaa150952221cffece991a346f2c3166fcd2.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove redundant variable rv and optimize code
Diffstat (limited to 'Zend/zend_exceptions.c')
| -rw-r--r-- | Zend/zend_exceptions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index eb248b1ff2..19ec415c73 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -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; |