From b2aaf235774b638c79fbde5ba18bd3495b7230f8 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Fri, 4 Sep 2015 12:37:39 +0000 Subject: [PATCH] re PR c/67279 (-fsanitize=undefined spurious error: initializer element is not constant) PR sanitizer/67279 * c-typeck.c (build_binary_op): Don't instrument static initializers. * gcc.dg/ubsan/pr67279.c: New test. From-SVN: r227491 --- gcc/c/ChangeLog | 5 +++++ gcc/c/c-typeck.c | 3 ++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/ubsan/pr67279.c | 14 ++++++++++++++ 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/ubsan/pr67279.c diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index ae1081b357d..a61df71ae8e 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,8 @@ +2015-09-04 Marek Polacek + + PR sanitizer/67279 + * c-typeck.c (build_binary_op): Don't instrument static initializers. + 2015-09-03 Martin Sebor PR c/66516 diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index c622a9027e6..dc223969b3e 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -11292,7 +11292,8 @@ build_binary_op (location_t location, enum tree_code code, if ((flag_sanitize & (SANITIZE_SHIFT | SANITIZE_DIVIDE | SANITIZE_FLOAT_DIVIDE)) && do_ubsan_in_current_function () - && (doing_div_or_mod || doing_shift)) + && (doing_div_or_mod || doing_shift) + && !require_constant_value) { /* OP0 and/or OP1 might have side-effects. */ op0 = c_save_expr (op0); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8b444ab3978..9f692bdd582 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-09-04 Marek Polacek + + PR sanitizer/67279 + * gcc.dg/ubsan/pr67279.c: New test. + 2015-09-04 Andrey Turetskiy Petr Murzin Kirill Yukhin diff --git a/gcc/testsuite/gcc.dg/ubsan/pr67279.c b/gcc/testsuite/gcc.dg/ubsan/pr67279.c new file mode 100644 index 00000000000..5b5db42f96a --- /dev/null +++ b/gcc/testsuite/gcc.dg/ubsan/pr67279.c @@ -0,0 +1,14 @@ +/* PR sanitizer/67279 */ +/* { dg-do compile } */ +/* { dg-options "-fsanitize=undefined -w" } */ + +#define INT_MIN (-__INT_MAX__ - 1) + +void +foo (void) +{ + static int a1 = 1 << 31; + static int a2 = 10 << 30; + static int a3 = 100 << 28; + static int a4 = INT_MIN / -1; +} -- 2.30.2