diff options
| author | Aldy Hernandez <aldyh@redhat.com> | 2012-02-20 23:43:31 +0000 |
|---|---|---|
| committer | Aldy Hernandez <aldyh@gcc.gnu.org> | 2012-02-20 23:43:31 +0000 |
| commit | a4d031c79e899114f408bfa96ca3e3d934c31a7b (patch) | |
| tree | ecc42fa4efdac72cf8b9746e66dae3721a9e7497 | |
| parent | 6e887223a0bfe4e691107cc2a7d7fc3793cd93fd (diff) | |
| download | gcc-a4d031c79e899114f408bfa96ca3e3d934c31a7b.zip gcc-a4d031c79e899114f408bfa96ca3e3d934c31a7b.tar.gz gcc-a4d031c79e899114f408bfa96ca3e3d934c31a7b.tar.bz2 | |
re PR middle-end/52141 ([trans-mem] ICE due to asm statement in trans-mem.c:expand_block_tm)
PR middle-end/52141
* trans-mem.c (ipa_tm_scan_irr_block): Error out on GIMPLE_ASM's
in a transaction safe function.
From-SVN: r184417
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/tm/pr52141.c | 24 | ||||
| -rw-r--r-- | gcc/trans-mem.c | 7 |
3 files changed, 37 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c579214..e12e596 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-02-20 Aldy Hernandez <aldyh@redhat.com> + + PR middle-end/52141 + * trans-mem.c (ipa_tm_scan_irr_block): Error out on GIMPLE_ASM's + in a transaction safe function. + 2012-02-20 Kai Tietz <ktietz@redhat.com> PR target/52238 diff --git a/gcc/testsuite/gcc.dg/tm/pr52141.c b/gcc/testsuite/gcc.dg/tm/pr52141.c new file mode 100644 index 0000000..0dabf76 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tm/pr52141.c @@ -0,0 +1,24 @@ +/* { dg-do compile } */ +/* { dg-options "-fgnu-tm -O0 -w" } */ + +__attribute__((always_inline)) +static void asmfunc(void) +{ + __asm__ (""); /* { dg-error "asm not allowed in .transaction_safe" } */ +} + +__attribute__((transaction_safe)) +static void f(void) +{ + asmfunc(); +} + +int main() +{ + __transaction_atomic { + f(); + } + return 0; +} + +/* { dg-message "inlined from \'f\'" "" { target *-*-* } 0 } */ diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c index d760db3..aa330dd 100644 --- a/gcc/trans-mem.c +++ b/gcc/trans-mem.c @@ -3736,6 +3736,13 @@ ipa_tm_scan_irr_block (basic_block bb) assembly statement is not relevant to the transaction is to wrap it in a __tm_waiver block. This is not yet implemented, so we can't check for it. */ + if (is_tm_safe (current_function_decl)) + { + tree t = build1 (NOP_EXPR, void_type_node, size_zero_node); + SET_EXPR_LOCATION (t, gimple_location (stmt)); + TREE_BLOCK (t) = gimple_block (stmt); + error ("%Kasm not allowed in %<transaction_safe%> function", t); + } return true; default: |