* pt.c (tsubst) [DECLTYPE_TYPE]: Use tsubst_copy_and_build.

From-SVN: r197983

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 209c9cb0ac0688f3257e6719b7e194260ea88450..b7df0d56782c8b2914e3ae3ee923ee9981f8fee2 100644 (file)
--- 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 36520a471e305b514a23d5245d6e148922b7ff80..3856813670e90f68b24e54e4e053c4aa6da57dc8 100644 (file)
--- 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;