From 888b31c9dee1cb8be398fe1a737de287e794d843 Mon Sep 17 00:00:00 2001 From: mpolacek Date: Mon, 22 Apr 2013 17:02:49 +0000 Subject: [PATCH] PR sanitizer/56990 * tsan.c (instrument_expr): Don't instrument expression in case its size is zero. * gcc.dg/pr56990.c: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@198147 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr56990.c | 10 ++++++++++ gcc/tsan.c | 3 ++- 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/pr56990.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ce29ccebb47..f5b463574d9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2013-04-22 Marek Polacek + + PR sanitizer/56990 + * tsan.c (instrument_expr): Don't instrument expression + in case its size is zero. + 2013-04-22 Uros Bizjak PR target/57032 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3917bbe7111..84a1fb9474b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-04-22 Marek Polacek + + PR sanitizer/56990 + * gcc.dg/pr56990.c: New test. + 2013-04-22 Vladimir Makarov PR target/57018 diff --git a/gcc/testsuite/gcc.dg/pr56990.c b/gcc/testsuite/gcc.dg/pr56990.c new file mode 100644 index 00000000000..ecb6acef6f3 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr56990.c @@ -0,0 +1,10 @@ +/* PR sanitizer/56990 */ +/* { dg-do compile { target { x86_64-*-linux* && lp64 } } } */ +/* { dg-options "-fsanitize=thread" } */ + +struct S{}; + +void foo(struct S *p) +{ + *p = (struct S){}; +} diff --git a/gcc/tsan.c b/gcc/tsan.c index c02e100cca0..79b8bc395d3 100644 --- a/gcc/tsan.c +++ b/gcc/tsan.c @@ -131,7 +131,8 @@ instrument_expr (gimple_stmt_iterator gsi, tree expr, bool is_write) if (TREE_READONLY (base)) return false; - if (bitpos % (size * BITS_PER_UNIT) + if (size == 0 + || bitpos % (size * BITS_PER_UNIT) || bitsize != size * BITS_PER_UNIT) return false; -- 2.11.4.GIT