From: Nikita Popov <nikic@php.net>
Date: Sat, 29 Oct 2016 15:11:55 +0000 (+0200)
Subject: Drop dead code in zend_call_method
X-Git-Tag: php-7.2.0alpha1~1012
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=edde9293516d6b9ec40358fb23091e0a166bfe6b;p=php

Drop dead code in zend_call_method

As no_separation=1 is used this can not happen anymore.
---

diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c
index 8264cddc32..6eb4e17866 100644
--- a/Zend/zend_interfaces.c
+++ b/Zend/zend_interfaces.c
@@ -36,8 +36,6 @@ ZEND_API zval* zend_call_method(zval *object, zend_class_entry *obj_ce, zend_fun
 	int result;
 	zend_fcall_info fci;
 	zval retval;
-	HashTable *function_table;
-
 	zval params[2];
 
 	if (param_count > 0) {
@@ -109,13 +107,6 @@ ZEND_API zval* zend_call_method(zval *object, zend_class_entry *obj_ce, zend_fun
 			zend_error_noreturn(E_CORE_ERROR, "Couldn't execute method %s%s%s", obj_ce ? ZSTR_VAL(obj_ce->name) : "", obj_ce ? "::" : "", function_name);
 		}
 	}
-	/* copy arguments back, they might be changed by references */
-	if (param_count > 0 && Z_ISREF(params[0]) && !Z_ISREF_P(arg1)) {
-		ZVAL_COPY_VALUE(arg1, &params[0]);
-	}
-	if (param_count > 1 && Z_ISREF(params[1]) && !Z_ISREF_P(arg2)) {
-		ZVAL_COPY_VALUE(arg2, &params[1]);
-	}
 	if (!retval_ptr) {
 		zval_ptr_dtor(&retval);
 		return NULL;