diff options
| author | Torvald Riegel <triegel@redhat.com> | 2011-11-21 22:29:13 +0000 |
|---|---|---|
| committer | Torvald Riegel <torvald@gcc.gnu.org> | 2011-11-21 22:29:13 +0000 |
| commit | 1e159409fcacfdfcb7046c3d870ee60d9e4131e8 (patch) | |
| tree | b1e5db9e9613722a5e7222a83a30547c2fd967cd | |
| parent | b0dc7e4c3470c0e40ea3b01962865ddb49c34d8c (diff) | |
| download | gcc-1e159409fcacfdfcb7046c3d870ee60d9e4131e8.zip gcc-1e159409fcacfdfcb7046c3d870ee60d9e4131e8.tar.gz gcc-1e159409fcacfdfcb7046c3d870ee60d9e4131e8.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/tm/template-2.C | 22 |
4 files changed, 34 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7b995f1..0d729a9 100644 --- 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 2ba26b2..f817b6f 100644 --- 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 764575a..c661df8 100644 --- 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 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" } } */ |