diff options
author | aldyh <aldyh@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-02-15 00:29:06 +0000 |
---|---|---|
committer | aldyh <aldyh@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-02-15 00:29:06 +0000 |
commit | 3bd76a9934b9469a02c6fa46e089f720e1b600ce (patch) | |
tree | 2c16b036b6df96a695142714e48c0d7df1a609a3 /gcc/trans-mem.c | |
parent | d4be36a4b1b6b6276d16d3a8089729582ea571e5 (diff) | |
download | gcc-3bd76a9934b9469a02c6fa46e089f720e1b600ce.tar.gz |
+ PR middle-end/52142
+ * ipa-inline.c (can_inline_edge_p): Do not inline tm_pure
+ functions into non-tm_pure functions.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@184251 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/trans-mem.c')
-rw-r--r-- | gcc/trans-mem.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c index d760db34b2a..b7320b5ee72 100644 --- a/gcc/trans-mem.c +++ b/gcc/trans-mem.c @@ -3736,6 +3736,10 @@ 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)) + error_at (gimple_location (stmt), + "asm not allowed in %<transaction_safe%> function %qE", + current_function_decl); return true; default: |