Fixed tracing jit for BIND_INIT_STATIC_OR_JMP

dstogov · dstogov · commit 7939ed21413e · 2023-09-08T18:29:20.000+03:00
diff --git a/ext/opcache/jit/zend_jit_ir.c b/ext/opcache/jit/zend_jit_ir.c
@@ -16011,6 +16011,12 @@ static int zend_jit_trace_handler(zend_jit_ctx *jit, const zend_op_array *op_arr
 						SET_STACK_TYPE(stack, EX_VAR_TO_NUM(opline->op2.var), IS_UNKNOWN, 1);
 					}
 					break;
+				case ZEND_BIND_INIT_STATIC_OR_JMP:
+					if (opline->op1_type == IS_CV) {
+						old_info = STACK_INFO(stack, EX_VAR_TO_NUM(opline->op1.var));
+						SET_STACK_TYPE(stack, EX_VAR_TO_NUM(opline->op1.var), IS_UNKNOWN, 1);
+					}
+					break;
 			}
 			if (opline->result_type == IS_VAR || opline->result_type == IS_TMP_VAR) {
 				old_res_info = STACK_INFO(stack, EX_VAR_TO_NUM(opline->result.var));
@@ -16029,6 +16035,11 @@ static int zend_jit_trace_handler(zend_jit_ctx *jit, const zend_op_array *op_arr
 						SET_STACK_INFO(stack, EX_VAR_TO_NUM(opline->op2.var), old_info);
 					}
 					break;
+				case ZEND_BIND_INIT_STATIC_OR_JMP:
+					if (opline->op1_type == IS_CV) {
+						SET_STACK_INFO(stack, EX_VAR_TO_NUM(opline->op1.var), old_info);
+					}
+					break;
 			}
 
 			if (!exit_addr) {

Original file line number	Diff line number	Diff line change
`@@ -16011,6 +16011,12 @@ static int zend_jit_trace_handler(zend_jit_ctx jit, const zend_op_array op_arr`
`16011`	`16011`	`SET_STACK_TYPE(stack, EX_VAR_TO_NUM(opline->op2.var), IS_UNKNOWN, 1);`
`16012`	`16012`	`}`
`16013`	`16013`	`break;`
	`16014`	`+ case ZEND_BIND_INIT_STATIC_OR_JMP:`
	`16015`	`+ if (opline->op1_type == IS_CV) {`
	`16016`	`+ old_info = STACK_INFO(stack, EX_VAR_TO_NUM(opline->op1.var));`
	`16017`	`+ SET_STACK_TYPE(stack, EX_VAR_TO_NUM(opline->op1.var), IS_UNKNOWN, 1);`
	`16018`	`+ }`
	`16019`	`+ break;`
`16014`	`16020`	`}`
`16015`	`16021`	`if (opline->result_type == IS_VAR \|\| opline->result_type == IS_TMP_VAR) {`
`16016`	`16022`	`old_res_info = STACK_INFO(stack, EX_VAR_TO_NUM(opline->result.var));`
`@@ -16029,6 +16035,11 @@ static int zend_jit_trace_handler(zend_jit_ctx jit, const zend_op_array op_arr`
`16029`	`16035`	`SET_STACK_INFO(stack, EX_VAR_TO_NUM(opline->op2.var), old_info);`
`16030`	`16036`	`}`
`16031`	`16037`	`break;`
	`16038`	`+ case ZEND_BIND_INIT_STATIC_OR_JMP:`
	`16039`	`+ if (opline->op1_type == IS_CV) {`
	`16040`	`+ SET_STACK_INFO(stack, EX_VAR_TO_NUM(opline->op1.var), old_info);`
	`16041`	`+ }`
	`16042`	`+ break;`
`16032`	`16043`	`}`
`16033`	`16044`
`16034`	`16045`	`if (!exit_addr) {`