Address review comments

Merge code blocks, remove relative paths for headers

Author: Girgias

ext/opcache/jit/zend_jit_helpers.c

@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-#include "../../../Zend/zend_types.h"
+#include "Zend/zend_types.h"
 #include "Zend/zend_API.h"
 
 static ZEND_COLD void undef_result_after_exception(void) {

ext/opcache/jit/zend_jit_ir.c

@@ -16,7 +16,7 @@
  *  +----------------------------------------------------------------------+
  */
 
-#include "../../../Zend/zend_type_info.h"
+#include "Zend/zend_type_info.h"
 #include "jit/ir/ir.h"
 #include "jit/ir/ir_builder.h"
 #include "jit/tls/zend_jit_tls.h"
@@ -12787,7 +12787,7 @@ static int zend_jit_fetch_dim_read(zend_jit_ctx       *jit,
 				}
 			}
 
-			if (opline->opcode == ZEND_FETCH_LIST_R) {
+			if (opline->opcode != ZEND_FETCH_DIM_IS) {
 				ir_ref ref;
 
 				may_throw = 1;
@@ -12797,19 +12797,11 @@ static int zend_jit_fetch_dim_read(zend_jit_ctx       *jit,
 					jit_SET_EX_OPLINE(jit, opline);
 					ref = jit_ZVAL_ADDR(jit, op1_addr);
 				}
-				ir_CALL_1(IR_VOID, ir_CONST_FC_FUNC(zend_jit_invalid_array_use), ref);
-			}
-			if (opline->opcode != ZEND_FETCH_DIM_IS && opline->opcode != ZEND_FETCH_LIST_R) {
-				ir_ref ref;
-
-				may_throw = 1;
-				if ((op1_info & MAY_BE_UNDEF) || (op2_info & MAY_BE_UNDEF)) {
-					ref = jit_ZVAL_ADDR(jit, orig_op1_addr);
+				if (opline->opcode == ZEND_FETCH_LIST_R) {
+					ir_CALL_1(IR_VOID, ir_CONST_FC_FUNC(zend_jit_invalid_array_use), ref);
 				} else {
-					jit_SET_EX_OPLINE(jit, opline);
-					ref = jit_ZVAL_ADDR(jit, op1_addr);
+					ir_CALL_1(IR_VOID, ir_CONST_FC_FUNC(zend_jit_invalid_array_access), ref);
 				}
-				ir_CALL_1(IR_VOID, ir_CONST_FC_FUNC(zend_jit_invalid_array_access), ref);
 			}
 
 			jit_set_Z_TYPE_INFO(jit, res_addr, IS_NULL);