summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/torture/pr91267.c21
-rw-r--r--gcc/vr-values.c6
4 files changed, 37 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8cd321ea61b..01e4666051d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-07-29 Richard Biener <rguenther@suse.de>
+
+ PR tree-optimization/91267
+ * vr-values.c (vr_values::update_value_range): Add early return
+ for effectively VARYING lattice entry.
+
2019-07-29 Richard Sandiford <richard.sandiford@arm.com>
PR debug/86638
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cc1aadfac55..30671620e43 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-07-29 Richard Biener <rguenther@suse.de>
+
+ PR tree-optimization/91267
+ * gcc.dg/torture/pr91267.c: New testcase.
+
2019-07-29 Richard Sandiford <richard.sandiford@arm.com>
* c-c++-common/guality/Og-dce-1.c: New test.
diff --git a/gcc/testsuite/gcc.dg/torture/pr91267.c b/gcc/testsuite/gcc.dg/torture/pr91267.c
new file mode 100644
index 00000000000..084bd248439
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr91267.c
@@ -0,0 +1,21 @@
+/* { dg-do compile } */
+
+void bar (void);
+void baz (int);
+char *qux (void);
+int a, b;
+
+void
+foo (int f, char *d)
+{
+ char *e;
+ while (d)
+ {
+ if (f)
+ if (e)
+ bar ();
+ baz (e - (d + a));
+ b = e - d;
+ d = qux ();
+ }
+}
diff --git a/gcc/vr-values.c b/gcc/vr-values.c
index d6a8847369c..d03309942af 100644
--- a/gcc/vr-values.c
+++ b/gcc/vr-values.c
@@ -202,8 +202,12 @@ vr_values::update_value_range (const_tree var, value_range *new_vr)
new_vr->intersect (&nr);
}
- /* Update the value range, if necessary. */
+ /* Update the value range, if necessary. If we cannot allocate a lattice
+ entry for VAR keep it at VARYING. This happens when DOM feeds us stmts
+ with SSA names allocated after setting up the lattice. */
old_vr = get_lattice_entry (var);
+ if (!old_vr)
+ return false;
is_new = !old_vr->equal_p (*new_vr, /*ignore_equivs=*/false);
if (is_new)