diff options
| author | Jason Merrill <jason@redhat.com> | 2013-04-15 11:24:11 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2013-04-15 11:24:11 -0400 |
| commit | 099b9334825baa8df9372af55f5e58c87e2d0d2a (patch) | |
| tree | d1767d79ac28d93b667b5d04cd45b9a18584809a /gcc/cp | |
| parent | 4da97565d3c23bcced3f1f1512c4496c8ec68e2b (diff) | |
| download | gcc-099b9334825baa8df9372af55f5e58c87e2d0d2a.zip gcc-099b9334825baa8df9372af55f5e58c87e2d0d2a.tar.gz gcc-099b9334825baa8df9372af55f5e58c87e2d0d2a.tar.bz2 | |
* pt.c (tsubst) [DECLTYPE_TYPE]: Use tsubst_copy_and_build.
From-SVN: r197983
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 209c9cb..b7df0d5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,7 @@ 2013-04-15 Jason Merrill <jason@redhat.com> + * pt.c (tsubst) [DECLTYPE_TYPE]: Use tsubst_copy_and_build. + PR c++/52748 * pt.c (tsubst) [DECLTYPE_TYPE]: If ~id is an expression rather than a destructor name, it isn't an unqualified-name. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 36520a4..3856813 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -11770,9 +11770,10 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl) ++cp_unevaluated_operand; ++c_inhibit_evaluation_warnings; - type = tsubst_expr (DECLTYPE_TYPE_EXPR (t), args, - complain|tf_decltype, in_decl, - /*integral_constant_expression_p=*/false); + type = tsubst_copy_and_build (DECLTYPE_TYPE_EXPR (t), args, + complain|tf_decltype, in_decl, + /*function_p*/false, + /*integral_constant_expression*/false); --cp_unevaluated_operand; --c_inhibit_evaluation_warnings; |