From abc27962b81152a9c68108b2e11e8a90129a46e9 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 30 Apr 2013 10:52:39 +0200 Subject: [PATCH] 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 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr57104.c | 12 ++++++++++++ gcc/tsan.c | 4 +++- 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/pr57104.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 62248a6e258..236a905f7f3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2013-04-30 Jakub Jelinek + + PR tree-optimization/57104 + * tsan.c (instrument_expr): Don't instrument accesses to + DECL_HARD_REGISTER VAR_DECLs. + 2013-04-30 Richard Biener * function.h (loops_for_fn): New inline function. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 56f3ac8a92b..77183feb8f2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-04-30 Jakub Jelinek + + PR tree-optimization/57104 + * gcc.dg/pr57104.c: New test. + 2013-04-29 Uros Bizjak PR target/44578 diff --git a/gcc/testsuite/gcc.dg/pr57104.c b/gcc/testsuite/gcc.dg/pr57104.c new file mode 100644 index 00000000000..3a7013bea31 --- /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 79b8bc395d3..a3b65650e38 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