From: Richard Biener <rguenther@suse.de>
Date: Thu, 29 Oct 2015 08:21:50 +0000 (+0000)
Subject: re PR middle-end/56956 (ftrapv traps on valid abs-like code)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fcbb6b483667d4c3f7bf77fca5683c688e7b3c92;p=gcc.git

re PR middle-end/56956 (ftrapv traps on valid abs-like code)

2015-10-29  Richard Biener  <rguenther@suse.de>

	PR middle-end/56956
	* fold-const.c (fold_cond_expr_with_comparison): Do not fold
	unsigned conditonal negation to ABS_EXPR.

	* c-c++-common/ubsan/pr56956.c: New testcase.

From-SVN: r229517
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9dfd43434b8..72d61adc5dc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-29  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/56956
+	* fold-const.c (fold_cond_expr_with_comparison): Do not fold
+	unsigned conditonal negation to ABS_EXPR.
+
 2015-10-29  Richard Biener  <rguenther@suse.de>
 
 	* gimple-match-head.c (gimple_simplify): Remove premature checking
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 71d72f19ece..d88bffc2bc6 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -4963,8 +4963,7 @@ fold_cond_expr_with_comparison (location_t loc, tree type,
       case GE_EXPR:
       case GT_EXPR:
 	if (TYPE_UNSIGNED (TREE_TYPE (arg1)))
-	  arg1 = fold_convert_loc (loc, signed_type_for
-			       (TREE_TYPE (arg1)), arg1);
+	  break;
 	tem = fold_build1_loc (loc, ABS_EXPR, TREE_TYPE (arg1), arg1);
 	return pedantic_non_lvalue_loc (loc, fold_convert_loc (loc, type, tem));
       case UNLE_EXPR:
@@ -4974,8 +4973,7 @@ fold_cond_expr_with_comparison (location_t loc, tree type,
       case LE_EXPR:
       case LT_EXPR:
 	if (TYPE_UNSIGNED (TREE_TYPE (arg1)))
-	  arg1 = fold_convert_loc (loc, signed_type_for
-			       (TREE_TYPE (arg1)), arg1);
+	  break;
 	tem = fold_build1_loc (loc, ABS_EXPR, TREE_TYPE (arg1), arg1);
 	return negate_expr (fold_convert_loc (loc, type, tem));
       default:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 43f6007e9e2..8c3f4ade88c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-29  Richard Biener  <rguenther@suse.de>
+
+	PR middle-end/56956
+	* c-c++-common/ubsan/pr56956.c: New testcase.
+
 2015-10-28  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gnat.dg/discr44.adb: New test.
diff --git a/gcc/testsuite/c-c++-common/ubsan/pr56956.c b/gcc/testsuite/c-c++-common/ubsan/pr56956.c
new file mode 100644
index 00000000000..996e1dd8a79
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/ubsan/pr56956.c
@@ -0,0 +1,15 @@
+/* { dg-do run } */
+/* { dg-options "-fsanitize=undefined -fsanitize-undefined-trap-on-error" } */
+
+unsigned int __attribute__((noinline,noclone))
+foo (unsigned int x)
+{
+  return x <= __INT_MAX__ ? x : -x;
+}
+
+int
+main ()
+{
+  volatile unsigned int tem = foo (-__INT_MAX__ - 1);
+  return 0;
+}