From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 10 Dec 2019 21:04:57 +0000 (+0100)
Subject: re PR ipa/92883 (ICE in compare_values_warnv)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=27f418b8ec6d0a95c10844e468d2d579ea16d826;p=gcc.git

re PR ipa/92883 (ICE in compare_values_warnv)

	PR ipa/92883
	* ipa-cp.c (propagate_vr_across_jump_function): Pass jvr rather
	than *jfunc->m_vr to intersect.  Formatting fix.

	* gcc.dg/ipa/pr92883.c: New test.

From-SVN: r279194
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4504e3c9115..71609c9121f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2019-12-10  Jakub Jelinek  <jakub@redhat.com>
 
+	PR ipa/92883
+	* ipa-cp.c (propagate_vr_across_jump_function): Pass jvr rather
+	than *jfunc->m_vr to intersect.  Formatting fix.
+
 	PR middle-end/92825
 	* cfgexpand.c (add_stack_protection_conflicts): Change return type
 	from void to bool, return true if at least one stack_vars[i].decl
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index 14064ae0034..1a80ccbde2d 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -2369,12 +2369,10 @@ propagate_vr_across_jump_function (cgraph_edge *cs, ipa_jump_func *jfunc,
 
       value_range vr;
       if (TREE_CODE_CLASS (operation) == tcc_unary)
-	{
-	  ipa_vr_operation_and_type_effects (&vr,
-					     &src_lats->m_value_range.m_vr,
-					     operation, param_type,
-					     operand_type);
-	}
+	ipa_vr_operation_and_type_effects (&vr,
+					   &src_lats->m_value_range.m_vr,
+					   operation, param_type,
+					   operand_type);
       /* A crude way to prevent unbounded number of value range updates
 	 in SCC components.  We should allow limited number of updates within
 	 SCC, too.  */
@@ -2400,7 +2398,7 @@ propagate_vr_across_jump_function (cgraph_edge *cs, ipa_jump_func *jfunc,
 						     NOP_EXPR,
 						     param_type,
 						     jfunc->m_vr->type ()))
-		vr.intersect (*jfunc->m_vr);
+		vr.intersect (jvr);
 	    }
 	  return dest_lat->meet_with (&vr);
 	}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1d520d6a3d2..4f4a2a55e9b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2019-12-10  Jakub Jelinek  <jakub@redhat.com>
 
+	PR ipa/92883
+	* gcc.dg/ipa/pr92883.c: New test.
+
 	PR middle-end/92825
 	* gcc.target/i386/pr92825.c: New test.
 
diff --git a/gcc/testsuite/gcc.dg/ipa/pr92883.c b/gcc/testsuite/gcc.dg/ipa/pr92883.c
new file mode 100644
index 00000000000..a7c5dc6de87
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/ipa/pr92883.c
@@ -0,0 +1,14 @@
+/* PR ipa/92883 */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+int a, b, c, d;
+unsigned e;
+void baz (void *, int);
+void grault (int, unsigned long);
+int foo (unsigned g) { return a / g; }
+void bar (void *g) { if (b) baz (g, 5); }
+static void quux (int, unsigned long);
+static void qux (unsigned long g) { if (g) { d = foo (-1); quux (e, (d & 2) + g); } }
+static void quux (int g, unsigned long m) { (void) g; grault (c, m); bar (""); }
+void corge () { qux (e); }