Author: Richard Smith Date: 2020-06-17T16:07:58-07:00 New Revision: 973cfa9ef5cb32b859744e5435df049bf3999915
URL: https://github.com/llvm/llvm-project/commit/973cfa9ef5cb32b859744e5435df049bf3999915 DIFF: https://github.com/llvm/llvm-project/commit/973cfa9ef5cb32b859744e5435df049bf3999915.diff LOG: Revert "When performing a substitution into a dependent alias template, mark the" This change depends on reverted change c7fbe2191b8b9cd64570ed3906d1bed1dd5fff8e. This reverts commit c851d6cf4a4ab803d01d0059f4659f4f9f4435ea. Added: Modified: clang/lib/Sema/SemaTemplate.cpp Removed: ################################################################################ diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp index 3292284d63ba..073b4e818a24 100644 --- a/clang/lib/Sema/SemaTemplate.cpp +++ b/clang/lib/Sema/SemaTemplate.cpp @@ -3558,8 +3558,9 @@ QualType Sema::CheckTemplateIdType(TemplateName Name, // Only substitute for the innermost template argument list. MultiLevelTemplateArgumentList TemplateArgLists; TemplateArgLists.addOuterTemplateArguments(&StackTemplateArgs); - TemplateArgLists.addOuterRetainedLevels( - AliasTemplate->getTemplateParameters()->getDepth()); + unsigned Depth = AliasTemplate->getTemplateParameters()->getDepth(); + for (unsigned I = 0; I < Depth; ++I) + TemplateArgLists.addOuterTemplateArguments(None); LocalInstantiationScope Scope(*this); InstantiatingTemplate Inst(*this, TemplateLoc, Template); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
