Fix deoptimization info and corresponding memory leaks

dstogov · dstogov · commit b5e2b64adc76 · 2020-07-21T22:58:24.000+03:00
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -10405,11 +10405,11 @@ static int zend_jit_fetch_dim_read(dasm_State **Dst, const zend_op *opline, cons
 
 		if ((opline->op1_type & (IS_VAR|IS_TMP_VAR))
 		 && !(op1_info & AVOID_REFCOUNTING)) {
-			flags = ZEND_JIT_EXIT_FREE_OP1;
+			flags |= ZEND_JIT_EXIT_FREE_OP1;
 		}
 		if ((opline->op2_type & (IS_VAR|IS_TMP_VAR))
 		 && (op2_info & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE))) {
-			flags = ZEND_JIT_EXIT_FREE_OP2;
+			flags |= ZEND_JIT_EXIT_FREE_OP2;
 		}
 		if ((res_info & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE))
 		 && (ssa_op+1)->op1_use == ssa_op->result_def

Original file line number	Diff line number	Diff line change
`@@ -10405,11 +10405,11 @@ static int zend_jit_fetch_dim_read(dasm_State *Dst, const zend_op opline, cons`
`10405`	`10405`
`10406`	`10406`	`if ((opline->op1_type & (IS_VAR\|IS_TMP_VAR))`
`10407`	`10407`	`&& !(op1_info & AVOID_REFCOUNTING)) {`
`10408`		`- flags = ZEND_JIT_EXIT_FREE_OP1;`
	`10408`	`+ flags \|= ZEND_JIT_EXIT_FREE_OP1;`
`10409`	`10409`	`}`
`10410`	`10410`	`if ((opline->op2_type & (IS_VAR\|IS_TMP_VAR))`
`10411`	`10411`	`&& (op2_info & (MAY_BE_STRING\|MAY_BE_ARRAY\|MAY_BE_OBJECT\|MAY_BE_RESOURCE))) {`
`10412`		`- flags = ZEND_JIT_EXIT_FREE_OP2;`
	`10412`	`+ flags \|= ZEND_JIT_EXIT_FREE_OP2;`
`10413`	`10413`	`}`
`10414`	`10414`	`if ((res_info & (MAY_BE_STRING\|MAY_BE_ARRAY\|MAY_BE_OBJECT\|MAY_BE_RESOURCE))`
`10415`	`10415`	`&& (ssa_op+1)->op1_use == ssa_op->result_def`