Tracing JIT: Record information about elements of arrays and use it to improve generated code (ASSIGN_DIM).

dstogov · dstogov · commit 12f9dad185db · 2021-09-16T10:32:08.000+03:00
diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
@@ -3121,7 +3121,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 						}
 						if (!zend_jit_assign_dim_op(&dasm_state, opline,
 								OP1_INFO(), OP1_DEF_INFO(), OP1_REG_ADDR(), OP2_INFO(),
-								OP1_DATA_INFO(), OP1_DATA_RANGE(),
+								OP1_DATA_INFO(), OP1_DATA_RANGE(), IS_UNKNOWN,
 								zend_may_throw(opline, ssa_op, op_array, ssa))) {
 							goto jit_failure;
 						}
@@ -3134,7 +3134,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 							break;
 						}
 						if (!zend_jit_assign_dim(&dasm_state, opline,
-								OP1_INFO(), OP1_REG_ADDR(), OP2_INFO(), OP1_DATA_INFO(),
+								OP1_INFO(), OP1_REG_ADDR(), OP2_INFO(), OP1_DATA_INFO(), IS_UNKNOWN,
 								zend_may_throw(opline, ssa_op, op_array, ssa))) {
 							goto jit_failure;
 						}
diff --git a/ext/opcache/jit/zend_jit_arm64.dasc b/ext/opcache/jit/zend_jit_arm64.dasc
@@ -4882,7 +4882,7 @@ static int zend_jit_concat(dasm_State **Dst, const zend_op *opline, uint32_t op1
 	return zend_jit_concat_helper(Dst, opline, opline->op1_type, opline->op1, op1_addr, op1_info, opline->op2_type, opline->op2, op2_addr, op2_info, res_addr, may_throw);
 }
 
-static int zend_jit_fetch_dimension_address_inner(dasm_State **Dst, const zend_op *opline, uint32_t type, uint32_t op1_info, uint32_t op2_info, const void *found_exit_addr, const void *not_found_exit_addr, const void *exit_addr)
+static int zend_jit_fetch_dimension_address_inner(dasm_State **Dst, const zend_op *opline, uint32_t type, uint32_t op1_info, uint32_t op2_info, uint8_t dim_type, const void *found_exit_addr, const void *not_found_exit_addr, const void *exit_addr)
 /* Labels: 1,2,3,4,5 */
 {
 	zend_jit_addr op2_addr = OP2_ADDR();
@@ -4944,6 +4944,12 @@ static int zend_jit_fetch_dimension_address_inner(dasm_State **Dst, const zend_o
 				}
 				packed_loaded = 1;
 			}
+
+			if (dim_type == IS_UNDEF && type == BP_VAR_W) {
+				/* don't generate "fast" code for packed array */
+				packed_loaded = 0;
+			}
+
 			if (packed_loaded) {
 				|	// ZEND_HASH_INDEX_FIND(ht, hval, retval, num_undef);
 				if (op1_info & MAY_BE_ARRAY_NUMERIC_HASH) {
@@ -5701,7 +5707,7 @@ static int zend_jit_assign_to_variable(dasm_State    **Dst,
 	return 1;
 }
 
-static int zend_jit_assign_dim(dasm_State **Dst, const zend_op *opline, uint32_t op1_info, zend_jit_addr op1_addr, uint32_t op2_info, uint32_t val_info, int may_throw)
+static int zend_jit_assign_dim(dasm_State **Dst, const zend_op *opline, uint32_t op1_info, zend_jit_addr op1_addr, uint32_t op2_info, uint32_t val_info, uint8_t dim_type, int may_throw)
 {
 	zend_jit_addr op2_addr, op3_addr, res_addr;
 
@@ -5799,7 +5805,7 @@ static int zend_jit_assign_dim(dasm_State **Dst, const zend_op *opline, uint32_t
 			uint32_t var_info = zend_array_element_type(op1_info, opline->op1_type, 0, 0);
 			zend_jit_addr var_addr = ZEND_ADDR_MEM_ZVAL(ZREG_REG0, 0);
 
-			if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_VAR_W, op1_info, op2_info, NULL, NULL, NULL)) {
+			if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_VAR_W, op1_info, op2_info, dim_type, NULL, NULL, NULL)) {
 				return 0;
 			}
 
@@ -5912,7 +5918,7 @@ static int zend_jit_assign_dim(dasm_State **Dst, const zend_op *opline, uint32_t
 	return 1;
 }
 
-static int zend_jit_assign_dim_op(dasm_State **Dst, const zend_op *opline, uint32_t op1_info, uint32_t op1_def_info, zend_jit_addr op1_addr, uint32_t op2_info, uint32_t op1_data_info, zend_ssa_range *op1_data_range, int may_throw)
+static int zend_jit_assign_dim_op(dasm_State **Dst, const zend_op *opline, uint32_t op1_info, uint32_t op1_def_info, zend_jit_addr op1_addr, uint32_t op2_info, uint32_t op1_data_info, zend_ssa_range *op1_data_range, uint8_t dim_type, int may_throw)
 {
 	zend_jit_addr op2_addr, op3_addr, var_addr;
 
@@ -6016,7 +6022,7 @@ static int zend_jit_assign_dim_op(dasm_State **Dst, const zend_op *opline, uint3
 				var_info |= MAY_BE_RC1;
 			}
 
-			if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_VAR_RW, op1_info, op2_info, NULL, NULL, NULL)) {
+			if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_VAR_RW, op1_info, op2_info, dim_type, NULL, NULL, NULL)) {
 				return 0;
 			}
 
