From: Jakub Jelinek <jakub@redhat.com>
Date: Sun, 1 Feb 2015 21:50:53 +0000 (+0100)
Subject: backport: re PR tree-optimization/64563 (ICE with "-Wall -Wextra" at -Os and above... 
X-Git-Tag: releases/gcc-4.8.5~296
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38ab75d4fa8d53bbc5bc6e05b4d8aea4866c79e1;p=thirdparty%2Fgcc.git

backport: re PR tree-optimization/64563 (ICE with "-Wall -Wextra" at -Os and above on x86_64-linux-gnu)

	Backported from mainline
	2015-01-12  Jakub Jelinek  <jakub@redhat.com>

	PR tree-optimization/64563
	* tree-vrp.c (vrp_evaluate_conditional): Check for VR_RANGE
	instead of != VR_VARYING.

	* gcc.dg/pr64563.c: New test.

From-SVN: r220332
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2f71306db30c..c5bca53607b5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -3,6 +3,10 @@
 	Backported from mainline
 	2015-01-12  Jakub Jelinek  <jakub@redhat.com>
 
+	PR tree-optimization/64563
+	* tree-vrp.c (vrp_evaluate_conditional): Check for VR_RANGE
+	instead of != VR_VARYING.
+
 	PR target/64513
 	* config/i386/i386.c (ix86_expand_prologue): Add
 	REG_FRAME_RELATED_EXPR to %rax and %r10 pushes.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b855a38d8e6d..909c125d9623 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -3,6 +3,9 @@
 	Backported from mainline
 	2015-01-12  Jakub Jelinek  <jakub@redhat.com>
 
+	PR tree-optimization/64563
+	* gcc.dg/pr64563.c: New test.
+
 	PR target/64513
 	* gcc.target/i386/pr64513.c: New test.
 
diff --git a/gcc/testsuite/gcc.dg/pr64563.c b/gcc/testsuite/gcc.dg/pr64563.c
new file mode 100644
index 000000000000..7223349c41f7
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr64563.c
@@ -0,0 +1,14 @@
+/* PR tree-optimization/64563 */
+/* { dg-do compile } */
+/* { dg-options "-Os -Wtype-limits" } */
+
+int a, b, c, d, f;
+unsigned int e;
+
+void
+foo (void)
+{
+  d = b = (a != (e | 4294967288UL));
+  if (!d)
+    c = f || b;
+}
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index 96a439a9b8a1..6363e4538222 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -6811,7 +6811,7 @@ vrp_evaluate_conditional (enum tree_code code, tree op0, tree op1, gimple stmt)
       tree type = TREE_TYPE (op0);
       value_range_t *vr0 = get_value_range (op0);
 
-      if (vr0->type != VR_VARYING
+      if (vr0->type == VR_RANGE
 	  && INTEGRAL_TYPE_P (type)
 	  && vrp_val_is_min (vr0->min)
 	  && vrp_val_is_max (vr0->max)