From 7be9eece4c9198e8ded9d6a0cd4a9f8eea92dd70 Mon Sep 17 00:00:00 2001 From: Aldy Hernandez Date: Fri, 25 May 2012 17:14:25 +0000 Subject: [PATCH] re PR middle-end/53008 (abort in _ITM_getTMCloneSafe) PR middle-end/53008 * trans-mem.c (ipa_tm_create_version_alias): Output new_node if accessed indirectly. (ipa_tm_create_version): Same. From-SVN: r187887 --- gcc/ChangeLog | 7 +++++++ gcc/testsuite/gcc.dg/tm/pr53008.c | 14 ++++++++++++++ gcc/trans-mem.c | 6 ++++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tm/pr53008.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ce680f0c817c..f8570fd24d5f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2012-05-25 Aldy Hernandez + + PR middle-end/53008 + * trans-mem.c (ipa_tm_create_version_alias): Output new_node if + accessed indirectly. + (ipa_tm_create_version): Same. + 2012-05-25 Uros Bizjak PR target/53474 diff --git a/gcc/testsuite/gcc.dg/tm/pr53008.c b/gcc/testsuite/gcc.dg/tm/pr53008.c new file mode 100644 index 000000000000..1374d76faff9 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tm/pr53008.c @@ -0,0 +1,14 @@ +/* { dg-do compile } */ +/* { dg-options "-fgnu-tm -O" } */ + +void __attribute__((transaction_safe)) (*fn)(void); + +static void __attribute__((transaction_safe)) +foo(void) +{ +} + +void set_fn(void) +{ + fn = foo; +} diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c index 8887b9afee66..aa4d7c0a06d1 100644 --- a/gcc/trans-mem.c +++ b/gcc/trans-mem.c @@ -4328,7 +4328,8 @@ ipa_tm_create_version_alias (struct cgraph_node *node, void *data) record_tm_clone_pair (old_decl, new_decl); - if (info->old_node->symbol.force_output) + if (info->old_node->symbol.force_output + || ipa_ref_list_first_referring (&info->old_node->symbol.ref_list)) ipa_tm_mark_force_output_node (new_node); return false; } @@ -4381,7 +4382,8 @@ ipa_tm_create_version (struct cgraph_node *old_node) record_tm_clone_pair (old_decl, new_decl); cgraph_call_function_insertion_hooks (new_node); - if (old_node->symbol.force_output) + if (old_node->symbol.force_output + || ipa_ref_list_first_referring (&old_node->symbol.ref_list)) ipa_tm_mark_force_output_node (new_node); /* Do the same thing, but for any aliases of the original node. */