Merge branch 'PHP-8.0' into PHP-8.1

dstogov · dstogov · commit af75eab0ef24 · 2022-06-29T13:09:14.000+03:00
* PHP-8.0: Fix incorrect condition introdused in 7cf6f17
diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
@@ -1681,7 +1681,7 @@ static void zend_jit_add_hint(zend_lifetime_interval **intervals, int dst, int s
 			dst = intervals[dst]->hint->ssa_var;
 		}
 	}
-	if (dst == src) {
+	if (dst != src) {
 		intervals[dst]->hint = intervals[src];
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1681,7 +1681,7 @@ static void zend_jit_add_hint(zend_lifetime_interval **intervals, int dst, int s`
`1681`	`1681`	`dst = intervals[dst]->hint->ssa_var;`
`1682`	`1682`	`}`
`1683`	`1683`	`}`
`1684`		`- if (dst == src) {`
	`1684`	`+ if (dst != src) {`
`1685`	`1685`	`intervals[dst]->hint = intervals[src];`
`1686`	`1686`	`}`
`1687`	`1687`	`}`