Move invariant type guard out of loop

dstogov · dstogov · commit f722512c4ad0 · 2020-09-28T23:54:28.000+03:00
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -2005,7 +2005,8 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
 						ssa_var_info[phi->ssa_var].type = t & ~MAY_BE_GUARD;
 					}
 				} else if ((t1 & (MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_REF)) == (t & (MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_REF))) {
-					if (!(t1 & MAY_BE_GUARD)) {
+					if (!(t1 & MAY_BE_GUARD)
+					 || is_checked_guard(tssa, ssa_opcodes, phi->sources[1], phi->ssa_var)) {
 						ssa_var_info[phi->ssa_var].type = t & ~MAY_BE_GUARD;
 						ssa_var_info[phi->sources[0]].type = t | MAY_BE_GUARD;
 					}

Original file line number	Diff line number	Diff line change
`@@ -2005,7 +2005,8 @@ static zend_ssa zend_jit_trace_build_tssa(zend_jit_trace_rec trace_buffer, uin`
`2005`	`2005`	`ssa_var_info[phi->ssa_var].type = t & ~MAY_BE_GUARD;`
`2006`	`2006`	`}`
`2007`	`2007`	`} else if ((t1 & (MAY_BE_ANY\|MAY_BE_UNDEF\|MAY_BE_REF)) == (t & (MAY_BE_ANY\|MAY_BE_UNDEF\|MAY_BE_REF))) {`
`2008`		`- if (!(t1 & MAY_BE_GUARD)) {`
	`2008`	`+ if (!(t1 & MAY_BE_GUARD)`
	`2009`	`+ \|\| is_checked_guard(tssa, ssa_opcodes, phi->sources[1], phi->ssa_var)) {`
`2009`	`2010`	`ssa_var_info[phi->ssa_var].type = t & ~MAY_BE_GUARD;`
`2010`	`2011`	`ssa_var_info[phi->sources[0]].type = t \| MAY_BE_GUARD;`
`2011`	`2012`	`}`