@@ -10915,7 +10921,7 @@ static int zend_jit_fetch_dim_read(dasm_State        **Dst,
 			}
 		}
 		|	GET_ZVAL_LVAL ZREG_FCARG1, op1_addr, TMP1
-		if (!zend_jit_fetch_dimension_address_inner(Dst, opline, (opline->opcode != ZEND_FETCH_DIM_IS) ? BP_VAR_R : BP_VAR_IS, op1_info, op2_info, res_exit_addr, not_found_exit_addr, exit_addr)) {
+		if (!zend_jit_fetch_dimension_address_inner(Dst, opline, (opline->opcode != ZEND_FETCH_DIM_IS) ? BP_VAR_R : BP_VAR_IS, op1_info, op2_info, IS_UNKNOWN, res_exit_addr, not_found_exit_addr, exit_addr)) {
 			return 0;
 		}
 	}
@@ -11217,7 +11223,7 @@ static int zend_jit_fetch_dim(dasm_State    **Dst,
 					ZEND_UNREACHABLE();
 			}
 
-			if (!zend_jit_fetch_dimension_address_inner(Dst, opline, type, op1_info, op2_info, NULL, NULL, NULL)) {
+			if (!zend_jit_fetch_dimension_address_inner(Dst, opline, type, op1_info, op2_info, IS_UNKNOWN, NULL, NULL, NULL)) {
 				return 0;
 			}
 
@@ -11338,7 +11344,7 @@ static int zend_jit_isset_isempty_dim(dasm_State    **Dst,
 				not_found_exit_addr = exit_addr;
 			}
 		}
-		if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_JIT_IS, op1_info, op2_info, found_exit_addr, not_found_exit_addr, NULL)) {
+		if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_JIT_IS, op1_info, op2_info, IS_UNKNOWN, found_exit_addr, not_found_exit_addr, NULL)) {
 			return 0;
 		}
 
diff --git a/ext/opcache/jit/zend_jit_internal.h b/ext/opcache/jit/zend_jit_internal.h
@@ -438,6 +438,7 @@ typedef enum _zend_jit_trace_op {
 	ZEND_JIT_TRACE_VM,
 	ZEND_JIT_TRACE_OP1_TYPE,
 	ZEND_JIT_TRACE_OP2_TYPE,
+	ZEND_JIT_TRACE_VAL_INFO,
 	ZEND_JIT_TRACE_INIT_CALL,
 	ZEND_JIT_TRACE_DO_ICALL,
 	ZEND_JIT_TRACE_ENTER,
@@ -451,6 +452,8 @@ typedef enum _zend_jit_trace_op {
 #define IS_TRACE_REFERENCE (1<<5)
 #define IS_TRACE_INDIRECT  (1<<6)
 
+#define IS_TRACE_TYPE_MASK 0xf
+
 #define ZEND_JIT_TRACE_FAKE_INIT_CALL    0x00000100
 #define ZEND_JIT_TRACE_RETURN_VALUE_USED 0x00000100
 
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -975,7 +975,7 @@ static int find_return_ssa_var(zend_jit_trace_rec *p, zend_ssa_op *ssa_op)
 				}
 			}
 			return -1;
-		} else if (p->op == ZEND_JIT_TRACE_OP1_TYPE || p->op == ZEND_JIT_TRACE_OP2_TYPE) {
+		} else if (p->op >= ZEND_JIT_TRACE_OP1_TYPE && p->op <= ZEND_JIT_TRACE_VAL_INFO) {
 			/*skip */
 		} else {
 			return -1;
@@ -1001,7 +1001,7 @@ static const zend_op *zend_jit_trace_find_init_fcall_op(zend_jit_trace_rec *p, c
 					return p->opline;
 				}
 				return NULL;
-			} else if (p->op == ZEND_JIT_TRACE_OP1_TYPE || p->op == ZEND_JIT_TRACE_OP2_TYPE) {
+			} else if (p->op >= ZEND_JIT_TRACE_OP1_TYPE && p->op <= ZEND_JIT_TRACE_VAL_INFO) {
 				/*skip */
 			} else {
 				return NULL;
@@ -1597,6 +1597,9 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
 				op2_ce = (zend_class_entry*)(p+1)->ce;
 				p++;
 			}
+			if ((p+1)->op == ZEND_JIT_TRACE_VAL_INFO) {
+				p++;
+			}
 
 			switch (opline->opcode) {
 				case ZEND_ASSIGN_OP:
@@ -4072,6 +4075,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 			uint8_t op3_type = p->op3_type;
 			uint8_t orig_op1_type = op1_type;
 			uint8_t orig_op2_type = op2_type;
+			uint8_t val_type = IS_UNKNOWN;
 			bool op1_indirect;
 			zend_class_entry *op1_ce = NULL;
 			zend_class_entry *op2_ce = NULL;
@@ -4098,6 +4102,10 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 				op2_ce = (zend_class_entry*)(p+1)->ce;
 				p++;
 			}
