Merge branch 'PHP-8.0'

dstogov · dstogov · commit fa355615a457 · 2020-11-11T17:35:14.000+03:00
* PHP-8.0:
  Fixed incorrect invariant guard motion
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -2197,7 +2197,8 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
 						ssa_var_info[phi->sources[0]].type = MAY_BE_GUARD | (t & t0);
 					}
 					if ((t1 & (MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_REF)) != (t & (MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_REF))) {
-						if (is_checked_guard(tssa, ssa_opcodes, phi->sources[1], phi->ssa_var)) {
+						if (((t & t1) & (MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_REF)) != 0
+						 && is_checked_guard(tssa, ssa_opcodes, phi->sources[1], phi->ssa_var)) {
 							ssa_var_info[phi->sources[1]].type = MAY_BE_GUARD | (t & t1);
 							ssa_var_info[phi->ssa_var].type = t & ~MAY_BE_GUARD;
 						}

Original file line number	Diff line number	Diff line change
`@@ -2197,7 +2197,8 @@ static zend_ssa zend_jit_trace_build_tssa(zend_jit_trace_rec trace_buffer, uin`
`2197`	`2197`	`ssa_var_info[phi->sources[0]].type = MAY_BE_GUARD \| (t & t0);`
`2198`	`2198`	`}`
`2199`	`2199`	`if ((t1 & (MAY_BE_ANY\|MAY_BE_UNDEF\|MAY_BE_REF)) != (t & (MAY_BE_ANY\|MAY_BE_UNDEF\|MAY_BE_REF))) {`
`2200`		`- if (is_checked_guard(tssa, ssa_opcodes, phi->sources[1], phi->ssa_var)) {`
	`2200`	`+ if (((t & t1) & (MAY_BE_ANY\|MAY_BE_UNDEF\|MAY_BE_REF)) != 0`
	`2201`	`+ && is_checked_guard(tssa, ssa_opcodes, phi->sources[1], phi->ssa_var)) {`
`2201`	`2202`	`ssa_var_info[phi->sources[1]].type = MAY_BE_GUARD \| (t & t1);`
`2202`	`2203`	`ssa_var_info[phi->ssa_var].type = t & ~MAY_BE_GUARD;`
`2203`	`2204`	`}`