Fix instantiation of transaction expressions.

	gcc/cp/
	* pt.c (tsubst_copy_and_build): Handle TRANSACTION_EXPR.

	gcc/testsuite/
	* g++.dg/tm/template-2.C: New test.

From-SVN: r181601

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7b995f1f095836e4e50cc07dab0e2bf3c357b26a..0d729a9f514bf573d4f5bf38f07928449431b50b 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-21  Torvald Riegel  <triegel@redhat.com>
+
+       * pt.c (tsubst_copy_and_build): Handle TRANSACTION_EXPR.
+
 2011-11-21  Ed Smith-Rowland  <3dw4rd@verizon.net>
 
        PR c++/50958

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 2ba26b206bdc4a153b9c8851364c48e6109a7812..f817b6ffab6859133b9563dd5d3874a581b0c061 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -14290,6 +14290,10 @@ tsubst_copy_and_build (tree t,
        return r;
       }
 
+    case TRANSACTION_EXPR:
+      return tsubst_expr(t, args, complain, in_decl,
+            integral_constant_expression_p);
+
     default:
       /* Handle Objective-C++ constructs, if appropriate.  */
       {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 764575a449f9bd708f78558aa1f9741310cd7c2b..c661df870036b8288935529dcf718824096ac802 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-21  Torvald Riegel  <triegel@redhat.com>
+
+       * g++.dg/tm/template-2.C: New test.
+
 2011-11-21  Jakub Jelinek  <jakub@redhat.com>
 
        PR debug/50827

diff --git a/gcc/testsuite/g++.dg/tm/template-2.C b/gcc/testsuite/g++.dg/tm/template-2.C
new file mode 100644 (file)
index 0000000..5387024
--- /dev/null
+++ b/gcc/testsuite/g++.dg/tm/template-2.C
@@ -0,0 +1,22 @@
+// { dg-do compile }
+// { dg-options "-fgnu-tm -O -std=c++0x -fdump-tree-tmmark" }
+
+struct TrueFalse
+{
+};
+
+int global;
+
+template<typename T> int foo()
+{
+  return __transaction_atomic (global + 2)
+         + __transaction_atomic (global + 3);
+}
+
+int f1()
+{
+  return foo<TrueFalse>();
+}
+
+/* { dg-final { scan-tree-dump-times "ITM_RU" 2 "tmmark" } } */
+/* { dg-final { cleanup-tree-dump "tmmark" } } */