Index: testsuite/c-c++-common/tm/inline-asm-2.c
===================================================================
--- testsuite/c-c++-common/tm/inline-asm-2.c	(revision 0)
+++ testsuite/c-c++-common/tm/inline-asm-2.c	(revision 0)
@@ -0,0 +1,8 @@
+// { dg-do compile }
+// { dg-options "-fgnu-tm" }
+
+__attribute__((transaction_callable))
+void func()
+{
+  __asm__ ("");
+}
Index: trans-mem.c
===================================================================
--- trans-mem.c	(revision 168675)
+++ trans-mem.c	(working copy)
@@ -2067,7 +2067,7 @@ build_tm_store (location_t loc, tree lhs
   if (TREE_CODE (rhs) == CONSTRUCTOR)
     {
       /* Handle the easy initialization to zero.  */
-      if (CONSTRUCTOR_ELTS (rhs) == 0)
+      if (CONSTRUCTOR_ELTS (rhs) == 0 && INTEGRAL_TYPE_P (type))
 	rhs = build_int_cst (type, 0);
       else
 	{
@@ -4498,6 +4498,13 @@ ipa_tm_execute (void)
       a = cgraph_function_body_availability (node);
       d = get_cg_data (node);
 
+      /* If we saw something that will make us go irrevocable, put it
+	 in the worklist so we can scan the function later
+	 (ipa_tm_scan_irr_function) and mark the irrevocable
+	 blocks.  */
+      if (node->local.tm_may_enter_irr)
+	maybe_push_queue (node, &worklist, &d->in_worklist);
+
       /* Some callees cannot be arbitrarily cloned.  These will always be
 	 irrevocable.  Mark these now, so that we need not scan them.  */
       if (is_tm_irrevocable (node->decl))