diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-01-31 18:15:25 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-01-31 18:15:25 +0300 |
| commit | 9c7fb529ce724afcdfcd10705cdb0515b33bf84b (patch) | |
| tree | 91112660b26d2d70912f35b6b8139e13b1a77232 /Zend/zend_vm_execute.h | |
| parent | f67f455ef70c2cffcf8c14c0172ba57126221eff (diff) | |
| download | php-git-9c7fb529ce724afcdfcd10705cdb0515b33bf84b.tar.gz | |
Changed FETCH_CONSTANT instruction format (extended_value moved into op1)
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 5c694e4fea..1277156fdf 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -33271,10 +33271,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_CONSTANT_SPEC_UNUSED_CON if (EXPECTED(CACHED_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op2))))) { c = CACHED_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op2))); - } else if ((c = zend_quick_get_constant(RT_CONSTANT(opline, opline->op2) + 1, opline->extended_value)) == NULL) { + } else if ((c = zend_quick_get_constant(RT_CONSTANT(opline, opline->op2) + 1, opline->op1.num)) == NULL) { SAVE_OPLINE(); - if ((opline->extended_value & IS_CONSTANT_UNQUALIFIED) != 0) { + if ((opline->op1.num & IS_CONSTANT_UNQUALIFIED) != 0) { char *actual = (char *)zend_memrchr(Z_STRVAL_P(RT_CONSTANT(opline, opline->op2)), '\\', Z_STRLEN_P(RT_CONSTANT(opline, opline->op2))); if (!actual) { ZVAL_STR_COPY(EX_VAR(opline->result.var), Z_STR_P(RT_CONSTANT(opline, opline->op2))); |