re PR sanitizer/57104 (ICE: in expand_expr_addr_expr_1, at expr.c:7594 with -fsanitiz...

	PR tree-optimization/57104
	* tsan.c (instrument_expr): Don't instrument accesses to
	DECL_HARD_REGISTER VAR_DECLs.

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

From-SVN: r198445

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 62248a6e258d9521454adde918326f9f5d089fb1..236a905f7f34a0e7b5d7215e27a509f3bf845020 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-30  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/57104
+       * tsan.c (instrument_expr): Don't instrument accesses to
+       DECL_HARD_REGISTER VAR_DECLs.
+
 2013-04-30  Richard Biener  <rguenther@suse.de>
 
        * function.h (loops_for_fn): New inline function.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 56f3ac8a92bab6f7dce4f96dd5c112c1fcb7bb20..77183feb8f241d32f8f7064cd1c28fc80d69ac97 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-30  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/57104
+       * gcc.dg/pr57104.c: New test.
+
 2013-04-29  Uros Bizjak  <ubizjak@gmail.com>
 
        PR target/44578

diff --git a/gcc/testsuite/gcc.dg/pr57104.c b/gcc/testsuite/gcc.dg/pr57104.c
new file mode 100644 (file)
index 0000000..3a7013b
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr57104.c
@@ -0,0 +1,12 @@
+/* PR tree-optimization/57104 */
+/* { dg-do compile { target { x86_64-*-linux* && lp64 } } } */
+/* { dg-options "-fsanitize=thread" } */
+
+register int r asm ("r14");
+int v;
+
+int
+foo (void)
+{
+  return r + v;
+}

diff --git a/gcc/tsan.c b/gcc/tsan.c
index 79b8bc395d3b60ae677deb5ecb4f2b563c975b48..a3b65650e3835ab41aa4880ac9388e49166b6f8b 100644 (file)
--- a/gcc/tsan.c
+++ b/gcc/tsan.c
@@ -128,7 +128,9 @@ instrument_expr (gimple_stmt_iterator gsi, tree expr, bool is_write)
        return false;
     }
 
-  if (TREE_READONLY (base))
+  if (TREE_READONLY (base)
+      || (TREE_CODE (base) == VAR_DECL
+         && DECL_HARD_REGISTER (base)))
     return false;
 
   if (size == 0