From: Aldy Hernandez <aldyh@redhat.com>
Date: Mon, 20 Feb 2012 23:43:31 +0000 (+0000)
Subject: re PR middle-end/52141 ([trans-mem] ICE due to asm statement in trans-mem.c:expand_bl... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a4d031c79e899114f408bfa96ca3e3d934c31a7b;p=gcc.git

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
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c579214456a..e12e596ed1d 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 00000000000..0dabf76ce6d
--- /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 d760db34b2a..aa330dd95c4 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: