From: Marek Polacek <polacek@redhat.com>
Date: Mon, 22 Apr 2013 17:02:49 +0000 (+0000)
Subject: re PR sanitizer/56990 (ICE: SIGFPE with -fsanitize=thread and empty struct)
X-Git-Tag: releases/gcc-4.9.0~6331
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=829d0168e6816e2b309bc75f4e23d28656ceed6f;p=thirdparty%2Fgcc.git

re PR sanitizer/56990 (ICE: SIGFPE with -fsanitize=thread and empty struct)

	PR sanitizer/56990
	* tsan.c (instrument_expr): Don't instrument expression
	in case its size is zero.

	* gcc.dg/pr56990.c: New test.

From-SVN: r198147
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ce29ccebb476..f5b463574d91 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-22  Marek Polacek  <polacek@redhat.com>
+
+	PR sanitizer/56990
+	* tsan.c (instrument_expr): Don't instrument expression
+	in case its size is zero.
+
 2013-04-22  Uros Bizjak  <ubizjak@gmail.com>
 
 	PR target/57032
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3917bbe7111c..84a1fb9474b6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-22  Marek Polacek  <polacek@redhat.com>
+
+	PR sanitizer/56990
+	* gcc.dg/pr56990.c: New test.
+
 2013-04-22  Vladimir Makarov  <vmakarov@redhat.com>
 
 	PR target/57018
diff --git a/gcc/testsuite/gcc.dg/pr56990.c b/gcc/testsuite/gcc.dg/pr56990.c
new file mode 100644
index 000000000000..ecb6acef6f3e
--- /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 c02e100cca06..79b8bc395d3b 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;