From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 21 Dec 2017 19:27:21 +0000 (+0100)
Subject: re PR tree-optimization/83523 (ICE: verify_gimple failed (error: statement marked... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9b8e85a5e3be803e0b476a8bbcb8aee0e9c48837;p=gcc.git

re PR tree-optimization/83523 (ICE: verify_gimple failed (error: statement marked for throw, but doesn't))

	PR tree-optimization/83523
	* tree-ssa-math-opts.c (is_widening_mult_p): Return false if
	for INTEGER_TYPE TYPE_OVERFLOW_TRAPS.
	(convert_mult_to_fma): Likewise.

	* g++.dg/tree-ssa/pr83523.C: New test.

From-SVN: r255953
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2b1aa73775a..4b886cc2f49 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2017-12-21  Jakub Jelinek  <jakub@redhat.com>
 
+	PR tree-optimization/83523
+	* tree-ssa-math-opts.c (is_widening_mult_p): Return false if
+	for INTEGER_TYPE TYPE_OVERFLOW_TRAPS.
+	(convert_mult_to_fma): Likewise.
+
 	PR tree-optimization/83521
 	* tree-ssa-phiopt.c (factor_out_conditional_conversion): Use
 	gimple_build_assign without code on result of
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 566efde7a33..088e8b0784f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2017-12-21  Jakub Jelinek  <jakub@redhat.com>
 
+	PR tree-optimization/83523
+	* g++.dg/tree-ssa/pr83523.C: New test.
+
 	PR tree-optimization/83521
 	* gcc.dg/pr83521.c: New test.
 
diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr83523.C b/gcc/testsuite/g++.dg/tree-ssa/pr83523.C
new file mode 100644
index 00000000000..d9adf90f0b5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr83523.C
@@ -0,0 +1,25 @@
+// PR tree-optimization/83523
+// { dg-do compile }
+// { dg-options "-O2 -fexceptions -fnon-call-exceptions -ftrapv" }
+
+#ifdef __SIZEOF_INT128__
+typedef __int128 T;
+typedef long long int U;
+#else
+typedef long long int T;
+typedef int U;
+#endif
+
+struct S { S (); ~S (); };
+void bar ();
+
+T
+foo (U x, U y)
+{
+  T z = x;
+  S s;
+  bar ();
+  z *= y;
+  bar ();
+  return z;
+}
diff --git a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c
index 4e8f5e728d0..553a37ccc3a 100644
--- a/gcc/tree-ssa-math-opts.c
+++ b/gcc/tree-ssa-math-opts.c
@@ -2196,8 +2196,12 @@ is_widening_mult_p (gimple *stmt,
 {
   tree type = TREE_TYPE (gimple_assign_lhs (stmt));
 
-  if (TREE_CODE (type) != INTEGER_TYPE
-      && TREE_CODE (type) != FIXED_POINT_TYPE)
+  if (TREE_CODE (type) == INTEGER_TYPE)
+    {
+      if (TYPE_OVERFLOW_TRAPS (type))
+	return false;
+    }
+  else if (TREE_CODE (type) != FIXED_POINT_TYPE)
     return false;
 
   if (!is_widening_mult_rhs_p (type, gimple_assign_rhs1 (stmt), type1_out,
@@ -2656,7 +2660,7 @@ convert_mult_to_fma (gimple *mul_stmt, tree op1, tree op2)
 
   /* We don't want to do bitfield reduction ops.  */
   if (INTEGRAL_TYPE_P (type)
-      && !type_has_mode_precision_p (type))
+      && (!type_has_mode_precision_p (type) || TYPE_OVERFLOW_TRAPS (type)))
     return false;
 
   /* If the target doesn't support it, don't generate it.  We assume that