re PR tree-optimization/88217 (Compile time and memory hog w/ -O2 -fstrict-enums...

2018-11-28  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/88217
	* vr-values.c (vr_values::extract_range_from_phi_node): Make
	sure to handle results > +INF and < -INF correctly when
	trying to drop down to +INF - 1 or -INF + 1.

	* g++.dg/pr88217.C: New testcase.

From-SVN: r266557

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 33739adf674edd849d39b8c0a9bf1fa952d6091d..2c5bfffb5ecc14330999e01d2218f4980b910b4c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2018-11-28  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/88217
+       * vr-values.c (vr_values::extract_range_from_phi_node): Make
+       sure to handle results > +INF and < -INF correctly when
+       trying to drop down to +INF - 1 or -INF + 1.
+
 2018-11-28  Alan Modra  <amodra@gmail.com>
 
        * xcoffout.c (do_block): Signed/unsigned warning fix.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4c9a77e08da717ffcf2d55028960aba70ef803a5..9f2383a38c362f048d67121b6b3683fd7445745e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-28  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/88217
+       * g++.dg/pr88217.C: New testcase.
+
 2018-11-28  Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/79351

diff --git a/gcc/testsuite/g++.dg/pr88217.C b/gcc/testsuite/g++.dg/pr88217.C
new file mode 100644 (file)
index 0000000..b0506ac
--- /dev/null
+++ b/gcc/testsuite/g++.dg/pr88217.C
@@ -0,0 +1,18 @@
+// { dg-do compile { target c++11 } }
+// { dg-options "-O2 -fstrict-enums -fno-tree-forwprop -fno-tree-fre" }
+
+extern "C" int printf (const char *, ...);
+
+enum E { e1, e2, e3, X };
+E operator*(E e) { return e; }
+E begin(E e) { return e; }
+E end(E e) { return X; }
+E operator++(E& e) { return e = E(e+1); }
+
+int main()
+{
+  for (auto e: e1)
+    {
+      printf ("%d ", e);
+    }
+}

diff --git a/gcc/vr-values.c b/gcc/vr-values.c
index 41862b976010cd50d1a256165d20bb1e633512a8..a0027c0b3531ecb7517e2b0163e2550c8423299a 100644 (file)
--- a/gcc/vr-values.c
+++ b/gcc/vr-values.c
@@ -2857,7 +2857,8 @@ vr_values::extract_range_from_phi_node (gphi *phi, value_range *vr_result)
       if (cmp_min < 0)
        new_min = lhs_vr->min ();
       else if (cmp_min > 0
-              && !vrp_val_is_min (vr_result->min ()))
+              && tree_int_cst_lt (vrp_val_min (vr_result->type ()),
+                                  vr_result->min ()))
        new_min = int_const_binop (PLUS_EXPR,
                                   vrp_val_min (vr_result->type ()),
                                   build_int_cst (vr_result->type (), 1));
@@ -2866,7 +2867,8 @@ vr_values::extract_range_from_phi_node (gphi *phi, value_range *vr_result)
       if (cmp_max > 0)
        new_max = lhs_vr->max ();
       else if (cmp_max < 0
-              && !vrp_val_is_max (vr_result->max ()))
+              && tree_int_cst_lt (vr_result->max (),
+                                  vrp_val_max (vr_result->type ())))
        new_max = int_const_binop (MINUS_EXPR,
                                   vrp_val_max (vr_result->type ()),
                                   build_int_cst (vr_result->type (), 1));