[clang] a88ebd4 - Revert "[clang] Instantiate NTTPs and template default arguments with sugar"
David Blaikie via cfe-commits
cfe-commits at lists.llvm.org
Mon Oct 31 10:14:19 PDT 2022
Please include some details about the reason for a revert in the
revert commit message in addition to the precanned revision/subject
quoting
On Wed, Oct 26, 2022 at 1:16 AM Matheus Izvekov via cfe-commits
<cfe-commits at lists.llvm.org> wrote:
>
>
> Author: Matheus Izvekov
> Date: 2022-10-26T10:14:27+02:00
> New Revision: a88ebd405da67b4cebf094c5a56f9aed97875423
>
> URL: https://github.com/llvm/llvm-project/commit/a88ebd405da67b4cebf094c5a56f9aed97875423
> DIFF: https://github.com/llvm/llvm-project/commit/a88ebd405da67b4cebf094c5a56f9aed97875423.diff
>
> LOG: Revert "[clang] Instantiate NTTPs and template default arguments with sugar"
>
> This reverts commit 2560c1266993af6e6c15900ce673c6db23132f8b.
>
> Added:
>
>
> Modified:
> clang/include/clang/Sema/Sema.h
> clang/lib/Sema/SemaTemplate.cpp
> clang/lib/Sema/SemaTemplateDeduction.cpp
> clang/test/AST/ast-dump-template-decls.cpp
> clang/test/CXX/drs/dr3xx.cpp
> clang/test/CXX/expr/expr.const/p3-0x.cpp
> clang/test/Misc/diag-template-diffing.cpp
> clang/test/SemaTemplate/instantiation-default-1.cpp
> clang/test/SemaTemplate/make_integer_seq.cpp
>
> Removed:
>
>
>
> ################################################################################
> diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h
> index 37ad78f3d7969..d0757f874303f 100644
> --- a/clang/include/clang/Sema/Sema.h
> +++ b/clang/include/clang/Sema/Sema.h
> @@ -8199,11 +8199,14 @@ class Sema final {
> SourceLocation TemplateLoc,
> Declarator &D);
>
> - TemplateArgumentLoc SubstDefaultTemplateArgumentIfAvailable(
> - TemplateDecl *Template, SourceLocation TemplateLoc,
> - SourceLocation RAngleLoc, Decl *Param,
> - ArrayRef<TemplateArgument> SugaredConverted,
> - ArrayRef<TemplateArgument> CanonicalConverted, bool &HasDefaultArg);
> + TemplateArgumentLoc
> + SubstDefaultTemplateArgumentIfAvailable(TemplateDecl *Template,
> + SourceLocation TemplateLoc,
> + SourceLocation RAngleLoc,
> + Decl *Param,
> + SmallVectorImpl<TemplateArgument>
> + &Converted,
> + bool &HasDefaultArg);
>
> /// Specifies the context in which a particular template
> /// argument is being checked.
>
> diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp
> index 37eaa2a5795aa..73c681035b161 100644
> --- a/clang/lib/Sema/SemaTemplate.cpp
> +++ b/clang/lib/Sema/SemaTemplate.cpp
> @@ -5261,25 +5261,27 @@ bool Sema::CheckTemplateTypeArgument(
> /// \param Converted the list of template arguments provided for template
> /// parameters that precede \p Param in the template parameter list.
> /// \returns the substituted template argument, or NULL if an error occurred.
> -static TypeSourceInfo *SubstDefaultTemplateArgument(
> - Sema &SemaRef, TemplateDecl *Template, SourceLocation TemplateLoc,
> - SourceLocation RAngleLoc, TemplateTypeParmDecl *Param,
> - ArrayRef<TemplateArgument> SugaredConverted,
> - ArrayRef<TemplateArgument> CanonicalConverted) {
> +static TypeSourceInfo *
> +SubstDefaultTemplateArgument(Sema &SemaRef,
> + TemplateDecl *Template,
> + SourceLocation TemplateLoc,
> + SourceLocation RAngleLoc,
> + TemplateTypeParmDecl *Param,
> + SmallVectorImpl<TemplateArgument> &Converted) {
> TypeSourceInfo *ArgType = Param->getDefaultArgumentInfo();
>
> // If the argument type is dependent, instantiate it now based
> // on the previously-computed template arguments.
> if (ArgType->getType()->isInstantiationDependentType()) {
> - Sema::InstantiatingTemplate Inst(SemaRef, TemplateLoc, Param, Template,
> - SugaredConverted,
> + Sema::InstantiatingTemplate Inst(SemaRef, TemplateLoc,
> + Param, Template, Converted,
> SourceRange(TemplateLoc, RAngleLoc));
> if (Inst.isInvalid())
> return nullptr;
>
> // Only substitute for the innermost template argument list.
> - MultiLevelTemplateArgumentList TemplateArgLists(Template, SugaredConverted,
> - /*Final=*/true);
> + MultiLevelTemplateArgumentList TemplateArgLists(Template, Converted,
> + /*Final=*/false);
> for (unsigned i = 0, e = Param->getDepth(); i != e; ++i)
> TemplateArgLists.addOuterTemplateArguments(None);
>
> @@ -5318,20 +5320,22 @@ static TypeSourceInfo *SubstDefaultTemplateArgument(
> /// parameters that precede \p Param in the template parameter list.
> ///
> /// \returns the substituted template argument, or NULL if an error occurred.
> -static ExprResult SubstDefaultTemplateArgument(
> - Sema &SemaRef, TemplateDecl *Template, SourceLocation TemplateLoc,
> - SourceLocation RAngleLoc, NonTypeTemplateParmDecl *Param,
> - ArrayRef<TemplateArgument> SugaredConverted,
> - ArrayRef<TemplateArgument> CanonicalConverted) {
> - Sema::InstantiatingTemplate Inst(SemaRef, TemplateLoc, Param, Template,
> - SugaredConverted,
> +static ExprResult
> +SubstDefaultTemplateArgument(Sema &SemaRef,
> + TemplateDecl *Template,
> + SourceLocation TemplateLoc,
> + SourceLocation RAngleLoc,
> + NonTypeTemplateParmDecl *Param,
> + SmallVectorImpl<TemplateArgument> &Converted) {
> + Sema::InstantiatingTemplate Inst(SemaRef, TemplateLoc,
> + Param, Template, Converted,
> SourceRange(TemplateLoc, RAngleLoc));
> if (Inst.isInvalid())
> return ExprError();
>
> // Only substitute for the innermost template argument list.
> - MultiLevelTemplateArgumentList TemplateArgLists(Template, SugaredConverted,
> - /*Final=*/true);
> + MultiLevelTemplateArgumentList TemplateArgLists(Template, Converted,
> + /*Final=*/false);
> for (unsigned i = 0, e = Param->getDepth(); i != e; ++i)
> TemplateArgLists.addOuterTemplateArguments(None);
>
> @@ -5366,21 +5370,23 @@ static ExprResult SubstDefaultTemplateArgument(
> /// source-location information) that precedes the template name.
> ///
> /// \returns the substituted template argument, or NULL if an error occurred.
> -static TemplateName SubstDefaultTemplateArgument(
> - Sema &SemaRef, TemplateDecl *Template, SourceLocation TemplateLoc,
> - SourceLocation RAngleLoc, TemplateTemplateParmDecl *Param,
> - ArrayRef<TemplateArgument> SugaredConverted,
> - ArrayRef<TemplateArgument> CanonicalConverted,
> - NestedNameSpecifierLoc &QualifierLoc) {
> +static TemplateName
> +SubstDefaultTemplateArgument(Sema &SemaRef,
> + TemplateDecl *Template,
> + SourceLocation TemplateLoc,
> + SourceLocation RAngleLoc,
> + TemplateTemplateParmDecl *Param,
> + SmallVectorImpl<TemplateArgument> &Converted,
> + NestedNameSpecifierLoc &QualifierLoc) {
> Sema::InstantiatingTemplate Inst(
> - SemaRef, TemplateLoc, TemplateParameter(Param), Template,
> - SugaredConverted, SourceRange(TemplateLoc, RAngleLoc));
> + SemaRef, TemplateLoc, TemplateParameter(Param), Template, Converted,
> + SourceRange(TemplateLoc, RAngleLoc));
> if (Inst.isInvalid())
> return TemplateName();
>
> // Only substitute for the innermost template argument list.
> - MultiLevelTemplateArgumentList TemplateArgLists(Template, SugaredConverted,
> - /*Final=*/true);
> + MultiLevelTemplateArgumentList TemplateArgLists(Template, Converted,
> + /*Final=*/false);
> for (unsigned i = 0, e = Param->getDepth(); i != e; ++i)
> TemplateArgLists.addOuterTemplateArguments(None);
>
> @@ -5404,11 +5410,14 @@ static TemplateName SubstDefaultTemplateArgument(
> /// If the given template parameter has a default template
> /// argument, substitute into that default template argument and
> /// return the corresponding template argument.
> -TemplateArgumentLoc Sema::SubstDefaultTemplateArgumentIfAvailable(
> - TemplateDecl *Template, SourceLocation TemplateLoc,
> - SourceLocation RAngleLoc, Decl *Param,
> - ArrayRef<TemplateArgument> SugaredConverted,
> - ArrayRef<TemplateArgument> CanonicalConverted, bool &HasDefaultArg) {
> +TemplateArgumentLoc
> +Sema::SubstDefaultTemplateArgumentIfAvailable(TemplateDecl *Template,
> + SourceLocation TemplateLoc,
> + SourceLocation RAngleLoc,
> + Decl *Param,
> + SmallVectorImpl<TemplateArgument>
> + &Converted,
> + bool &HasDefaultArg) {
> HasDefaultArg = false;
>
> if (TemplateTypeParmDecl *TypeParm = dyn_cast<TemplateTypeParmDecl>(Param)) {
> @@ -5416,9 +5425,11 @@ TemplateArgumentLoc Sema::SubstDefaultTemplateArgumentIfAvailable(
> return TemplateArgumentLoc();
>
> HasDefaultArg = true;
> - TypeSourceInfo *DI = SubstDefaultTemplateArgument(
> - *this, Template, TemplateLoc, RAngleLoc, TypeParm, SugaredConverted,
> - CanonicalConverted);
> + TypeSourceInfo *DI = SubstDefaultTemplateArgument(*this, Template,
> + TemplateLoc,
> + RAngleLoc,
> + TypeParm,
> + Converted);
> if (DI)
> return TemplateArgumentLoc(TemplateArgument(DI->getType()), DI);
>
> @@ -5431,9 +5442,11 @@ TemplateArgumentLoc Sema::SubstDefaultTemplateArgumentIfAvailable(
> return TemplateArgumentLoc();
>
> HasDefaultArg = true;
> - ExprResult Arg = SubstDefaultTemplateArgument(
> - *this, Template, TemplateLoc, RAngleLoc, NonTypeParm, SugaredConverted,
> - CanonicalConverted);
> + ExprResult Arg = SubstDefaultTemplateArgument(*this, Template,
> + TemplateLoc,
> + RAngleLoc,
> + NonTypeParm,
> + Converted);
> if (Arg.isInvalid())
> return TemplateArgumentLoc();
>
> @@ -5448,9 +5461,12 @@ TemplateArgumentLoc Sema::SubstDefaultTemplateArgumentIfAvailable(
>
> HasDefaultArg = true;
> NestedNameSpecifierLoc QualifierLoc;
> - TemplateName TName = SubstDefaultTemplateArgument(
> - *this, Template, TemplateLoc, RAngleLoc, TempTempParm, SugaredConverted,
> - CanonicalConverted, QualifierLoc);
> + TemplateName TName = SubstDefaultTemplateArgument(*this, Template,
> + TemplateLoc,
> + RAngleLoc,
> + TempTempParm,
> + Converted,
> + QualifierLoc);
> if (TName.isNull())
> return TemplateArgumentLoc();
>
> @@ -5546,13 +5562,13 @@ bool Sema::CheckTemplateArgument(
> !Template->getDeclContext()->isDependentContext()) {
> // Do substitution on the type of the non-type template parameter.
> InstantiatingTemplate Inst(*this, TemplateLoc, Template, NTTP,
> - SugaredConverted,
> + CanonicalConverted,
> SourceRange(TemplateLoc, RAngleLoc));
> if (Inst.isInvalid())
> return true;
>
> - MultiLevelTemplateArgumentList MLTAL(Template, SugaredConverted,
> - /*Final=*/true);
> + MultiLevelTemplateArgumentList MLTAL(Template, CanonicalConverted,
> + /*Final=*/false);
> // If the parameter is a pack expansion, expand this slice of the pack.
> if (auto *PET = NTTPType->getAs<PackExpansionType>()) {
> Sema::ArgumentPackSubstitutionIndexRAII SubstIndex(*this,
> @@ -5717,7 +5733,7 @@ bool Sema::CheckTemplateArgument(
> Params =
> SubstTemplateParams(Params, CurContext,
> MultiLevelTemplateArgumentList(
> - Template, SugaredConverted, /*Final=*/true));
> + Template, CanonicalConverted, /*Final=*/false));
> if (!Params)
> return true;
> }
> @@ -5996,8 +6012,7 @@ bool Sema::CheckTemplateArgumentList(
> NewArgs);
>
> TypeSourceInfo *ArgType = SubstDefaultTemplateArgument(
> - *this, Template, TemplateLoc, RAngleLoc, TTP, SugaredConverted,
> - CanonicalConverted);
> + *this, Template, TemplateLoc, RAngleLoc, TTP, CanonicalConverted);
> if (!ArgType)
> return true;
>
> @@ -6010,8 +6025,7 @@ bool Sema::CheckTemplateArgumentList(
> NewArgs);
>
> ExprResult E = SubstDefaultTemplateArgument(
> - *this, Template, TemplateLoc, RAngleLoc, NTTP, SugaredConverted,
> - CanonicalConverted);
> + *this, Template, TemplateLoc, RAngleLoc, NTTP, CanonicalConverted);
> if (E.isInvalid())
> return true;
>
> @@ -6027,8 +6041,8 @@ bool Sema::CheckTemplateArgumentList(
>
> NestedNameSpecifierLoc QualifierLoc;
> TemplateName Name = SubstDefaultTemplateArgument(
> - *this, Template, TemplateLoc, RAngleLoc, TempParm, SugaredConverted,
> - CanonicalConverted, QualifierLoc);
> + *this, Template, TemplateLoc, RAngleLoc, TempParm, CanonicalConverted,
> + QualifierLoc);
> if (Name.isNull())
> return true;
>
> @@ -6042,7 +6056,7 @@ bool Sema::CheckTemplateArgumentList(
> // template here, we just create this object to put a note into the
> // context stack.
> InstantiatingTemplate Inst(*this, RAngleLoc, Template, *Param,
> - SugaredConverted,
> + CanonicalConverted,
> SourceRange(TemplateLoc, RAngleLoc));
> if (Inst.isInvalid())
> return true;
>
> diff --git a/clang/lib/Sema/SemaTemplateDeduction.cpp b/clang/lib/Sema/SemaTemplateDeduction.cpp
> index e078d3dd9f00a..19f76e5d249c5 100644
> --- a/clang/lib/Sema/SemaTemplateDeduction.cpp
> +++ b/clang/lib/Sema/SemaTemplateDeduction.cpp
> @@ -2687,12 +2687,12 @@ static bool ConvertDeducedTemplateArgument(
> // itself, in case that substitution fails.
> if (SugaredPackedArgsBuilder.empty()) {
> LocalInstantiationScope Scope(S);
> - MultiLevelTemplateArgumentList Args(Template, SugaredOutput,
> - /*Final=*/true);
> + MultiLevelTemplateArgumentList Args(Template, CanonicalOutput,
> + /*Final=*/false);
>
> if (auto *NTTP = dyn_cast<NonTypeTemplateParmDecl>(Param)) {
> Sema::InstantiatingTemplate Inst(S, Template->getLocation(), Template,
> - NTTP, SugaredOutput,
> + NTTP, CanonicalOutput,
> Template->getSourceRange());
> if (Inst.isInvalid() ||
> S.SubstType(NTTP->getType(), Args, NTTP->getLocation(),
> @@ -2700,7 +2700,7 @@ static bool ConvertDeducedTemplateArgument(
> return true;
> } else if (auto *TTP = dyn_cast<TemplateTemplateParmDecl>(Param)) {
> Sema::InstantiatingTemplate Inst(S, Template->getLocation(), Template,
> - TTP, SugaredOutput,
> + TTP, CanonicalOutput,
> Template->getSourceRange());
> if (Inst.isInvalid() || !S.SubstDecl(TTP, S.CurContext, Args))
> return true;
> @@ -2810,7 +2810,7 @@ static Sema::TemplateDeductionResult ConvertDeducedTemplateArguments(
>
> DefArg = S.SubstDefaultTemplateArgumentIfAvailable(
> TD, TD->getLocation(), TD->getSourceRange().getEnd(), Param,
> - SugaredBuilder, CanonicalBuilder, HasDefaultArg);
> + CanonicalBuilder, HasDefaultArg);
> }
>
> // If there was no default argument, deduction is incomplete.
> @@ -2960,9 +2960,10 @@ FinishTemplateArgumentDeduction(
> PartialTemplArgInfo->RAngleLoc);
>
> if (S.SubstTemplateArguments(PartialTemplArgInfo->arguments(),
> - MultiLevelTemplateArgumentList(Partial,
> - SugaredBuilder,
> - /*Final=*/true),
> + MultiLevelTemplateArgumentList(
> + Partial,
> + CanonicalDeducedArgumentList->asArray(),
> + /*Final=*/false),
> InstArgs)) {
> unsigned ArgIdx = InstArgs.size(), ParamIdx = ArgIdx;
> if (ParamIdx >= Partial->getTemplateParameters()->size())
> @@ -3302,8 +3303,8 @@ Sema::TemplateDeductionResult Sema::SubstituteExplicitTemplateArguments(
> ExtParameterInfoBuilder ExtParamInfos;
>
> MultiLevelTemplateArgumentList MLTAL(FunctionTemplate,
> - SugaredExplicitArgumentList->asArray(),
> - /*Final=*/true);
> + CanonicalExplicitArgumentList->asArray(),
> + /*Final=*/false);
>
> // Instantiate the types of each of the function parameters given the
> // explicitly-specified template arguments. If the function has a trailing
>
> diff --git a/clang/test/AST/ast-dump-template-decls.cpp b/clang/test/AST/ast-dump-template-decls.cpp
> index 49760d17c7f22..6b71df30f3797 100644
> --- a/clang/test/AST/ast-dump-template-decls.cpp
> +++ b/clang/test/AST/ast-dump-template-decls.cpp
> @@ -172,9 +172,11 @@ using test1 = D<E, int>;
> // CHECK: TypeAliasDecl 0x{{[^ ]*}} <line:{{[1-9]+}}:1, col:23> col:7 test1 'D<subst_default_argument::E, int>':'subst_default_argument::E<int, subst_default_argument::A<int>>'
> // CHECK: TemplateSpecializationType 0x{{[^ ]*}} 'A<int>' sugar A
> // CHECK-NEXT: |-TemplateArgument type 'int':'int'
> -// CHECK-NEXT: | `-SubstTemplateTypeParmType 0x{{[^ ]*}} 'int' sugar class depth 0 index 1 D2
> -// CHECK-NEXT: | |-TypeAliasTemplate 0x{{[^ ]*}} 'D'
> -// CHECK-NEXT: | `-BuiltinType 0x{{[^ ]*}} 'int'
> +// CHECK-NEXT: | `-SubstTemplateTypeParmType 0x{{[^ ]*}} 'int' sugar class depth 0 index 0 E1
> +// CHECK-NEXT: | |-ClassTemplate 0x{{[^ ]*}} 'E'
> +// CHECK-NEXT: | `-SubstTemplateTypeParmType 0x{{[^ ]*}} 'int' sugar class depth 0 index 1 D2
> +// CHECK-NEXT: | |-TypeAliasTemplate 0x{{[^ ]*}} 'D'
> +// CHECK-NEXT: | `-BuiltinType 0x{{[^ ]*}} 'int'
> // CHECK-NEXT: `-RecordType 0x{{[^ ]*}} 'subst_default_argument::A<int>'
> // CHECK-NEXT: `-ClassTemplateSpecialization 0x{{[^ ]*}} 'A'
> } // namespace subst_default_argument
>
> diff --git a/clang/test/CXX/drs/dr3xx.cpp b/clang/test/CXX/drs/dr3xx.cpp
> index 4ae56fcdc93a3..e6f7328dd4d6c 100644
> --- a/clang/test/CXX/drs/dr3xx.cpp
> +++ b/clang/test/CXX/drs/dr3xx.cpp
> @@ -924,9 +924,9 @@ namespace dr367 { // dr367: yes
> namespace dr368 { // dr368: yes
> template<typename T, T> struct S {}; // expected-note {{here}}
> template<typename T> int f(S<T, T()> *); // expected-error {{function type}}
> - template<typename T> int g(S<T, (T())> *); // cxx98_17-note {{type 'X'}}
> + template<typename T> int g(S<T, (T())> *); // cxx98_17-note {{type 'dr368::X'}}
> // cxx20_2b-note at -1 {{candidate function [with T = dr368::X]}}
> - template<typename T> int g(S<T, true ? T() : T()> *); // cxx98_17-note {{type 'X'}}
> + template<typename T> int g(S<T, true ? T() : T()> *); // cxx98_17-note {{type 'dr368::X'}}
> // cxx20_2b-note at -1 {{candidate function [with T = dr368::X]}}
> struct X {};
> int n = g<X>(0); // cxx98_17-error {{no matching}}
>
> diff --git a/clang/test/CXX/expr/expr.const/p3-0x.cpp b/clang/test/CXX/expr/expr.const/p3-0x.cpp
> index 47968eed75b66..8daca7a565f31 100644
> --- a/clang/test/CXX/expr/expr.const/p3-0x.cpp
> +++ b/clang/test/CXX/expr/expr.const/p3-0x.cpp
> @@ -88,7 +88,7 @@ void noexcept_true() noexcept(true);
> Val<decltype(&noexcept_false), &noexcept_true> remove_noexcept;
> Val<decltype(&noexcept_true), &noexcept_false> add_noexcept;
> #if __cplusplus > 201402L
> -// expected-error at -2 {{value of type 'void (*)() noexcept(false)' is not implicitly convertible to 'decltype(&noexcept_true)' (aka 'void (*)() noexcept(true)')}}
> +// expected-error at -2 {{value of type 'void (*)() noexcept(false)' is not implicitly convertible to 'void (*)() noexcept'}}
> #endif
>
> // (no other conversions are permitted)
>
> diff --git a/clang/test/Misc/diag-template-
> diff ing.cpp b/clang/test/Misc/diag-template-
> diff ing.cpp
> index dffd5715700a2..087cdd77a72a9 100644
> --- a/clang/test/Misc/diag-template-
> diff ing.cpp
> +++ b/clang/test/Misc/diag-template-
> diff ing.cpp
> @@ -1454,7 +1454,7 @@ void run() {
> D<X::X1>(VectorType<X::X2>());
> }
> // CHECK-ELIDE-NOTREE: error: no matching function for call to 'D'
> -// CHECK-ELIDE-NOTREE: note: candidate function template not viable: no known conversion from 'VectorType<X::X2>' to 'const VectorType<(X)0>' for 1st argument
> +// CHECK-ELIDE-NOTREE: note: candidate function template not viable: no known conversion from 'VectorType<X::X2>' to 'const VectorType<(TypeAlias::X)0>' for 1st argument
> }
>
> namespace TypeAlias2 {
>
> diff --git a/clang/test/SemaTemplate/instantiation-default-1.cpp b/clang/test/SemaTemplate/instantiation-default-1.cpp
> index 3e70a2148ca1a..33e01b6b8aa52 100644
> --- a/clang/test/SemaTemplate/instantiation-default-1.cpp
> +++ b/clang/test/SemaTemplate/instantiation-default-1.cpp
> @@ -33,7 +33,7 @@ void test_Def2(Def2<int, int const*> *d2) {
> }
>
> typedef int& int_ref_t;
> -Def2<int_ref_t> *d2; // expected-note{{in instantiation of default argument for 'Def2<int_ref_t>' required here}}
> +Def2<int_ref_t> *d2; // expected-note{{in instantiation of default argument for 'Def2<int &>' required here}}
>
>
> template<> struct Def1<const int> { }; // expected-error{{redefinition of 'Def1<const int>'}}
>
> diff --git a/clang/test/SemaTemplate/make_integer_seq.cpp b/clang/test/SemaTemplate/make_integer_seq.cpp
> index 12505b0a7481b..b51eed59961e2 100644
> --- a/clang/test/SemaTemplate/make_integer_seq.cpp
> +++ b/clang/test/SemaTemplate/make_integer_seq.cpp
> @@ -69,14 +69,14 @@ template <template <class T, T...> class S, class T, int N> struct C {
> // CHECK-NEXT: | `-TemplateTypeParmType 0x{{[0-9A-Fa-f]+}} 'T' dependent depth 0 index 1
> // CHECK-NEXT: | `-TemplateTypeParm 0x{{[0-9A-Fa-f]+}} 'T'
> // CHECK-NEXT: |-TemplateArgument expr
> -// CHECK-NEXT: | `-ImplicitCastExpr 0x{{[0-9A-Fa-f]+}} <col:42> 'T' <Dependent>
> +// CHECK-NEXT: | `-ImplicitCastExpr 0x{{[0-9A-Fa-f]+}} <col:42> 'type-parameter-0-1':'type-parameter-0-1' <Dependent>
> // CHECK-NEXT: | `-DeclRefExpr 0x{{[0-9A-Fa-f]+}} <col:42> 'int' NonTypeTemplateParm 0x{{[0-9A-Fa-f]+}} 'N' 'int'
> // CHECK-NEXT: `-TemplateSpecializationType 0x{{[0-9A-Fa-f]+}} '__make_integer_seq<type-parameter-0-1, N>' dependent __make_integer_seq
> // CHECK-NEXT: |-TemplateArgument template
> // CHECK-NEXT: |-TemplateArgument type 'type-parameter-0-1'
> // CHECK-NEXT: | `-TemplateTypeParmType 0x{{[0-9A-Fa-f]+}} 'type-parameter-0-1' dependent depth 0 index 1
> // CHECK-NEXT: `-TemplateArgument expr
> -// CHECK-NEXT: `-ImplicitCastExpr 0x{{[0-9A-Fa-f]+}} <col:42> 'T' <Dependent>
> +// CHECK-NEXT: `-ImplicitCastExpr 0x{{[0-9A-Fa-f]+}} <col:42> 'type-parameter-0-1':'type-parameter-0-1' <Dependent>
> // CHECK-NEXT: `-DeclRefExpr 0x{{[0-9A-Fa-f]+}} <col:42> 'int' NonTypeTemplateParm 0x{{[0-9A-Fa-f]+}} 'N' 'int'
>
> using test4 = __make_integer_seq<A, T, 1>;
> @@ -88,14 +88,14 @@ template <template <class T, T...> class S, class T, int N> struct C {
> // CHECK-NEXT: | `-TemplateTypeParmType 0x{{[0-9A-Fa-f]+}} 'T' dependent depth 0 index 1
> // CHECK-NEXT: | `-TemplateTypeParm 0x{{[0-9A-Fa-f]+}} 'T'
> // CHECK-NEXT: |-TemplateArgument expr
> -// CHECK-NEXT: | `-ImplicitCastExpr 0x{{[0-9A-Fa-f]+}} <col:42> 'T' <Dependent>
> +// CHECK-NEXT: | `-ImplicitCastExpr 0x{{[0-9A-Fa-f]+}} <col:42> 'type-parameter-0-1':'type-parameter-0-1' <Dependent>
> // CHECK-NEXT: | `-IntegerLiteral 0x{{[0-9A-Fa-f]+}} <col:42> 'int' 1
> // CHECK-NEXT: `-TemplateSpecializationType 0x{{[0-9A-Fa-f]+}} '__make_integer_seq<A, type-parameter-0-1, 1>' dependent __make_integer_seq
> // CHECK-NEXT: |-TemplateArgument template A
> // CHECK-NEXT: |-TemplateArgument type 'type-parameter-0-1'
> // CHECK-NEXT: | `-TemplateTypeParmType 0x{{[0-9A-Fa-f]+}} 'type-parameter-0-1' dependent depth 0 index 1
> // CHECK-NEXT: `-TemplateArgument expr
> -// CHECK-NEXT: `-ImplicitCastExpr 0x{{[0-9A-Fa-f]+}} <col:42> 'T' <Dependent>
> +// CHECK-NEXT: `-ImplicitCastExpr 0x{{[0-9A-Fa-f]+}} <col:42> 'type-parameter-0-1':'type-parameter-0-1' <Dependent>
> // CHECK-NEXT: `-IntegerLiteral 0x{{[0-9A-Fa-f]+}} <col:42> 'int' 1
>
> using test5 = __make_integer_seq<A, int, N>;
>
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
More information about the cfe-commits
mailing list