+			if ((p+1)->op == ZEND_JIT_TRACE_VAL_INFO) {
+				val_type = (p+1)->op1_type;
+				p++;
+			}
 
 			frame_flags = 0;
 
@@ -4387,7 +4395,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 						op1_def_info = OP1_DEF_INFO();
 						if (!zend_jit_assign_dim_op(&dasm_state, opline,
 								op1_info, op1_def_info, op1_addr, op2_info,
-								op1_data_info, OP1_DATA_RANGE(),
+								op1_data_info, OP1_DATA_RANGE(), val_type,
 								zend_may_throw_ex(opline, ssa_op, op_array, ssa, op1_info, op2_info))) {
 							goto jit_failure;
 						}
@@ -4636,7 +4644,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 						op1_data_info = OP1_DATA_INFO();
 						CHECK_OP1_DATA_TRACE_TYPE();
 						if (!zend_jit_assign_dim(&dasm_state, opline,
-								op1_info, op1_addr, op2_info, op1_data_info,
+								op1_info, op1_addr, op2_info, op1_data_info, val_type,
 								zend_may_throw_ex(opline, ssa_op, op_array, ssa, op1_info, op2_info))) {
 							goto jit_failure;
 						}
@@ -6919,6 +6927,25 @@ static void zend_jit_dump_trace(zend_jit_trace_rec *trace_buffer, zend_ssa *tssa
 					fprintf(stderr, " op3(%s%s)", ref, type);
 				}
 			}
+			if ((p+1)->op == ZEND_JIT_TRACE_VAL_INFO) {
+				uint8_t val_type;
+				const char *type;
+
+				if (op1_type == IS_UNKNOWN && op2_type == IS_UNKNOWN && op3_type == IS_UNKNOWN) {
+					fprintf(stderr, " ;");
+				}
+				p++;
+				val_type = p->op1_type;
+
+				if (val_type == IS_UNDEF) {
+					type = "undef";
+				} else if (val_type == IS_REFERENCE) {
+					type = "ref";
+				} else {
+					type = zend_get_type_by_const(val_type);
+				}
+				fprintf(stderr, " val(%s)", type);
+			}
 			fprintf(stderr, "\n");
 			idx++;
 
diff --git a/ext/opcache/jit/zend_jit_vm_helpers.c b/ext/opcache/jit/zend_jit_vm_helpers.c
@@ -729,6 +729,63 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex,
 			TRACE_RECORD(ZEND_JIT_TRACE_OP2_TYPE, 0, ce2);
 		}
 
