mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-05 08:20:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert * trans-mem.c (requires_barrier): Do not instrument thread local

Browse Source 
variables and emit save/restore for them.

From-SVN: r183538
This commit is contained in:
Richard Henderson 2012-01-25 12:35:34 -08:00 committed by Richard Henderson
parent dda6ecaea8
commit 3be18e47c3
3 changed files with 19 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2012-01-26 Richard Henderson <rth@redhat.com>
Revert 2012-01-24 change:
* trans-mem.c (requires_barrier): Do not instrument thread local
variables and emit save/restore for them.
2012-01-25 Jakub Jelinek <jakub@redhat.com>
PR middle-end/51986

17
gcc/testsuite/gcc.dg/tm/threadlocal-1.c
View File

@ -1,17 +0,0 @@
/* { dg-do compile } */
/* { dg-options "-fgnu-tm -O -fdump-tree-tmedge" } */
__thread int notshared = 0;
int shared = 0;
int main()
{
__transaction_atomic
{
notshared++;
shared++;
}
return notshared + shared;
}
/* { dg-final { scan-tree-dump-times "tm_save.\[0-9_\]+ = notshared" 1 "tmedge" } } */
/* { dg-final { scan-tree-dump-times "notshared = tm_save" 1 "tmedge" } } */
/* { dg-final { cleanup-tree-dump "tmedge" } } */

34
gcc/trans-mem.c
View File

@ -1,5 +1,5 @@
/* Passes for transactional memory support.
Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GCC.
@ -1488,18 +1488,7 @@ requires_barrier (basic_block entry_block, tree x, gimple stmt)
}
if (is_global_var (x))
{
if (DECL_THREAD_LOCAL_P (x))
goto thread_local;
if (DECL_HAS_VALUE_EXPR_P (x))
{
tree value = get_base_address (DECL_VALUE_EXPR (x));
if (value && DECL_P (value) && DECL_THREAD_LOCAL_P (value))
goto thread_local;
}
return !TREE_READONLY (x);
}
return !TREE_READONLY (x);
if (/* FIXME: This condition should actually go below in the
tm_log_add() call, however is_call_clobbered() depends on
aliasing info which is not available during
@ -1509,14 +1498,17 @@ requires_barrier (basic_block entry_block, tree x, gimple stmt)
lower_sequence_tm altogether. */
needs_to_live_in_memory (x))
return true;
thread_local:
/* For local memory that doesn't escape (aka thread private memory),
we can either save the value at the beginning of the transaction and
restore on restart, or call a tm function to dynamically save and
restore on restart (ITM_L*). */
if (stmt)
tm_log_add (entry_block, orig, stmt);
return false;
else
{
/* For local memory that doesn't escape (aka thread private
memory), we can either save the value at the beginning of
the transaction and restore on restart, or call a tm
function to dynamically save and restore on restart
(ITM_L*). */
if (stmt)
tm_log_add (entry_block, orig, stmt);
return false;
}
default:
return false;