From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 17 Dec 2014 09:26:49 +0000 (+0100)
Subject: re PR sanitizer/64289 (ICE with -fsanitize=float-cast-overflow)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8f94a8c4cc27e04b3c8ef2f8b650263aab6ff4db;p=gcc.git

re PR sanitizer/64289 (ICE with -fsanitize=float-cast-overflow)

	PR sanitizer/64289
	* c-convert.c: Include ubsan.h.
	(convert): For real -> integral casts and
	-fsanitize=float-cast-overflow don't call convert_to_integer, but
	instead instrument the float cast directly.

	* c-c++-common/ubsan/pr64289.c: New test.

From-SVN: r218811
---

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index cef3aa18687..ad9b8bc156f 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,11 @@
+2014-12-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR sanitizer/64289
+	* c-convert.c: Include ubsan.h.
+	(convert): For real -> integral casts and
+	-fsanitize=float-cast-overflow don't call convert_to_integer, but
+	instead instrument the float cast directly.
+
 2014-11-29  Jakub Jelinek  <jakub@redhat.com>
 
 	* c-typeck.c (convert_lvalue_to_rvalue, build_atomic_assign,
diff --git a/gcc/c/c-convert.c b/gcc/c/c-convert.c
index 95be453fa3f..ba565da1218 100644
--- a/gcc/c/c-convert.c
+++ b/gcc/c/c-convert.c
@@ -34,6 +34,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "c-tree.h"
 #include "langhooks.h"
 #include "target.h"
+#include "ubsan.h"
 
 /* Change of width--truncation and extension of integers or reals--
    is represented with NOP_EXPR.  Proper functioning of many things
@@ -109,6 +110,20 @@ convert (tree type, tree expr)
 
     case INTEGER_TYPE:
     case ENUMERAL_TYPE:
+      if (flag_sanitize & SANITIZE_FLOAT_CAST
+	  && TREE_CODE (TREE_TYPE (expr)) == REAL_TYPE
+	  && COMPLETE_TYPE_P (type)
+	  && current_function_decl != NULL_TREE
+	  && !lookup_attribute ("no_sanitize_undefined",
+				DECL_ATTRIBUTES (current_function_decl)))
+	{
+	  expr = c_save_expr (expr);
+	  tree check = ubsan_instrument_float_cast (loc, type, expr);
+	  expr = fold_build1 (FIX_TRUNC_EXPR, type, expr);
+	  if (check == NULL)
+	    return expr;
+	  return fold_build2 (COMPOUND_EXPR, TREE_TYPE (expr), check, expr);
+	}
       ret = convert_to_integer (type, e);
       goto maybe_fold;
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e896b0b73ce..9f6fd314747 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR sanitizer/64289
+	* c-c++-common/ubsan/pr64289.c: New test.
+
 2014-12-16  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/58650
diff --git a/gcc/testsuite/c-c++-common/ubsan/pr64289.c b/gcc/testsuite/c-c++-common/ubsan/pr64289.c
new file mode 100644
index 00000000000..1e38e6d3c29
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/ubsan/pr64289.c
@@ -0,0 +1,9 @@
+/* PR sanitizer/64289 */
+/* { dg-do compile } */
+/* { dg-options "-fsanitize=float-cast-overflow" } */
+
+int
+foo (int a)
+{
+  return (int) (0 ? 0 : a ? a : 0.5);
+}