Merge branch 'master' into jit-dynasm

dstogov · dstogov · commit 8b31f8abe671 · 2017-09-04T22:13:02.000+03:00
* master:
  Fixed edge-case in SSA use/def chain construction and type inference.
diff --git a/ext/opcache/Optimizer/zend_ssa.h b/ext/opcache/Optimizer/zend_ssa.h
@@ -188,10 +188,13 @@ END_EXTERN_C()
 static zend_always_inline int zend_ssa_next_use(const zend_ssa_op *ssa_op, int var, int use)
 {
 	ssa_op += use;
-	if (ssa_op->result_use == var) {
+	if (ssa_op->op1_use == var) {
+		return ssa_op->op1_use_chain;
+	} else if (ssa_op->op2_use == var) {
+		return ssa_op->op2_use_chain;
+	} else {
 		return ssa_op->res_use_chain;
 	}
-	return (ssa_op->op1_use == var) ? ssa_op->op1_use_chain : ssa_op->op2_use_chain;
 }
 
 static zend_always_inline zend_ssa_phi* zend_ssa_next_use_phi(const zend_ssa *ssa, int var, const zend_ssa_phi *p)
@@ -218,7 +221,7 @@ static zend_always_inline zend_bool zend_ssa_is_no_val_use(const zend_op *opline
 		return ssa_op->op2_use == var && ssa_op->op1_use != var;
 	}
 	if (ssa_op->result_use == var && opline->opcode != ZEND_ADD_ARRAY_ELEMENT) {
-		return 1;
+		return ssa_op->op1_use != var && ssa_op->op2_use != var;
 	}
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -188,10 +188,13 @@ END_EXTERN_C()`
`188`	`188`	`static zend_always_inline int zend_ssa_next_use(const zend_ssa_op *ssa_op, int var, int use)`
`189`	`189`	`{`
`190`	`190`	`ssa_op += use;`
`191`		`- if (ssa_op->result_use == var) {`
	`191`	`+ if (ssa_op->op1_use == var) {`
	`192`	`+ return ssa_op->op1_use_chain;`
	`193`	`+ } else if (ssa_op->op2_use == var) {`
	`194`	`+ return ssa_op->op2_use_chain;`
	`195`	`+ } else {`
`192`	`196`	`return ssa_op->res_use_chain;`
`193`	`197`	`}`
`194`		`- return (ssa_op->op1_use == var) ? ssa_op->op1_use_chain : ssa_op->op2_use_chain;`
`195`	`198`	`}`
`196`	`199`
`197`	`200`	`static zend_always_inline zend_ssa_phi* zend_ssa_next_use_phi(const zend_ssa ssa, int var, const zend_ssa_phi p)`
`@@ -218,7 +221,7 @@ static zend_always_inline zend_bool zend_ssa_is_no_val_use(const zend_op *opline`
`218`	`221`	`return ssa_op->op2_use == var && ssa_op->op1_use != var;`
`219`	`222`	`}`
`220`	`223`	`if (ssa_op->result_use == var && opline->opcode != ZEND_ADD_ARRAY_ELEMENT) {`
`221`		`- return 1;`
	`224`	`+ return ssa_op->op1_use != var && ssa_op->op2_use != var;`
`222`	`225`	`}`
`223`	`226`	`return 0;`
`224`	`227`	`}`