From dad16761d163a5854d55f27f2e5212d1ade8b799 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Wed, 2 Apr 2014 08:26:57 +0000
Subject: [PATCH] re PR middle-end/60729 (Compiler failure for combination of
 -ftrapv and -O3: compiler error: in prepare_cmp_insn)

2014-04-02  Richard Biener  <rguenther@suse.de>

	PR middle-end/60729
	* optabs.c (expand_abs_nojump): Honor flag_trapv only for
	MODE_INTs.  Properly use negv_optab.
	(expand_abs): Likewise.

	* g++.dg/vect/pr60729.cc: New testcase.

From-SVN: r209012
---
 gcc/ChangeLog                        |  7 +++++++
 gcc/optabs.c                         |  9 ++++++---
 gcc/testsuite/ChangeLog              |  5 +++++
 gcc/testsuite/g++.dg/vect/pr60729.cc | 10 ++++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/vect/pr60729.cc

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8a4de8639ac..cf26a4128b6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-04-02  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/60729
+	* optabs.c (expand_abs_nojump): Honor flag_trapv only for
+	MODE_INTs.  Properly use negv_optab.
+	(expand_abs): Likewise.
+
 2014-04-02  Richard Biener  <rguenther@suse.de>
 
 	PR bootstrap/60719
diff --git a/gcc/optabs.c b/gcc/optabs.c
index c4540f8856c..54f07ab02b9 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -3384,7 +3384,8 @@ expand_abs_nojump (enum machine_mode mode, rtx op0, rtx target,
 {
   rtx temp;
 
-  if (! flag_trapv)
+  if (GET_MODE_CLASS (mode) != MODE_INT
+      || ! flag_trapv)
     result_unsignedp = 1;
 
   /* First try to do it with a special abs instruction.  */
@@ -3407,7 +3408,8 @@ expand_abs_nojump (enum machine_mode mode, rtx op0, rtx target,
     {
       rtx last = get_last_insn ();
 
-      temp = expand_unop (mode, neg_optab, op0, NULL_RTX, 0);
+      temp = expand_unop (mode, result_unsignedp ? neg_optab : negv_optab,
+			  op0, NULL_RTX, 0);
       if (temp != 0)
 	temp = expand_binop (mode, smax_optab, op0, temp, target, 0,
 			     OPTAB_WIDEN);
@@ -3449,7 +3451,8 @@ expand_abs (enum machine_mode mode, rtx op0, rtx target,
 {
   rtx temp, op1;
 
-  if (! flag_trapv)
+  if (GET_MODE_CLASS (mode) != MODE_INT
+      || ! flag_trapv)
     result_unsignedp = 1;
 
   temp = expand_abs_nojump (mode, op0, target, result_unsignedp);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7092fa70549..5e3bc26c8e3 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-02  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/60729
+	* g++.dg/vect/pr60729.cc: New testcase.
+
 2014-04-01  Fabien Chêne  <fabien@gcc.gnu.org>
 
         * g++.dg/init/ctor4.C: Adjust.
diff --git a/gcc/testsuite/g++.dg/vect/pr60729.cc b/gcc/testsuite/g++.dg/vect/pr60729.cc
new file mode 100644
index 00000000000..fd472c50af2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/vect/pr60729.cc
@@ -0,0 +1,10 @@
+// { dg-do compile }
+// { dg-additional-options "-ftrapv" }
+
+void doSomething(int dim, double *Y, double *A) 
+{
+  for (int k=0; k<dim; k++) 
+    Y[k] += __builtin_fabs (A[k]);
+}
+
+// { dg-final { cleanup-tree-dump "vect" } }