More accurate live range construction

dstogov · dstogov · commit cb6f9a65681b · 2020-10-21T16:05:13.000+03:00
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -2476,7 +2476,7 @@ static zend_lifetime_interval** zend_jit_trace_allocate_registers(zend_jit_trace
 
 		while (phi) {
 			i = phi->sources[1];
-			if (start[i] >= 0) {
+			if (start[i] >= 0 && !ssa->vars[phi->ssa_var].no_val) {
 				end[i] = idx;
 				flags[i] &= ~ZREG_LAST_USE;
 			}
@@ -2487,6 +2487,8 @@ static zend_lifetime_interval** zend_jit_trace_allocate_registers(zend_jit_trace
 			if (start[i] >= 0 && !ssa->vars[i].phi_use_chain) {
 				end[i] = idx;
 				flags[i] &= ~ZREG_LAST_USE;
+			} else {
+				zend_jit_close_var(stack, i, start, end, flags, idx);
 			}
 		}
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -2476,7 +2476,7 @@ static zend_lifetime_interval** zend_jit_trace_allocate_registers(zend_jit_trace`
`2476`	`2476`
`2477`	`2477`	`while (phi) {`
`2478`	`2478`	`i = phi->sources[1];`
`2479`		`- if (start[i] >= 0) {`
	`2479`	`+ if (start[i] >= 0 && !ssa->vars[phi->ssa_var].no_val) {`
`2480`	`2480`	`end[i] = idx;`
`2481`	`2481`	`flags[i] &= ~ZREG_LAST_USE;`
`2482`	`2482`	`}`
`@@ -2487,6 +2487,8 @@ static zend_lifetime_interval** zend_jit_trace_allocate_registers(zend_jit_trace`
`2487`	`2487`	`if (start[i] >= 0 && !ssa->vars[i].phi_use_chain) {`
`2488`	`2488`	`end[i] = idx;`
`2489`	`2489`	`flags[i] &= ~ZREG_LAST_USE;`
	`2490`	`+ } else {`
	`2491`	`+ zend_jit_close_var(stack, i, start, end, flags, idx);`
`2490`	`2492`	`}`
`2491`	`2493`	`}`
`2492`	`2494`	`} else {`