BIND_GLOBAL and BIND_STATIC don't use value of the first operand

dstogov · dstogov · commit 099ffc21698b · 2020-03-27T15:20:21.000+03:00
diff --git a/ext/opcache/Optimizer/zend_ssa.h b/ext/opcache/Optimizer/zend_ssa.h
@@ -213,7 +213,10 @@ static zend_always_inline zend_ssa_phi* zend_ssa_next_use_phi(const zend_ssa *ss
 
 static zend_always_inline zend_bool zend_ssa_is_no_val_use(const zend_op *opline, const zend_ssa_op *ssa_op, int var)
 {
-	if (opline->opcode == ZEND_ASSIGN || opline->opcode == ZEND_UNSET_CV) {
+	if (opline->opcode == ZEND_ASSIGN
+			 || opline->opcode == ZEND_UNSET_CV
+			 || opline->opcode == ZEND_BIND_GLOBAL
+			 || opline->opcode == ZEND_BIND_STATIC) {
 		return ssa_op->op1_use == var && ssa_op->op2_use != var;
 	}
 	if (opline->opcode == ZEND_FE_FETCH_R || opline->opcode == ZEND_FE_FETCH_RW) {

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,10 @@ static zend_always_inline zend_ssa_phi* zend_ssa_next_use_phi(const zend_ssa *ss`
`213`	`213`
`214`	`214`	`static zend_always_inline zend_bool zend_ssa_is_no_val_use(const zend_op opline, const zend_ssa_op ssa_op, int var)`
`215`	`215`	`{`
`216`		`- if (opline->opcode == ZEND_ASSIGN \|\| opline->opcode == ZEND_UNSET_CV) {`
	`216`	`+ if (opline->opcode == ZEND_ASSIGN`
	`217`	`+ \|\| opline->opcode == ZEND_UNSET_CV`
	`218`	`+ \|\| opline->opcode == ZEND_BIND_GLOBAL`
	`219`	`+ \|\| opline->opcode == ZEND_BIND_STATIC) {`
`217`	`220`	`return ssa_op->op1_use == var && ssa_op->op2_use != var;`
`218`	`221`	`}`
`219`	`222`	`if (opline->opcode == ZEND_FE_FETCH_R \|\| opline->opcode == ZEND_FE_FETCH_RW) {`