From 4d1b8e70fa5a3b4f305afdc977f02ae39761761b Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 21 Mar 2017 08:01:05 +0100 Subject: [PATCH] re PR c/80097 (internal compiler error in c_fully_fold_internal with std=c89 and -fsanitize=float-divide-by-zero) PR c/80097 * c-typeck.c (build_binary_op): Add EXCESS_PRECISION_EXPR only around optional COMPOUND_EXPR with ubsan instrumentation. * gcc.dg/ubsan/pr80097.c: New test. From-SVN: r246302 --- gcc/c/ChangeLog | 6 ++++++ gcc/c/c-typeck.c | 6 ++++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/ubsan/pr80097.c | 10 ++++++++++ 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/ubsan/pr80097.c diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index ac8db9b8813..218b804cfa3 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,9 @@ +2017-03-21 Jakub Jelinek + + PR c/80097 + * c-typeck.c (build_binary_op): Add EXCESS_PRECISION_EXPR only around + optional COMPOUND_EXPR with ubsan instrumentation. + 2017-03-17 Marek Polacek * c-parser.c: Add C11 references. diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index b4f61b0a674..b283a211a03 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -11856,14 +11856,16 @@ build_binary_op (location_t location, enum tree_code code, else if (TREE_CODE (ret) != INTEGER_CST && int_operands && !in_late_binary_op) ret = note_integer_operands (ret); - if (semantic_result_type) - ret = build1 (EXCESS_PRECISION_EXPR, semantic_result_type, ret); protected_set_expr_location (ret, location); if (instrument_expr != NULL) ret = fold_build2 (COMPOUND_EXPR, TREE_TYPE (ret), instrument_expr, ret); + if (semantic_result_type) + ret = build1_loc (location, EXCESS_PRECISION_EXPR, + semantic_result_type, ret); + return ret; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 121c3dc7c31..79672408fe2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-03-21 Jakub Jelinek + + PR c/80097 + * gcc.dg/ubsan/pr80097.c: New test. + 2017-03-20 Bill Schmidt PR tree-optimization/80054 diff --git a/gcc/testsuite/gcc.dg/ubsan/pr80097.c b/gcc/testsuite/gcc.dg/ubsan/pr80097.c new file mode 100644 index 00000000000..4d48eea69c3 --- /dev/null +++ b/gcc/testsuite/gcc.dg/ubsan/pr80097.c @@ -0,0 +1,10 @@ +/* PR c/80097 */ +/* { dg-do compile } */ +/* { dg-options "-std=c89 -fsanitize=float-divide-by-zero" } */ + +int +foo (double a) +{ + int b = (1 / a >= 1); + return b; +} -- 2.30.2