com php-src: Removed useless local variable: Zend/zend_vm_d ef.h Zend/zend_vm_execute.h
| From: | Dmitry Stogov | Date: | Mon, 15 Dec 2014 11:43:30 +0000 |
| Subject: | com php-src: Removed useless local variable: Zend/zend_vm_d ef.h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83703@lists.php.net to get a copy of this message | ||
Commit: 44ae32ad55b9ceee9eb980edefcc62df6cff3eef
Author: Dmitry Stogov <dmitry@zend.com> Mon, 15 Dec 2014 14:43:30 +0300
Parents: dd01ade999b494b756402ad603b231e8af5dd7b5
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=44ae32ad55b9ceee9eb980edefcc62df6cff3eef
Log:
Removed useless local variable
Changed paths:
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 0bf218d..b947479 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 038953c..d459461 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;