diff options
| author | Anatol Belski <ab@php.net> | 2014-12-15 13:57:43 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-15 13:57:43 +0100 |
| commit | f62ad3bc578eb7a5494b7816f31dc31227483aed (patch) | |
| tree | bd0302ba9597655058c1526cfed29cba1df83601 /Zend/zend_vm_execute.h | |
| parent | dba27372ec59af3f0ecc02b264b9c3a620b1a5bf (diff) | |
| parent | 178363cbff9cc2366b75eb11fd61473da238f7c6 (diff) | |
| download | php-git-f62ad3bc578eb7a5494b7816f31dc31227483aed.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
made the apache ini holders to be zend_bool
Removed useless local variable
Use simpler functions
Fixed test
small fixes to UPGRADING
Reorder to save alignment size (of course, only for common used structs)
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 5b1d22edcc..d245738c4e 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; |