tree-optimization/110766 - missing PHI location check

The following adds a missing PHI location check before querying
the loop latch PHI arg from it.

	PR tree-optimization/110766
	* tree-scalar-evolution.cc
	(analyze_and_compute_bitwise_induction_effect): Check the PHI
	is defined in the loop header.

	* gcc.dg/torture/pr110766.c: New testcase.

diff --git a/gcc/testsuite/gcc.dg/torture/pr110766.c b/gcc/testsuite/gcc.dg/torture/pr110766.c
new file mode 100644 (file)
index 0000000..97dcacf
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr110766.c
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+
+int a, b, c, e;
+short d, f;
+int g(int h) { return h > a ? h : h << a; }
+int main() {
+  while (e) {
+    b = 0;
+    for (; b < 3; b++)
+      if (c) {
+        e = g(1);
+        f = e | d;
+      }
+    d = 0;
+  }
+  return 0;
+}

diff --git a/gcc/tree-scalar-evolution.cc b/gcc/tree-scalar-evolution.cc
index 2abe8fa0b90d0784cb1e380b37858a41a0c897a0..3fb6951e6085352c027d32c3548246042b98b64b 100644 (file)
--- a/gcc/tree-scalar-evolution.cc
+++ b/gcc/tree-scalar-evolution.cc
@@ -3519,6 +3519,7 @@ analyze_and_compute_bitwise_induction_effect (class loop* loop,
   if (!gimple_bitwise_induction_p (phidef, &match_op[0], NULL)
       || TREE_CODE (match_op[2]) != SSA_NAME
       || !(header_phi = dyn_cast <gphi *> (SSA_NAME_DEF_STMT (match_op[2])))
+      || gimple_bb (header_phi) != loop->header
       || gimple_phi_num_args (header_phi) != 2)
     return NULL_TREE;