From 4f53b51fe7665f7f899a2fa2905d72f69ec01c4f Mon Sep 17 00:00:00 2001 From: Sam McCall Date: Mon, 30 Jan 2017 10:44:11 +0000 Subject: Revert r293455, which breaks v8 with a spurious error. Testcase added. Summary: Revert r293455, which breaks v8 with a spurious error. Testcase added. Reviewers: klimek Subscribers: cfe-commits, rsmith Differential Revision: https://reviews.llvm.org/D29271 llvm-svn: 293473 --- clang/lib/Sema/SemaTemplateInstantiate.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'clang/lib/Sema/SemaTemplateInstantiate.cpp') diff --git a/clang/lib/Sema/SemaTemplateInstantiate.cpp b/clang/lib/Sema/SemaTemplateInstantiate.cpp index 723a6c0e4de..aff19ec597e 100644 --- a/clang/lib/Sema/SemaTemplateInstantiate.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiate.cpp @@ -1490,16 +1490,12 @@ TemplateInstantiator::TransformSubstTemplateTypeParmPackType( /// a cast expression) or that the entity has no name (e.g., an /// unnamed function parameter). /// -/// \param AllowDeducedTST Whether a DeducedTemplateSpecializationType is -/// acceptable as the top level type of the result. -/// /// \returns If the instantiation succeeds, the instantiated /// type. Otherwise, produces diagnostics and returns a NULL type. TypeSourceInfo *Sema::SubstType(TypeSourceInfo *T, const MultiLevelTemplateArgumentList &Args, SourceLocation Loc, - DeclarationName Entity, - bool AllowDeducedTST) { + DeclarationName Entity) { assert(!ActiveTemplateInstantiations.empty() && "Cannot perform an instantiation without some context on the " "instantiation stack"); @@ -1509,8 +1505,7 @@ TypeSourceInfo *Sema::SubstType(TypeSourceInfo *T, return T; TemplateInstantiator Instantiator(*this, Args, Loc, Entity); - return AllowDeducedTST ? Instantiator.TransformTypeWithDeducedTST(T) - : Instantiator.TransformType(T); + return Instantiator.TransformType(T); } TypeSourceInfo *Sema::SubstType(TypeLoc TL, -- cgit v1.2.3