+		switch (opline->opcode) {
+			case ZEND_FETCH_DIM_R:
+			case ZEND_FETCH_DIM_W:
+			case ZEND_FETCH_DIM_RW:
+			case ZEND_FETCH_DIM_IS:
+			case ZEND_FETCH_DIM_FUNC_ARG:
+			case ZEND_FETCH_DIM_UNSET:
+			case ZEND_FETCH_LIST_R:
+			case ZEND_FETCH_LIST_W:
+			case ZEND_ASSIGN_DIM:
+			case ZEND_ASSIGN_DIM_OP:
+			case ZEND_UNSET_DIM:
+			case ZEND_ISSET_ISEMPTY_DIM_OBJ:
+				if (opline->op1_type == IS_CONST) {
+					zval *arr = RT_CONSTANT(opline, opline->op1);
+					op1_type = Z_TYPE_P(arr);
+				}
+				if ((op1_type & IS_TRACE_TYPE_MASK) == IS_ARRAY
+				 && opline->op2_type != IS_UNDEF) {
+					zval *arr, *dim, *val;
+					uint8_t val_type = IS_UNDEF;
+
+					if (opline->op2_type == IS_CONST) {
+						dim	= RT_CONSTANT(opline, opline->op2);
+					} else {
+						dim = EX_VAR(opline->op2.var);
+					}
+
+					if (Z_TYPE_P(dim) == IS_LONG || Z_TYPE_P(dim) == IS_STRING) {
+						if (opline->op1_type == IS_CONST) {
+							arr = RT_CONSTANT(opline, opline->op1);
+						} else {
+							arr = EX_VAR(opline->op1.var);
+						}
+						if (Z_TYPE_P(arr) == IS_INDIRECT) {
+							arr = Z_INDIRECT_P(arr);
+						}
+						if (Z_TYPE_P(arr) == IS_REFERENCE) {
+							arr = Z_REFVAL_P(arr);
+						}
+						ZEND_ASSERT(Z_TYPE_P(arr) == IS_ARRAY);
+						if (Z_TYPE_P(dim) == IS_LONG) {
+							val = zend_hash_index_find(Z_ARRVAL_P(arr), Z_LVAL_P(dim));
+						} else /*if Z_TYPE_P(dim) == IS_STRING)*/ {
+							val = zend_hash_find(Z_ARRVAL_P(arr), Z_STR_P(dim));
+						}
+						if (val) {
+							val_type = Z_TYPE_P(val);
+						}
+						TRACE_RECORD_VM(ZEND_JIT_TRACE_VAL_INFO, NULL, val_type, 0, 0);
+					}
+				}
+				break;
+			default:
+				break;
+		}
+
 		if (opline->opcode == ZEND_DO_FCALL
 		 || opline->opcode == ZEND_DO_ICALL
 		 || opline->opcode == ZEND_DO_UCALL
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -5341,7 +5341,7 @@ static int zend_jit_concat(dasm_State **Dst, const zend_op *opline, uint32_t op1
 	return zend_jit_concat_helper(Dst, opline, opline->op1_type, opline->op1, op1_addr, op1_info, opline->op2_type, opline->op2, op2_addr, op2_info, res_addr, may_throw);
 }
 
-static int zend_jit_fetch_dimension_address_inner(dasm_State **Dst, const zend_op *opline, uint32_t type, uint32_t op1_info, uint32_t op2_info, const void *found_exit_addr, const void *not_found_exit_addr, const void *exit_addr)
+static int zend_jit_fetch_dimension_address_inner(dasm_State **Dst, const zend_op *opline, uint32_t type, uint32_t op1_info, uint32_t op2_info, uint8_t dim_type, const void *found_exit_addr, const void *not_found_exit_addr, const void *exit_addr)
 /* Labels: 1,2,3,4,5 */
 {
 	zend_jit_addr op2_addr = OP2_ADDR();
@@ -5401,6 +5401,12 @@ static int zend_jit_fetch_dimension_address_inner(dasm_State **Dst, const zend_o
 				}
 				packed_loaded = 1;
 			}
+
+			if (dim_type == IS_UNDEF && type == BP_VAR_W && packed_loaded) {
+				/* don't generate "fast" code for packed array */
+				packed_loaded = 0;
+			}
+
 			if (packed_loaded) {
 				|	// ZEND_HASH_INDEX_FIND(ht, hval, retval, num_undef);
 				if (op1_info & MAY_BE_ARRAY_NUMERIC_HASH) {
@@ -5578,15 +5584,15 @@ static int zend_jit_fetch_dimension_address_inner(dasm_State **Dst, const zend_o
 				if (packed_loaded) {
 					|	IF_NOT_Z_TYPE r0, IS_UNDEF, >8
 				}
-				if (!(op1_info & MAY_BE_ARRAY_KEY_LONG) || (op1_info & MAY_BE_ARRAY_NUMERIC_HASH) || packed_loaded) {
+//				if (!(op1_info & MAY_BE_ARRAY_KEY_LONG) || (op1_info & MAY_BE_ARRAY_NUMERIC_HASH) || packed_loaded) {
 					|2:
 					|4:
 					if (!op2_loaded) {
 						|	// hval = Z_LVAL_P(dim);
 						|	GET_ZVAL_LVAL ZREG_FCARG2, op2_addr
 					}
 					|	EXT_CALL zend_hash_index_lookup, r0
-				}
+//				}
 				break;
 			default:
 				ZEND_UNREACHABLE();
@@ -6178,7 +6184,7 @@ static int zend_jit_assign_to_variable(dasm_State    **Dst,
 	return 1;
 }
 
-static int zend_jit_assign_dim(dasm_State **Dst, const zend_op *opline, uint32_t op1_info, zend_jit_addr op1_addr, uint32_t op2_info, uint32_t val_info, int may_throw)
+static int zend_jit_assign_dim(dasm_State **Dst, const zend_op *opline, uint32_t op1_info, zend_jit_addr op1_addr, uint32_t op2_info, uint32_t val_info, uint8_t dim_type, int may_throw)
 {
 	zend_jit_addr op2_addr, op3_addr, res_addr;
 
@@ -6274,7 +6280,7 @@ static int zend_jit_assign_dim(dasm_State **Dst, const zend_op *opline, uint32_t
 			uint32_t var_info = zend_array_element_type(op1_info, opline->op1_type, 0, 0);
 			zend_jit_addr var_addr = ZEND_ADDR_MEM_ZVAL(ZREG_R0, 0);
 
-			if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_VAR_W, op1_info, op2_info, NULL, NULL, NULL)) {
+			if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_VAR_W, op1_info, op2_info, dim_type, NULL, NULL, NULL)) {
 				return 0;
 			}
 
@@ -6404,7 +6410,7 @@ static int zend_jit_assign_dim(dasm_State **Dst, const zend_op *opline, uint32_t
 	return 1;
 }
 
-static int zend_jit_assign_dim_op(dasm_State **Dst, const zend_op *opline, uint32_t op1_info, uint32_t op1_def_info, zend_jit_addr op1_addr, uint32_t op2_info, uint32_t op1_data_info, zend_ssa_range *op1_data_range, int may_throw)
+static int zend_jit_assign_dim_op(dasm_State **Dst, const zend_op *opline, uint32_t op1_info, uint32_t op1_def_info, zend_jit_addr op1_addr, uint32_t op2_info, uint32_t op1_data_info, zend_ssa_range *op1_data_range, uint8_t dim_type, int may_throw)
 {
 	zend_jit_addr op2_addr, op3_addr, var_addr;
 
@@ -6506,7 +6512,7 @@ static int zend_jit_assign_dim_op(dasm_State **Dst, const zend_op *opline, uint3
 				var_info |= MAY_BE_RC1;
 			}
 
-			if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_VAR_RW, op1_info, op2_info, NULL, NULL, NULL)) {
+			if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_VAR_RW, op1_info, op2_info, dim_type, NULL, NULL, NULL)) {
 				return 0;
 			}
 
@@ -11553,7 +11559,7 @@ static int zend_jit_fetch_dim_read(dasm_State        **Dst,
 			}
 		}
 		|	GET_ZVAL_LVAL ZREG_FCARG1, op1_addr
