Merge branch 'PHP-7.1' into PHP-7.2

laruence · laruence · commit d3aa65231e02 · 2017-09-29T11:17:07.000+08:00
* PHP-7.1:
  Fixed bug #75267 (possible &amp;/&amp;&amp; mixup)
diff --git a/ext/opcache/Optimizer/zend_dump.c b/ext/opcache/Optimizer/zend_dump.c
@@ -707,7 +707,7 @@ static void zend_dump_block_info(const zend_cfg *cfg, int n, uint32_t dump_flags
 	if (b->flags & ZEND_BB_KILL_VAR) {
 		fprintf(stderr, " kill_var");
 	}
-	if (!(dump_flags & ZEND_DUMP_HIDE_UNREACHABLE) & !(b->flags & ZEND_BB_REACHABLE)) {
+	if (!(dump_flags & ZEND_DUMP_HIDE_UNREACHABLE) && !(b->flags & ZEND_BB_REACHABLE)) {
 		fprintf(stderr, " unreachable");
 	}
 	if (b->flags & ZEND_BB_LOOP_HEADER) {

Original file line number	Diff line number	Diff line change
`@@ -707,7 +707,7 @@ static void zend_dump_block_info(const zend_cfg *cfg, int n, uint32_t dump_flags`
`707`	`707`	`if (b->flags & ZEND_BB_KILL_VAR) {`
`708`	`708`	`fprintf(stderr, " kill_var");`
`709`	`709`	`}`
`710`		`- if (!(dump_flags & ZEND_DUMP_HIDE_UNREACHABLE) & !(b->flags & ZEND_BB_REACHABLE)) {`
	`710`	`+ if (!(dump_flags & ZEND_DUMP_HIDE_UNREACHABLE) && !(b->flags & ZEND_BB_REACHABLE)) {`
`711`	`711`	`fprintf(stderr, " unreachable");`
`712`	`712`	`}`
`713`	`713`	`if (b->flags & ZEND_BB_LOOP_HEADER) {`