File tree 2 files changed +31
-3
lines changed
2 files changed +31
-3
lines changed Original file line number Diff line number Diff line change @@ -3344,10 +3344,18 @@ static zend_always_inline zend_result _zend_update_type_info(
3344
3344
zend_uchar opcode ;
3345
3345
3346
3346
if (!ssa_opcodes ) {
3347
- ZEND_ASSERT (j == (opline - op_array -> opcodes ) + 1 && "Use must be in next opline" );
3347
+ if (j != (opline - op_array -> opcodes ) + 1 ) {
3348
+ /* Use must be in next opline */
3349
+ tmp |= key_type | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF ;
3350
+ break ;
3351
+ }
3348
3352
opcode = op_array -> opcodes [j ].opcode ;
3349
3353
} else {
3350
- ZEND_ASSERT (ssa_opcodes [j ] == opline + 1 && "Use must be in next opline" );
3354
+ if (ssa_opcodes [j ] != opline + 1 ) {
3355
+ /* Use must be in next opline */
3356
+ tmp |= key_type | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF ;
3357
+ break ;
3358
+ }
3351
3359
opcode = ssa_opcodes [j ]-> opcode ;
3352
3360
}
3353
3361
switch (opcode ) {
@@ -3409,7 +3417,10 @@ static zend_always_inline zend_result _zend_update_type_info(
3409
3417
EMPTY_SWITCH_DEFAULT_CASE ()
3410
3418
}
3411
3419
j = zend_ssa_next_use (ssa -> ops , ssa_op -> result_def , j );
3412
- ZEND_ASSERT (j < 0 && "There should only be one use" );
3420
+ if (j >= 0 ) {
3421
+ tmp |= key_type | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF ;
3422
+ break ;
3423
+ }
3413
3424
}
3414
3425
}
3415
3426
if (((tmp & MAY_BE_ARRAY ) && (tmp & MAY_BE_ARRAY_KEY_ANY ))
Original file line number Diff line number Diff line change
1
+ --TEST--
2
+ Type inference 022: FETCH_DIM_W
3
+ --INI--
4
+ opcache.enable=1
5
+ opcache.enable_cli=1
6
+ opcache.optimization_level=-1
7
+ --FILE--
8
+ <?php
9
+ function &foo (&$ a , $ n ) {
10
+ foreach (array (0 ) as $ _ ) {
11
+ return $ a [$ n ];
12
+ }
13
+ }
14
+ ?>
15
+ DONE
16
+ --EXPECT--
17
+ DONE
You can’t perform that action at this time.
0 commit comments