From: ZiMuyang <yuanhualong666@gmail.com>
Date: Sun, 27 Oct 2019 15:21:31 +0000 (+0800)
Subject: Remove redundant variable rv and optimize code
X-Git-Tag: php-7.4.0RC5~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99c84cd92aabbb4cfea585346242ff3e40941cc0;p=php

Remove redundant variable rv and optimize code

Closes GH-4864.
---

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index ecd946a06e..8672ed8e00 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;