Disable eliminatin of empty basic block with multiple predecessors

dstogov · dstogov · commit 7921e0831b5c · 2017-09-12T09:54:45.000+03:00
diff --git a/ext/opcache/Optimizer/dfa_pass.c b/ext/opcache/Optimizer/dfa_pass.c
@@ -578,7 +578,7 @@ static void zend_ssa_replace_control_link(zend_op_array *op_array, zend_ssa *ssa
 
 static void zend_ssa_unlink_block(zend_op_array *op_array, zend_ssa *ssa, zend_basic_block *block, int block_num)
 {
-	if (block->predecessors_count && ssa->blocks[block_num].phis == NULL) {
+	if (block->predecessors_count == 1 && ssa->blocks[block_num].phis == NULL) {
 		int *predecessors, i;
 
 		ZEND_ASSERT(block->successors_count == 1);
diff --git a/ext/opcache/tests/jmp_elim_003.phpt b/ext/opcache/tests/jmp_elim_003.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Incorrect empty basic block elimination
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+class A {
+    public static function test($args = array()) {
+        if (!function_exists( 'stream_socket_client'))
+            return false;
+
+        $is_ssl = isset( $args['ssl'] ) && $args['ssl'];
+
+        if ($is_ssl) {
+            if (!extension_loaded( 'openssl'))
+                return false;
+            if (!function_exists('openssl_x509_parse'))
+                return false;
+        }
+
+        return apply_filters('use_streams_transport', true, $args);
+    }
+}
+?>
+OK
+--EXPECT--
+OK

Original file line number	Diff line number	Diff line change
`@@ -578,7 +578,7 @@ static void zend_ssa_replace_control_link(zend_op_array op_array, zend_ssa ssa`
`578`	`578`
`579`	`579`	`static void zend_ssa_unlink_block(zend_op_array op_array, zend_ssa ssa, zend_basic_block *block, int block_num)`
`580`	`580`	`{`
`581`		`- if (block->predecessors_count && ssa->blocks[block_num].phis == NULL) {`
	`581`	`+ if (block->predecessors_count == 1 && ssa->blocks[block_num].phis == NULL) {`
`582`	`582`	`int *predecessors, i;`
`583`	`583`
`584`	`584`	`ZEND_ASSERT(block->successors_count == 1);`