From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 12 Nov 2018 11:16:36 +0000 (+0000)
Subject: 2018-11-12  Richard Biener  <rguenther@suse.de>
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c82f42af8780b98ebaee28053cefb0bdb391875;p=thirdparty%2Fgcc.git

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

	* tree-vrp.c (set_value_range_to_nonnull): Clear equiv.
	(set_value_range_to_null): Likewise.
	* vr-values.c (vr_values::extract_range_from_comparison):
	Clear equiv for constant singleton ranges.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@266027 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b12964f6d20c..ecfd6aa7fe50 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2018-11-12  Richard Biener  <rguenther@suse.de>
+
+	* tree-vrp.c (set_value_range_to_nonnull): Clear equiv.
+	(set_value_range_to_null): Likewise.
+	* vr-values.c (vr_values::extract_range_from_comparison):
+	Clear equiv for constant singleton ranges.
+
 2018-11-12 Wei Xiao <wei3.xiao@intel.com>
 
 	* config/i386/sse.md: Combine VFIXUPIMM* patterns
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index 3ef676bb71b0..4b3234075f41 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -767,7 +767,7 @@ void
 set_value_range_to_nonnull (value_range *vr, tree type)
 {
   tree zero = build_int_cst (type, 0);
-  vr->update (VR_ANTI_RANGE, zero, zero);
+  set_value_range (vr, VR_ANTI_RANGE, zero, zero, NULL);
 }
 
 
@@ -776,7 +776,7 @@ set_value_range_to_nonnull (value_range *vr, tree type)
 void
 set_value_range_to_null (value_range *vr, tree type)
 {
-  set_value_range_to_value (vr, build_int_cst (type, 0), vr->equiv ());
+  set_value_range_to_value (vr, build_int_cst (type, 0), NULL);
 }
 
 /* Return true, if VAL1 and VAL2 are equal values for VRP purposes.  */
diff --git a/gcc/vr-values.c b/gcc/vr-values.c
index 4edc5a467eee..dc8a071aafca 100644
--- a/gcc/vr-values.c
+++ b/gcc/vr-values.c
@@ -896,7 +896,7 @@ vr_values::extract_range_from_comparison (value_range *vr, enum tree_code code,
 	 type.  */
       val = fold_convert (type, val);
       if (is_gimple_min_invariant (val))
-	set_value_range_to_value (vr, val, vr->equiv ());
+	set_value_range_to_value (vr, val, NULL);
       else
 	vr->update (VR_RANGE, val, val);
     }
@@ -1672,7 +1672,7 @@ vr_values::adjust_range_with_scev (value_range *vr, struct loop *loop,
   /* Like in PR19590, scev can return a constant function.  */
   if (is_gimple_min_invariant (chrec))
     {
-      set_value_range_to_value (vr, chrec, vr->equiv ());
+      set_value_range_to_value (vr, chrec, NULL);
       return;
     }