From: Jason Merrill <jason@redhat.com>
Date: Mon, 15 Apr 2013 15:24:11 +0000 (-0400)
Subject: * pt.c (tsubst) [DECLTYPE_TYPE]: Use tsubst_copy_and_build.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=099b9334825baa8df9372af55f5e58c87e2d0d2a;p=gcc.git

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

From-SVN: r197983
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 209c9cb0ac0..b7df0d56782 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 36520a471e3..3856813670e 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;