mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix cache slot assignment for ASSIGN_OBJ_OP

Browse Source 
ASSIGN_OBJ_OP stores the cache slot in OP_DATA, so this ended up
overwriting the binop opcode instread.
This commit is contained in:
Nikita Popov 2021-09-30 14:32:49 +02:00
parent 512dfaba3a
commit d0860f67ca
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Zend/tests/assign_obj_op_cache_slot.phpt Normal file
View File

@ -0,0 +1,14 @@
--TEST--
The ASSIGN_OBJ_OP cache slot is on the OP_DATA opcode
--FILE--
<?php
function test($a) {
$b = "x";
$a->$b = 1;
$a->$b &= 1;
var_dump($a->$b);
}
test(new stdClass);
?>
--EXPECT--
int(1)

7
ext/opcache/Optimizer/zend_optimizer.c
View File

@ -451,11 +451,16 @@ int zend_optimizer_update_op2_const(zend_op_array *op_array,
case ZEND_PRE_DEC_OBJ:
case ZEND_POST_INC_OBJ:
case ZEND_POST_DEC_OBJ:
case ZEND_ASSIGN_OBJ_OP:
TO_STRING_NOWARN(val);
opline->op2.constant = zend_optimizer_add_literal(op_array, val);
opline->extended_value = alloc_cache_slots(op_array, 3);
break;
case ZEND_ASSIGN_OBJ_OP:
TO_STRING_NOWARN(val);
opline->op2.constant = zend_optimizer_add_literal(op_array, val);
ZEND_ASSERT((opline + 1)->opcode == ZEND_OP_DATA);
(opline + 1)->extended_value = alloc_cache_slots(op_array, 3);
break;
case ZEND_ISSET_ISEMPTY_PROP_OBJ:
TO_STRING_NOWARN(val);
opline->op2.constant = zend_optimizer_add_literal(op_array, val);