summaryrefslogtreecommitdiff
path: root/Zend/zend_vm_execute.h
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-12-15 14:43:30 +0300
committerDmitry Stogov <dmitry@zend.com>2014-12-15 14:43:30 +0300
commit44ae32ad55b9ceee9eb980edefcc62df6cff3eef (patch)
treeaec0dbea746d0b2c23d3bccff702bedb34cad0e2 /Zend/zend_vm_execute.h
parentdd01ade999b494b756402ad603b231e8af5dd7b5 (diff)
downloadphp-git-44ae32ad55b9ceee9eb980edefcc62df6cff3eef.tar.gz
Removed useless local variable
Diffstat (limited to 'Zend/zend_vm_execute.h')
-rw-r--r--Zend/zend_vm_execute.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 038953ccd4..d459461169 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;