Skip to content

Commit e48d9e8

Browse files
committed
Hide (packed) hint for ZEND_INIT_ARRAY with op1=UNUSED
Fixes GH-20978
1 parent 0caebcd commit e48d9e8

6 files changed

Lines changed: 6 additions & 6 deletions

Zend/Optimizer/zend_dump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ ZEND_API void zend_dump_op(const zend_op_array *op_array, const zend_basic_block
618618
}
619619
if (ZEND_VM_EXT_ARRAY_INIT & flags) {
620620
fprintf(stderr, " %u", opline->extended_value >> ZEND_ARRAY_SIZE_SHIFT);
621-
if (!(opline->extended_value & ZEND_ARRAY_NOT_PACKED)) {
621+
if (opline->op1_type != IS_UNUSED && !(opline->extended_value & ZEND_ARRAY_NOT_PACKED)) {
622622
fprintf(stderr, " (packed)");
623623
}
624624
}

ext/standard/tests/array/array_map_foreach_optimization_001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ $_main:
3131
0003 V2 = DO_ICALL
3232
0004 ASSIGN CV0($array) V2
3333
0005 TYPE_ASSERT 131079 string("array_map") CV0($array)
34-
0006 T2 = INIT_ARRAY 0 (packed) NEXT
34+
0006 T2 = INIT_ARRAY 0 NEXT
3535
0007 V3 = FE_RESET_R CV0($array) 0014
3636
0008 T5 = FE_FETCH_R V3 T4 0014
3737
0009 INIT_FCALL 1 %d string("plus1")

ext/standard/tests/array/array_map_foreach_optimization_002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ $_main:
3737
0006 SEND_VAR%S CV0($array) 1
3838
0007 DO_FCALL
3939
0008 TYPE_ASSERT 131079 string("array_map") V5
40-
0009 T2 = INIT_ARRAY 0 (packed) NEXT
40+
0009 T2 = INIT_ARRAY 0 NEXT
4141
0010 V3 = FE_RESET_R V5 0017
4242
0011 T5 = FE_FETCH_R V3 T4 0017
4343
0012 INIT_FCALL 1 %d string("plus1")

ext/standard/tests/array/array_map_foreach_optimization_003.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $_main:
2424
; (after optimizer)
2525
; %s
2626
0000 TYPE_ASSERT 131079 string("array_map") array(...)
27-
0001 T1 = INIT_ARRAY 0 (packed) NEXT
27+
0001 T1 = INIT_ARRAY 0 NEXT
2828
0002 V2 = FE_RESET_R array(...) 0009
2929
0003 T4 = FE_FETCH_R V2 T3 0009
3030
0004 INIT_FCALL 1 %d string("plus1")

ext/standard/tests/array/array_map_foreach_optimization_004.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ $_main:
2929
0003 V1 = DO_ICALL
3030
0004 ASSIGN CV0($array) V1
3131
0005 TYPE_ASSERT 131079 string("array_map") CV0($array)
32-
0006 T1 = INIT_ARRAY 0 (packed) NEXT
32+
0006 T1 = INIT_ARRAY 0 NEXT
3333
0007 V2 = FE_RESET_R CV0($array) 0014
3434
0008 T4 = FE_FETCH_R V2 T3 0014
3535
0009 INIT_FCALL 1 %d string("stdclass")

ext/standard/tests/array/array_map_foreach_optimization_005.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ $_main:
3333
0003 V2 = DO_ICALL
3434
0004 ASSIGN CV0($array) V2
3535
0005 TYPE_ASSERT 131079 string("array_map") CV0($array)
36-
0006 T2 = INIT_ARRAY 0 (packed) NEXT
36+
0006 T2 = INIT_ARRAY 0 NEXT
3737
0007 V3 = FE_RESET_R CV0($array) 0014
3838
0008 T5 = FE_FETCH_R V3 T4 0014
3939
0009 INIT_STATIC_METHOD_CALL 1 string("Adder") string("plus1")

0 commit comments

Comments
 (0)