From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 30 Apr 2013 08:52:39 +0000 (+0200)
Subject: re PR sanitizer/57104 (ICE: in expand_expr_addr_expr_1, at expr.c:7594 with -fsanitiz... 
X-Git-Tag: releases/gcc-4.9.0~6123
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=abc27962b81152a9c68108b2e11e8a90129a46e9;p=thirdparty%2Fgcc.git

re PR sanitizer/57104 (ICE: in expand_expr_addr_expr_1, at expr.c:7594 with -fsanitize=thread and hardreg variable)

	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 62248a6e258d..236a905f7f34 100644
--- 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 56f3ac8a92ba..77183feb8f24 100644
--- 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
index 000000000000..3a7013bea317
--- /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 79b8bc395d3b..a3b65650e383 100644
--- 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