-		if (!zend_jit_fetch_dimension_address_inner(Dst, opline, (opline->opcode != ZEND_FETCH_DIM_IS) ? BP_VAR_R : BP_VAR_IS, op1_info, op2_info, res_exit_addr, not_found_exit_addr, exit_addr)) {
+		if (!zend_jit_fetch_dimension_address_inner(Dst, opline, (opline->opcode != ZEND_FETCH_DIM_IS) ? BP_VAR_R : BP_VAR_IS, op1_info, op2_info, IS_UNKNOWN, res_exit_addr, not_found_exit_addr, exit_addr)) {
 			return 0;
 		}
 	}
@@ -11870,7 +11876,7 @@ static int zend_jit_fetch_dim(dasm_State    **Dst,
 					ZEND_UNREACHABLE();
 			}
 
-			if (!zend_jit_fetch_dimension_address_inner(Dst, opline, type, op1_info, op2_info, NULL, NULL, NULL)) {
+			if (!zend_jit_fetch_dimension_address_inner(Dst, opline, type, op1_info, op2_info, IS_UNKNOWN, NULL, NULL, NULL)) {
 				return 0;
 			}
 
@@ -12000,7 +12006,7 @@ static int zend_jit_isset_isempty_dim(dasm_State    **Dst,
 				not_found_exit_addr = exit_addr;
 			}
 		}
