aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2018-12-11 14:51:44 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2018-12-11 14:51:44 +0100
commit6d9391732bc8816627ff40103a6261d233c722bf (patch)
treeb926476141d3410ddc5c98ecd3f60c03a32b092a /gcc
parentef9fc3ba34633a5efc1a123557ecda1691731466 (diff)
downloadgcc-6d9391732bc8816627ff40103a6261d233c722bf.zip
gcc-6d9391732bc8816627ff40103a6261d233c722bf.tar.gz
gcc-6d9391732bc8816627ff40103a6261d233c722bf.tar.bz2
re PR sanitizer/88426 (Compiler crash if use special code with command line switch -fsanitize=float-cast-overflow)
PR sanitizer/88426 * c-convert.c (convert): Call c_fully_fold before calling ubsan_instrument_float_cast. * c-c++-common/ubsan/float-cast-overflow-11.c: New test. From-SVN: r267022
Diffstat (limited to 'gcc')
-rw-r--r--gcc/c/ChangeLog6
-rw-r--r--gcc/c/c-convert.c1
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/c-c++-common/ubsan/float-cast-overflow-11.c10
4 files changed, 22 insertions, 0 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 9bbfe76..294442c 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,9 @@
+2018-12-11 Jakub Jelinek <jakub@redhat.com>
+
+ PR sanitizer/88426
+ * c-convert.c (convert): Call c_fully_fold before calling
+ ubsan_instrument_float_cast.
+
2018-12-08 Segher Boessenkool <segher@kernel.crashing.org>
* c-parser (c_parser_asm_statement) [RID_INLINE]: Delete stray line
diff --git a/gcc/c/c-convert.c b/gcc/c/c-convert.c
index b57bb8e..6165e14 100644
--- a/gcc/c/c-convert.c
+++ b/gcc/c/c-convert.c
@@ -115,6 +115,7 @@ convert (tree type, tree expr)
&& COMPLETE_TYPE_P (type))
{
expr = save_expr (expr);
+ expr = c_fully_fold (expr, false, NULL);
tree check = ubsan_instrument_float_cast (loc, type, expr);
expr = fold_build1 (FIX_TRUNC_EXPR, type, expr);
if (check == NULL_TREE)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b718fed..52804b4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-12-11 Jakub Jelinek <jakub@redhat.com>
+
+ PR sanitizer/88426
+ * c-c++-common/ubsan/float-cast-overflow-11.c: New test.
+
2018-12-11 Yannick Moy <moy@adacore.com>
* gnat.dg/ghost4.adb: New testcase.
diff --git a/gcc/testsuite/c-c++-common/ubsan/float-cast-overflow-11.c b/gcc/testsuite/c-c++-common/ubsan/float-cast-overflow-11.c
new file mode 100644
index 0000000..b96c218
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/ubsan/float-cast-overflow-11.c
@@ -0,0 +1,10 @@
+/* PR sanitizer/88426 */
+/* { dg-do compile } */
+/* { dg-options "-fsanitize=float-cast-overflow" } */
+
+int
+foo (void)
+{
+ const float v = 0.0f;
+ return (int) (v < 0.0f ? v : 0.0f);
+}