Removed useless local variable

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 0bf218d581603d62510852c62fe46e4f0eda7267..b9474793fbc0ae5cf5924c110eab07dde3dfb85b 100644 (file)
--- 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 038953ccd43761caba21150e83e96e68472dedde..d459461169937723fc48aef17e5f03eb064db61d 100644 (file)
--- 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;