commit 437bd75328aa06561cb84f5e419431f979776115
Author: Torvald Riegel <triegel@redhat.com>
Date:   Mon Nov 7 14:51:50 2011 +0100

    Fix instantiation of transaction expressions.
    
    	* cp/pt.c (tsubst_expr) [TRANSACTION_EXPR]: If body is not a
    	statement, create an expression instead.
    	* testsuite/g++.dg/tm/template-1.C: New.

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index b1593fe..6e6dcdb 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -12960,6 +12960,16 @@ tsubst_expr (tree t, tree args, tsubst_flags_t complain, tree in_decl,
 
         stmt = begin_transaction_stmt (input_location, NULL, flags);
         tmp = RECUR (TRANSACTION_EXPR_BODY (t));
+        if (tmp)
+          {
+            /* No statements; handle this like an expression.  */
+            pop_stmt_list (TRANSACTION_EXPR_BODY (stmt));
+            stmt = build1 (TRANSACTION_EXPR, TREE_TYPE (tmp), tmp);
+            TRANSACTION_EXPR_OUTER (stmt) = TRANSACTION_EXPR_OUTER (t);
+            TRANSACTION_EXPR_RELAXED (stmt) = TRANSACTION_EXPR_RELAXED (t);
+            SET_EXPR_LOCATION (stmt, EXPR_LOCATION (t));
+            return stmt;
+          }
         finish_transaction_stmt (stmt, NULL, flags);
       }
       break;
diff --git a/gcc/testsuite/g++.dg/tm/template-1.C b/gcc/testsuite/g++.dg/tm/template-1.C
new file mode 100644
index 0000000..b93828a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/tm/template-1.C
@@ -0,0 +1,35 @@
+// { dg-do compile }
+// { dg-options "-fgnu-tm -O -fdump-tree-tmmark" }
+
+struct TrueFalse
+{
+  static bool v() { return true; }
+};
+
+int global;
+
+template<typename T> int foo()
+{
+  __transaction_atomic { global += 2; }
+  return __transaction_atomic (global + 1);
+}
+
+template<typename T> int bar() __transaction_atomic
+{
+  return global + 3;
+}
+
+template<typename T> void bar2() __transaction_atomic
+{
+  global += 4;
+}
+
+int f1()
+{
+  bar2<TrueFalse>();
+  return foo<TrueFalse>() + bar<TrueFalse>();
+}
+
+/* 4 transactions overall, two of the write to global:  */
+/* { dg-final { scan-tree-dump-times "ITM_RU4\\s*\\(&global" 4 "tmmark" } } */
+/* { dg-final { scan-tree-dump-times "ITM_WU4\\s*\\(&global" 2 "tmmark" } } */