Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions clang/lib/Sema/TreeTransform.h
Original file line number Diff line number Diff line change
Expand Up @@ -7765,17 +7765,23 @@ QualType TreeTransform<Derived>::TransformDependentTemplateSpecializationType(
NewTemplateArgs.setLAngleLoc(TL.getLAngleLoc());
NewTemplateArgs.setRAngleLoc(TL.getRAngleLoc());

typedef TemplateArgumentLocContainerIterator<
DependentTemplateSpecializationTypeLoc> ArgIterator;
if (getDerived().TransformTemplateArguments(ArgIterator(TL, 0),
ArgIterator(TL, TL.getNumArgs()),
NewTemplateArgs))
auto ArgsRange = llvm::make_range<TemplateArgumentLocContainerIterator<
DependentTemplateSpecializationTypeLoc>>({TL, 0}, {TL, TL.getNumArgs()});

if (getDerived().TransformTemplateArguments(ArgsRange.begin(),
ArgsRange.end(), NewTemplateArgs))
return QualType();
bool TemplateArgumentsChanged = !llvm::equal(
ArgsRange, NewTemplateArgs.arguments(),
[](const TemplateArgumentLoc &A, const TemplateArgumentLoc &B) {
return A.getArgument().structurallyEquals(B.getArgument());
});

const DependentTemplateStorage &DTN = T->getDependentTemplateName();

QualType Result = TL.getType();
if (getDerived().AlwaysRebuild() || SS.getScopeRep() != DTN.getQualifier()) {
if (getDerived().AlwaysRebuild() || SS.getScopeRep() != DTN.getQualifier() ||
TemplateArgumentsChanged) {
TemplateName Name = getDerived().RebuildTemplateName(
SS, TL.getTemplateKeywordLoc(), DTN.getName(), TL.getTemplateNameLoc(),
/*ObjectType=*/QualType(), /*FirstQualifierInScope=*/nullptr,
Expand Down
9 changes: 9 additions & 0 deletions clang/test/SemaTemplate/dependent-names.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -458,3 +458,12 @@ namespace PR37680 {
};
int f(b<a> ba) { return ba.add<0>(); }
}

namespace TransformDependentTemplates {
template <class T> struct Test1 {
template <class T2>
using Arg = typename T::template Arg<T2>;
void f(Arg<void>);
void f(Arg<int>);
};
} // namespace TransformDependentTemplates