com php-src: Remove redundant variable rv and optimize code: Zend/zend_exceptions.c
| From: | Nikita Popov | Date: | Mon, 28 Oct 2019 10:42:45 +0000 |
| Subject: | com php-src: Remove redundant variable rv and optimize code: Zend/zend_exceptions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-109082@lists.php.net to get a copy of this message | ||
Commit: 99c84cd92aabbb4cfea585346242ff3e40941cc0
Author: ZiMuyang <yuanhualong666@gmail.com> Sun, 27 Oct 2019 23:21:31 +0800
Committer: Nikita Popov <nikita.ppv@gmail.com> Mon, 28 Oct 2019 11:42:45 +0100
Parents: 1ddda13d846936fb625823778d14df68158d0e56
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=99c84cd92aabbb4cfea585346242ff3e40941cc0
Log:
Remove redundant variable rv and optimize code
Closes GH-4864.
Changed paths:
M Zend/zend_exceptions.c
Diff:
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index ecd946a06ec..8672ed8e003 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -979,7 +979,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));
@@ -992,7 +992,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;