aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorAldy Hernandez <aldyh@redhat.com>2022-10-17 18:56:24 +0200
committerAldy Hernandez <aldyh@redhat.com>2022-10-17 20:55:27 +0200
commitc9b840db504d15db01f06fe1fec38282dbafee07 (patch)
treeeca2aeb73939c25899b7d8ca8f6e8726c52eaca0 /gcc
parentd45af5c2eb1ba1e48449d8f3c5b4e3994a956f92 (diff)
downloadgcc-c9b840db504d15db01f06fe1fec38282dbafee07.zip
gcc-c9b840db504d15db01f06fe1fec38282dbafee07.tar.gz
gcc-c9b840db504d15db01f06fe1fec38282dbafee07.tar.bz2
Make sure exported range for SSA post-dominates the DEF in set_global_ranges_from_unreachable_edges.
The problem here is that we're exporting a range for an SSA range that happens on the other side of a __builtin_unreachable, but the SSA does not post-dominate the definition point. This is causing ivcanon to unroll things incorrectly. This was a snafu when converting the code from evrp. PR tree-optimization/107293 gcc/ChangeLog: * tree-ssa-dom.cc (dom_opt_dom_walker::set_global_ranges_from_unreachable_edges): Check that condition post-dominates the definition point. gcc/testsuite/ChangeLog: * gcc.dg/tree-ssa/pr107293.c: New test.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/gcc.dg/tree-ssa/pr107293.c32
-rw-r--r--gcc/tree-ssa-dom.cc6
2 files changed, 37 insertions, 1 deletions
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr107293.c b/gcc/testsuite/gcc.dg/tree-ssa/pr107293.c
new file mode 100644
index 0000000..724c31a
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr107293.c
@@ -0,0 +1,32 @@
+// { dg-do run }
+// { dg-options "-w -Os" }
+
+short a;
+int b[1];
+
+int c(int p) {
+ return (p < 0) ? 0 : 10 + ((p / 100 - 16) / 4);
+}
+
+void f(int n) {
+ while (1) {
+ int m = n;
+ while ((m ) )
+ m /= 2;
+ break;
+ }
+}
+
+void g() {
+ int h = a = 0;
+ for (; h + a <= 0; a++) {
+ if (b[c(a - 6)])
+ break;
+ f(a);
+ }
+}
+int main() {
+ g();
+ if (a != 1)
+ __builtin_abort ();
+}
diff --git a/gcc/tree-ssa-dom.cc b/gcc/tree-ssa-dom.cc
index e6b8dac..c7f095d 100644
--- a/gcc/tree-ssa-dom.cc
+++ b/gcc/tree-ssa-dom.cc
@@ -1367,7 +1367,11 @@ dom_opt_dom_walker::set_global_ranges_from_unreachable_edges (basic_block bb)
tree name;
gori_compute &gori = m_ranger->gori ();
FOR_EACH_GORI_EXPORT_NAME (gori, pred_e->src, name)
- if (all_uses_feed_or_dominated_by_stmt (name, stmt))
+ if (all_uses_feed_or_dominated_by_stmt (name, stmt)
+ // The condition must post-dominate the definition point.
+ && (SSA_NAME_IS_DEFAULT_DEF (name)
+ || (gimple_bb (SSA_NAME_DEF_STMT (name))
+ == pred_e->src)))
{
Value_Range r (TREE_TYPE (name));