@@ -2162,17 +2162,17 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
2162
2162
|| op_array -> opcodes [ssa -> cfg .blocks [b ].start - 1 ].opcode == ZEND_SWITCH_LONG
2163
2163
|| op_array -> opcodes [ssa -> cfg .blocks [b ].start - 1 ].opcode == ZEND_SWITCH_STRING
2164
2164
|| op_array -> opcodes [ssa -> cfg .blocks [b ].start - 1 ].opcode == ZEND_MATCH )) {
2165
- zend_jit_reset_opline ();
2166
- if (!zend_jit_set_valid_ip (& dasm_state , op_array -> opcodes + ssa -> cfg .blocks [b ].start )) {
2165
+ zend_jit_reset_last_valid_opline ();
2166
+ if (!zend_jit_set_ip (& dasm_state , op_array -> opcodes + ssa -> cfg .blocks [b ].start )) {
2167
2167
goto jit_failure ;
2168
2168
}
2169
2169
} else {
2170
- zend_jit_set_opline (op_array -> opcodes + ssa -> cfg .blocks [b ].start );
2170
+ zend_jit_set_last_valid_opline (op_array -> opcodes + ssa -> cfg .blocks [b ].start );
2171
2171
}
2172
2172
} else if (ssa -> cfg .blocks [b ].flags & ZEND_BB_TARGET ) {
2173
- zend_jit_reset_opline ();
2173
+ zend_jit_reset_last_valid_opline ();
2174
2174
} else if (ssa -> cfg .blocks [b ].flags & (ZEND_BB_START |ZEND_BB_RECV_ENTRY |ZEND_BB_ENTRY )) {
2175
- zend_jit_set_opline (op_array -> opcodes + ssa -> cfg .blocks [b ].start );
2175
+ zend_jit_set_last_valid_opline (op_array -> opcodes + ssa -> cfg .blocks [b ].start );
2176
2176
}
2177
2177
if (ssa -> cfg .blocks [b ].flags & ZEND_BB_LOOP_HEADER ) {
2178
2178
if (!zend_jit_check_timeout (& dasm_state , op_array -> opcodes + ssa -> cfg .blocks [b ].start , NULL )) {
@@ -3012,7 +3012,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
3012
3012
goto jit_failure ;
3013
3013
}
3014
3014
}
3015
- zend_jit_set_opline (opline + 1 );
3015
+ zend_jit_set_last_valid_opline (opline + 1 );
3016
3016
break ;
3017
3017
case ZEND_NOP :
3018
3018
case ZEND_OP_DATA :
0 commit comments