Try to make the change more targeted

Somehow this resulted in even more test failures. Avoid the
refactoring to use zend_may_throw in case that causes an issue.

Author: nikic

Zend/Optimizer/zend_inference.c

@@ -4516,7 +4516,6 @@ ZEND_API int zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op,
 				case ZEND_ISSET_ISEMPTY_CV:
 				case ZEND_MAKE_REF:
 				case ZEND_FETCH_DIM_W:
-				case ZEND_FETCH_LIST_W:
 					break;
 				default:
 					/* undefined variable warning */

ext/opcache/jit/zend_jit_trace.c

@@ -5196,7 +5196,10 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 						op1_def_info = OP1_DEF_INFO();
 						if (!zend_jit_fetch_dim(&dasm_state, opline,
 								op1_info, op1_addr, op2_info, RES_REG_ADDR(),
-								(zend_may_throw_ex(opline, ssa_op, op_array, ssa, op1_info, op2_info)
+								(opline->opcode == ZEND_FETCH_DIM_RW
+								 || opline->op2_type == IS_UNUSED
+								 || (op1_info & (MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_STRING|MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_REF))
+								 || (op2_info & (MAY_BE_UNDEF|MAY_BE_RESOURCE|MAY_BE_ARRAY|MAY_BE_OBJECT))
 								 || (opline->op1_type == IS_VAR
 								  && (op1_info & MAY_BE_UNDEF)
 								  && !ssa->var_info[ssa_op->op1_use].indirect_reference)))) {