diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-07-23 10:52:00 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-07-23 10:52:00 +0300 |
| commit | afc82e243cb7637e2fe0ef21fce736687c615ea2 (patch) | |
| tree | 0e5baf43b2125258d1eba76a98ee9f83fd32c744 | |
| parent | 850c67e957cf9df61769fdadd2337e3332bee186 (diff) | |
| download | php-git-afc82e243cb7637e2fe0ef21fce736687c615ea2.tar.gz | |
Micro-optimization
| -rw-r--r-- | Zend/zend_execute.c | 8 | ||||
| -rw-r--r-- | Zend/zend_vm_def.h | 2 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 6abdc4c2ca..f57f2229f3 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -3390,13 +3390,13 @@ static zend_never_inline void ZEND_FASTCALL zend_quick_get_constant( const zval *key, uint32_t flags OPLINE_DC EXECUTE_DATA_DC) /* {{{ */ { _zend_quick_get_constant(key, flags, 0 OPLINE_CC EXECUTE_DATA_CC); -} +} /* }}} */ static zend_never_inline int ZEND_FASTCALL zend_quick_check_constant( - const zval *key, uint32_t flags OPLINE_DC EXECUTE_DATA_DC) /* {{{ */ + const zval *key OPLINE_DC EXECUTE_DATA_DC) /* {{{ */ { - return _zend_quick_get_constant(key, flags, 1 OPLINE_CC EXECUTE_DATA_CC); -} + return _zend_quick_get_constant(key, 0, 1 OPLINE_CC EXECUTE_DATA_CC); +} /* }}} */ #ifdef ZEND_VM_TRACE_HANDLERS # include "zend_vm_trace_handlers.h" diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 9497ac826d..51d4bb1e1e 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -7589,7 +7589,7 @@ ZEND_VM_HOT_HANDLER(122, ZEND_DEFINED, CONST, ANY, CACHE_SLOT) break; } } - if (zend_quick_check_constant(RT_CONSTANT(opline, opline->op1), ZEND_GET_CONSTANT_NO_DEPRECATION_CHECK OPLINE_CC EXECUTE_DATA_CC) != SUCCESS) { + if (zend_quick_check_constant(RT_CONSTANT(opline, opline->op1) OPLINE_CC EXECUTE_DATA_CC) != SUCCESS) { CACHE_PTR(opline->extended_value, ENCODE_SPECIAL_CACHE_NUM(zend_hash_num_elements(EG(zend_constants)))); result = 0; } else { diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 2ef6b42b3f..e279aca674 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -3883,7 +3883,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DEFINED_SPEC_CONST break; } } - if (zend_quick_check_constant(RT_CONSTANT(opline, opline->op1), ZEND_GET_CONSTANT_NO_DEPRECATION_CHECK OPLINE_CC EXECUTE_DATA_CC) != SUCCESS) { + if (zend_quick_check_constant(RT_CONSTANT(opline, opline->op1) OPLINE_CC EXECUTE_DATA_CC) != SUCCESS) { CACHE_PTR(opline->extended_value, ENCODE_SPECIAL_CACHE_NUM(zend_hash_num_elements(EG(zend_constants)))); result = 0; } else { |