Merge branch 'PHP-8.0'

dstogov · dstogov · commit 18d2b7f79ac9 · 2020-11-16T14:52:18.000+03:00
* PHP-8.0:
  Fixed reference-counting
  Fixed incorrect FETCH_THIS optimization
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -5332,7 +5332,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 						goto done;
 					case ZEND_FETCH_THIS:
 						delayed_fetch_this = 0;
-						if (ssa_op->result_def >= 0) {
+						if (ssa_op->result_def >= 0 && opline->result_type != IS_CV) {
 							if (zend_jit_may_delay_fetch_this(ssa, ssa_opcodes, ssa_op->result_def)) {
 								ssa->var_info[ssa_op->result_def].delayed_fetch_this = 1;
 								delayed_fetch_this = 1;
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -12015,6 +12015,13 @@ static int zend_jit_fetch_dim(dasm_State    **Dst,
 		}
 	}
 
+#ifdef ZEND_JIT_USE_RC_INFERENCE
+	if ((opline->op2_type & (IS_TMP_VAR|IS_VAR)) && (op1_info & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_ARRAY|MAY_BE_OBJECT))) {
+		/* ASSIGN_DIM may increase refcount of the key */
+		op2_info |= MAY_BE_RCN;
+	}
+#endif
+
 	|8:
 	|	FREE_OP opline->op2_type, opline->op2, op2_info, 0, opline
 

Original file line number	Diff line number	Diff line change
`@@ -12015,6 +12015,13 @@ static int zend_jit_fetch_dim(dasm_State **Dst,`
`12015`	`12015`	`}`
`12016`	`12016`	`}`
`12017`	`12017`
	`12018`	`+#ifdef ZEND_JIT_USE_RC_INFERENCE`
	`12019`	`+ if ((opline->op2_type & (IS_TMP_VAR\|IS_VAR)) && (op1_info & (MAY_BE_UNDEF\|MAY_BE_NULL\|MAY_BE_FALSE\|MAY_BE_ARRAY\|MAY_BE_OBJECT))) {`
	`12020`	`+ /* ASSIGN_DIM may increase refcount of the key */`
	`12021`	`+ op2_info \|= MAY_BE_RCN;`
	`12022`	`+ }`
	`12023`	`+#endif`
	`12024`	`+`
`12018`	`12025`	`\|8:`
`12019`	`12026`	`\| FREE_OP opline->op2_type, opline->op2, op2_info, 0, opline`
`12020`	`12027`