From 44ae32ad55b9ceee9eb980edefcc62df6cff3eef Mon Sep 17 00:00:00 2001
From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 15 Dec 2014 14:43:30 +0300
Subject: [PATCH] Removed useless local variable

---
 Zend/zend_vm_def.h     | 6 ++----
 Zend/zend_vm_execute.h | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 0bf218d5816..b9474793fbc 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2771,11 +2771,9 @@ ZEND_VM_HANDLER(60, ZEND_DO_FCALL, ANY, ANY)
 	LOAD_OPLINE();
 
 	if (UNEXPECTED(fbc->type == ZEND_INTERNAL_FUNCTION)) {
-		int should_change_scope = 0;
 		zval *ret;
 
 		if (fbc->common.scope) {
-			should_change_scope = 1;
 			/* TODO: we don't set scope if we call an object method ??? */
 			/* See: ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt */
 #if 1
@@ -2806,7 +2804,7 @@ ZEND_VM_HANDLER(60, ZEND_DO_FCALL, ANY, ANY)
 				if (RETURN_VALUE_USED(opline)) {
 					ZVAL_UNDEF(EX_VAR(opline->result.var));
 				}
-				if (UNEXPECTED(should_change_scope)) {
+				if (UNEXPECTED(fbc->common.scope)) {
 					ZEND_VM_C_GOTO(fcall_end_change_scope);
 				} else {
 					ZEND_VM_C_GOTO(fcall_end);
@@ -2832,7 +2830,7 @@ ZEND_VM_HANDLER(60, ZEND_DO_FCALL, ANY, ANY)
 			zval_ptr_dtor(ret);
 		}
 
-		if (UNEXPECTED(should_change_scope)) {
+		if (UNEXPECTED(fbc->common.scope)) {
 			ZEND_VM_C_GOTO(fcall_end_change_scope);
 		} else {
 			ZEND_VM_C_GOTO(fcall_end);
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 038953ccd43..d4594611699 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -513,11 +513,9 @@ static int ZEND_FASTCALL  ZEND_DO_FCALL_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 	LOAD_OPLINE();
 
 	if (UNEXPECTED(fbc->type == ZEND_INTERNAL_FUNCTION)) {
-		int should_change_scope = 0;
 		zval *ret;
 
 		if (fbc->common.scope) {
-			should_change_scope = 1;
 			/* TODO: we don't set scope if we call an object method ??? */
 			/* See: ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt */
 #if 1
@@ -548,7 +546,7 @@ static int ZEND_FASTCALL  ZEND_DO_FCALL_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 				if (RETURN_VALUE_USED(opline)) {
 					ZVAL_UNDEF(EX_VAR(opline->result.var));
 				}
-				if (UNEXPECTED(should_change_scope)) {
+				if (UNEXPECTED(fbc->common.scope)) {
 					goto fcall_end_change_scope;
 				} else {
 					goto fcall_end;
@@ -574,7 +572,7 @@ static int ZEND_FASTCALL  ZEND_DO_FCALL_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 			zval_ptr_dtor(ret);
 		}
 
-		if (UNEXPECTED(should_change_scope)) {
+		if (UNEXPECTED(fbc->common.scope)) {
 			goto fcall_end_change_scope;
 		} else {
 			goto fcall_end;