-		if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_JIT_IS, op1_info, op2_info, found_exit_addr, not_found_exit_addr, NULL)) {
+		if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_JIT_IS, op1_info, op2_info, IS_UNKNOWN, found_exit_addr, not_found_exit_addr, NULL)) {
 			return 0;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -3121,7 +3121,7 @@ static int zend_jit(const zend_op_array op_array, zend_ssa ssa, const zend_op`
`3121`	`3121`	`}`
`3122`	`3122`	`if (!zend_jit_assign_dim_op(&dasm_state, opline,`
`3123`	`3123`	`OP1_INFO(), OP1_DEF_INFO(), OP1_REG_ADDR(), OP2_INFO(),`
`3124`		`- OP1_DATA_INFO(), OP1_DATA_RANGE(),`
	`3124`	`+ OP1_DATA_INFO(), OP1_DATA_RANGE(), IS_UNKNOWN,`
`3125`	`3125`	`zend_may_throw(opline, ssa_op, op_array, ssa))) {`
`3126`	`3126`	`goto jit_failure;`
`3127`	`3127`	`}`
`@@ -3134,7 +3134,7 @@ static int zend_jit(const zend_op_array op_array, zend_ssa ssa, const zend_op`
`3134`	`3134`	`break;`
`3135`	`3135`	`}`
`3136`	`3136`	`if (!zend_jit_assign_dim(&dasm_state, opline,`
`3137`		`- OP1_INFO(), OP1_REG_ADDR(), OP2_INFO(), OP1_DATA_INFO(),`
	`3137`	`+ OP1_INFO(), OP1_REG_ADDR(), OP2_INFO(), OP1_DATA_INFO(), IS_UNKNOWN,`
`3138`	`3138`	`zend_may_throw(opline, ssa_op, op_array, ssa))) {`
`3139`	`3139`	`goto jit_failure;`
`3140`	`3140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4882,7 +4882,7 @@ static int zend_jit_concat(dasm_State *Dst, const zend_op opline, uint32_t op1`
`4882`	`4882`	`return zend_jit_concat_helper(Dst, opline, opline->op1_type, opline->op1, op1_addr, op1_info, opline->op2_type, opline->op2, op2_addr, op2_info, res_addr, may_throw);`
`4883`	`4883`	`}`
`4884`	`4884`
`4885`		`-static int zend_jit_fetch_dimension_address_inner(dasm_State *Dst, const zend_op opline, uint32_t type, uint32_t op1_info, uint32_t op2_info, const void found_exit_addr, const void not_found_exit_addr, const void *exit_addr)`
	`4885`	`+static int zend_jit_fetch_dimension_address_inner(dasm_State *Dst, const zend_op opline, uint32_t type, uint32_t op1_info, uint32_t op2_info, uint8_t dim_type, const void found_exit_addr, const void not_found_exit_addr, const void *exit_addr)`
`4886`	`4886`	`/* Labels: 1,2,3,4,5 */`
`4887`	`4887`	`{`
`4888`	`4888`	`zend_jit_addr op2_addr = OP2_ADDR();`
`@@ -4944,6 +4944,12 @@ static int zend_jit_fetch_dimension_address_inner(dasm_State **Dst, const zend_o`
`4944`	`4944`	`}`
`4945`	`4945`	`packed_loaded = 1;`
`4946`	`4946`	`}`
	`4947`	`+`
	`4948`	`+ if (dim_type == IS_UNDEF && type == BP_VAR_W) {`
	`4949`	`+ /* don't generate "fast" code for packed array */`
	`4950`	`+ packed_loaded = 0;`
	`4951`	`+ }`
	`4952`	`+`
`4947`	`4953`	`if (packed_loaded) {`
`4948`	`4954`	`\| // ZEND_HASH_INDEX_FIND(ht, hval, retval, num_undef);`
`4949`	`4955`	`if (op1_info & MAY_BE_ARRAY_NUMERIC_HASH) {`
`@@ -5701,7 +5707,7 @@ static int zend_jit_assign_to_variable(dasm_State **Dst,`
`5701`	`5707`	`return 1;`
`5702`	`5708`	`}`
`5703`	`5709`
`5704`		`-static int zend_jit_assign_dim(dasm_State *Dst, const zend_op opline, uint32_t op1_info, zend_jit_addr op1_addr, uint32_t op2_info, uint32_t val_info, int may_throw)`
	`5710`	`+static int zend_jit_assign_dim(dasm_State *Dst, const zend_op opline, uint32_t op1_info, zend_jit_addr op1_addr, uint32_t op2_info, uint32_t val_info, uint8_t dim_type, int may_throw)`
`5705`	`5711`	`{`
`5706`	`5712`	`zend_jit_addr op2_addr, op3_addr, res_addr;`
`5707`	`5713`
`@@ -5799,7 +5805,7 @@ static int zend_jit_assign_dim(dasm_State *Dst, const zend_op opline, uint32_t`
`5799`	`5805`	`uint32_t var_info = zend_array_element_type(op1_info, opline->op1_type, 0, 0);`
`5800`	`5806`	`zend_jit_addr var_addr = ZEND_ADDR_MEM_ZVAL(ZREG_REG0, 0);`
`5801`	`5807`
`5802`		`- if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_VAR_W, op1_info, op2_info, NULL, NULL, NULL)) {`
	`5808`	`+ if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_VAR_W, op1_info, op2_info, dim_type, NULL, NULL, NULL)) {`
`5803`	`5809`	`return 0;`
`5804`	`5810`	`}`
`5805`	`5811`
`@@ -5912,7 +5918,7 @@ static int zend_jit_assign_dim(dasm_State *Dst, const zend_op opline, uint32_t`
`5912`	`5918`	`return 1;`
`5913`	`5919`	`}`
`5914`	`5920`
`5915`		`-static int zend_jit_assign_dim_op(dasm_State *Dst, const zend_op opline, uint32_t op1_info, uint32_t op1_def_info, zend_jit_addr op1_addr, uint32_t op2_info, uint32_t op1_data_info, zend_ssa_range *op1_data_range, int may_throw)`
	`5921`	`+static int zend_jit_assign_dim_op(dasm_State *Dst, const zend_op opline, uint32_t op1_info, uint32_t op1_def_info, zend_jit_addr op1_addr, uint32_t op2_info, uint32_t op1_data_info, zend_ssa_range *op1_data_range, uint8_t dim_type, int may_throw)`
`5916`	`5922`	`{`
`5917`	`5923`	`zend_jit_addr op2_addr, op3_addr, var_addr;`
`5918`	`5924`
`@@ -6016,7 +6022,7 @@ static int zend_jit_assign_dim_op(dasm_State *Dst, const zend_op opline, uint3`
`6016`	`6022`	`var_info \|= MAY_BE_RC1;`
`6017`	`6023`	`}`
`6018`	`6024`
`6019`		`- if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_VAR_RW, op1_info, op2_info, NULL, NULL, NULL)) {`
	`6025`	`+ if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_VAR_RW, op1_info, op2_info, dim_type, NULL, NULL, NULL)) {`
`6020`	`6026`	`return 0;`
`6021`	`6027`	`}`
`6022`	`6028`
`@@ -10915,7 +10921,7 @@ static int zend_jit_fetch_dim_read(dasm_State **Dst,`
`10915`	`10921`	`}`
`10916`	`10922`	`}`
`10917`	`10923`	`\| GET_ZVAL_LVAL ZREG_FCARG1, op1_addr, TMP1`
`10918`		`- if (!zend_jit_fetch_dimension_address_inner(Dst, opline, (opline->opcode != ZEND_FETCH_DIM_IS) ? BP_VAR_R : BP_VAR_IS, op1_info, op2_info, res_exit_addr, not_found_exit_addr, exit_addr)) {`
	`10924`	`+ if (!zend_jit_fetch_dimension_address_inner(Dst, opline, (opline->opcode != ZEND_FETCH_DIM_IS) ? BP_VAR_R : BP_VAR_IS, op1_info, op2_info, IS_UNKNOWN, res_exit_addr, not_found_exit_addr, exit_addr)) {`
`10919`	`10925`	`return 0;`
`10920`	`10926`	`}`
`10921`	`10927`	`}`
`@@ -11217,7 +11223,7 @@ static int zend_jit_fetch_dim(dasm_State **Dst,`
`11217`	`11223`	`ZEND_UNREACHABLE();`
`11218`	`11224`	`}`
`11219`	`11225`
`11220`		`- if (!zend_jit_fetch_dimension_address_inner(Dst, opline, type, op1_info, op2_info, NULL, NULL, NULL)) {`
	`11226`	`+ if (!zend_jit_fetch_dimension_address_inner(Dst, opline, type, op1_info, op2_info, IS_UNKNOWN, NULL, NULL, NULL)) {`
`11221`	`11227`	`return 0;`
`11222`	`11228`	`}`
`11223`	`11229`
`@@ -11338,7 +11344,7 @@ static int zend_jit_isset_isempty_dim(dasm_State **Dst,`
`11338`	`11344`	`not_found_exit_addr = exit_addr;`
`11339`	`11345`	`}`
`11340`	`11346`	`}`
`11341`		`- if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_JIT_IS, op1_info, op2_info, found_exit_addr, not_found_exit_addr, NULL)) {`
	`11347`	`+ if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_JIT_IS, op1_info, op2_info, IS_UNKNOWN, found_exit_addr, not_found_exit_addr, NULL)) {`
`11342`	`11348`	`return 0;`
`11343`	`11349`	`}`
`11344`	`11350`
Original file line number	Diff line number	Diff line change
`@@ -5341,7 +5341,7 @@ static int zend_jit_concat(dasm_State *Dst, const zend_op opline, uint32_t op1`
`5341`	`5341`	`return zend_jit_concat_helper(Dst, opline, opline->op1_type, opline->op1, op1_addr, op1_info, opline->op2_type, opline->op2, op2_addr, op2_info, res_addr, may_throw);`
`5342`	`5342`	`}`
`5343`	`5343`
`5344`		`-static int zend_jit_fetch_dimension_address_inner(dasm_State *Dst, const zend_op opline, uint32_t type, uint32_t op1_info, uint32_t op2_info, const void found_exit_addr, const void not_found_exit_addr, const void *exit_addr)`
	`5344`	`+static int zend_jit_fetch_dimension_address_inner(dasm_State *Dst, const zend_op opline, uint32_t type, uint32_t op1_info, uint32_t op2_info, uint8_t dim_type, const void found_exit_addr, const void not_found_exit_addr, const void *exit_addr)`
`5345`	`5345`	`/* Labels: 1,2,3,4,5 */`
`5346`	`5346`	`{`
`5347`	`5347`	`zend_jit_addr op2_addr = OP2_ADDR();`
`@@ -5401,6 +5401,12 @@ static int zend_jit_fetch_dimension_address_inner(dasm_State **Dst, const zend_o`
`5401`	`5401`	`}`
`5402`	`5402`	`packed_loaded = 1;`
`5403`	`5403`	`}`
	`5404`	`+`
	`5405`	`+ if (dim_type == IS_UNDEF && type == BP_VAR_W && packed_loaded) {`
	`5406`	`+ /* don't generate "fast" code for packed array */`
	`5407`	`+ packed_loaded = 0;`
	`5408`	`+ }`
	`5409`	`+`
`5404`	`5410`	`if (packed_loaded) {`
`5405`	`5411`	`\| // ZEND_HASH_INDEX_FIND(ht, hval, retval, num_undef);`
`5406`	`5412`	`if (op1_info & MAY_BE_ARRAY_NUMERIC_HASH) {`
`@@ -5578,15 +5584,15 @@ static int zend_jit_fetch_dimension_address_inner(dasm_State **Dst, const zend_o`
`5578`	`5584`	`if (packed_loaded) {`
`5579`	`5585`	`\| IF_NOT_Z_TYPE r0, IS_UNDEF, >8`
`5580`	`5586`	`}`
`5581`		`- if (!(op1_info & MAY_BE_ARRAY_KEY_LONG) \|\| (op1_info & MAY_BE_ARRAY_NUMERIC_HASH) \|\| packed_loaded) {`
	`5587`	`+// if (!(op1_info & MAY_BE_ARRAY_KEY_LONG) \|\| (op1_info & MAY_BE_ARRAY_NUMERIC_HASH) \|\| packed_loaded) {`
`5582`	`5588`	`\|2:`
`5583`	`5589`	`\|4:`
`5584`	`5590`	`if (!op2_loaded) {`
`5585`	`5591`	`\| // hval = Z_LVAL_P(dim);`
`5586`	`5592`	`\| GET_ZVAL_LVAL ZREG_FCARG2, op2_addr`
`5587`	`5593`	`}`
`5588`	`5594`	`\| EXT_CALL zend_hash_index_lookup, r0`
`5589`		`- }`
	`5595`	`+// }`
`5590`	`5596`	`break;`
`5591`	`5597`	`default:`
`5592`	`5598`	`ZEND_UNREACHABLE();`
`@@ -6178,7 +6184,7 @@ static int zend_jit_assign_to_variable(dasm_State **Dst,`
`6178`	`6184`	`return 1;`
`6179`	`6185`	`}`
`6180`	`6186`
`6181`		`-static int zend_jit_assign_dim(dasm_State *Dst, const zend_op opline, uint32_t op1_info, zend_jit_addr op1_addr, uint32_t op2_info, uint32_t val_info, int may_throw)`
	`6187`	`+static int zend_jit_assign_dim(dasm_State *Dst, const zend_op opline, uint32_t op1_info, zend_jit_addr op1_addr, uint32_t op2_info, uint32_t val_info, uint8_t dim_type, int may_throw)`
`6182`	`6188`	`{`
`6183`	`6189`	`zend_jit_addr op2_addr, op3_addr, res_addr;`
`6184`	`6190`
`@@ -6274,7 +6280,7 @@ static int zend_jit_assign_dim(dasm_State *Dst, const zend_op opline, uint32_t`
`6274`	`6280`	`uint32_t var_info = zend_array_element_type(op1_info, opline->op1_type, 0, 0);`
`6275`	`6281`	`zend_jit_addr var_addr = ZEND_ADDR_MEM_ZVAL(ZREG_R0, 0);`
`6276`	`6282`
`6277`		`- if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_VAR_W, op1_info, op2_info, NULL, NULL, NULL)) {`
	`6283`	`+ if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_VAR_W, op1_info, op2_info, dim_type, NULL, NULL, NULL)) {`
`6278`	`6284`	`return 0;`
`6279`	`6285`	`}`
`6280`	`6286`
`@@ -6404,7 +6410,7 @@ static int zend_jit_assign_dim(dasm_State *Dst, const zend_op opline, uint32_t`
`6404`	`6410`	`return 1;`
`6405`	`6411`	`}`
`6406`	`6412`
`6407`		`-static int zend_jit_assign_dim_op(dasm_State *Dst, const zend_op opline, uint32_t op1_info, uint32_t op1_def_info, zend_jit_addr op1_addr, uint32_t op2_info, uint32_t op1_data_info, zend_ssa_range *op1_data_range, int may_throw)`
	`6413`	`+static int zend_jit_assign_dim_op(dasm_State *Dst, const zend_op opline, uint32_t op1_info, uint32_t op1_def_info, zend_jit_addr op1_addr, uint32_t op2_info, uint32_t op1_data_info, zend_ssa_range *op1_data_range, uint8_t dim_type, int may_throw)`
`6408`	`6414`	`{`
`6409`	`6415`	`zend_jit_addr op2_addr, op3_addr, var_addr;`
`6410`	`6416`
`@@ -6506,7 +6512,7 @@ static int zend_jit_assign_dim_op(dasm_State *Dst, const zend_op opline, uint3`
`6506`	`6512`	`var_info \|= MAY_BE_RC1;`
`6507`	`6513`	`}`
`6508`	`6514`
`6509`		`- if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_VAR_RW, op1_info, op2_info, NULL, NULL, NULL)) {`
	`6515`	`+ if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_VAR_RW, op1_info, op2_info, dim_type, NULL, NULL, NULL)) {`
`6510`	`6516`	`return 0;`
`6511`	`6517`	`}`
`6512`	`6518`
`@@ -11553,7 +11559,7 @@ static int zend_jit_fetch_dim_read(dasm_State **Dst,`
`11553`	`11559`	`}`
`11554`	`11560`	`}`
`11555`	`11561`	`\| GET_ZVAL_LVAL ZREG_FCARG1, op1_addr`
`11556`		`- if (!zend_jit_fetch_dimension_address_inner(Dst, opline, (opline->opcode != ZEND_FETCH_DIM_IS) ? BP_VAR_R : BP_VAR_IS, op1_info, op2_info, res_exit_addr, not_found_exit_addr, exit_addr)) {`
	`11562`	`+ if (!zend_jit_fetch_dimension_address_inner(Dst, opline, (opline->opcode != ZEND_FETCH_DIM_IS) ? BP_VAR_R : BP_VAR_IS, op1_info, op2_info, IS_UNKNOWN, res_exit_addr, not_found_exit_addr, exit_addr)) {`
`11557`	`11563`	`return 0;`
`11558`	`11564`	`}`
`11559`	`11565`	`}`
`@@ -11870,7 +11876,7 @@ static int zend_jit_fetch_dim(dasm_State **Dst,`
`11870`	`11876`	`ZEND_UNREACHABLE();`
`11871`	`11877`	`}`
`11872`	`11878`
`11873`		`- if (!zend_jit_fetch_dimension_address_inner(Dst, opline, type, op1_info, op2_info, NULL, NULL, NULL)) {`
	`11879`	`+ if (!zend_jit_fetch_dimension_address_inner(Dst, opline, type, op1_info, op2_info, IS_UNKNOWN, NULL, NULL, NULL)) {`
`11874`	`11880`	`return 0;`
`11875`	`11881`	`}`
`11876`	`11882`
`@@ -12000,7 +12006,7 @@ static int zend_jit_isset_isempty_dim(dasm_State **Dst,`
`12000`	`12006`	`not_found_exit_addr = exit_addr;`
`12001`	`12007`	`}`
`12002`	`12008`	`}`
`12003`		`- if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_JIT_IS, op1_info, op2_info, found_exit_addr, not_found_exit_addr, NULL)) {`
	`12009`	`+ if (!zend_jit_fetch_dimension_address_inner(Dst, opline, BP_JIT_IS, op1_info, op2_info, IS_UNKNOWN, found_exit_addr, not_found_exit_addr, NULL)) {`
`12004`	`12010`	`return 0;`
`12005`	`12011`	`}`
`12006`	`12012`