Skip to content

Commit 236754c

Browse files
committed
fix case
1 parent 24e912a commit 236754c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

clang/lib/Sema/SemaTemplateInstantiate.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1478,7 +1478,7 @@ namespace {
14781478
}
14791479
}
14801480

1481-
TemplateArgument getTemplateArgumentorUnsubstitutedExpansionPattern(
1481+
TemplateArgument getTemplateArgumentOrUnsubstitutedExpansionPattern(
14821482
const TemplateArgument &TA) {
14831483
if (TA.getKind() != TemplateArgument::Pack)
14841484
return TA;
@@ -1905,7 +1905,7 @@ Decl *TemplateInstantiator::TransformDecl(SourceLocation Loc, Decl *D) {
19051905
TemplateArgument Arg = TemplateArgs(TTP->getDepth(), TTP->getPosition());
19061906

19071907
if (TemplateArgs.ArgumentsAreInjectedParameters(TTP->getDepth())) {
1908-
Arg = getTemplateArgumentorUnsubstitutedExpansionPattern(Arg);
1908+
Arg = getTemplateArgumentOrUnsubstitutedExpansionPattern(Arg);
19091909
} else if (TTP->isParameterPack()) {
19101910
assert(Arg.getKind() == TemplateArgument::Pack &&
19111911
"Missing argument pack");
@@ -2058,7 +2058,7 @@ TemplateName TemplateInstantiator::TransformTemplateName(
20582058
if (TemplateArgs.isRewrite()) {
20592059
// We're rewriting the template parameter as a reference to another
20602060
// template parameter.
2061-
Arg = getTemplateArgumentorUnsubstitutedExpansionPattern(Arg);
2061+
Arg = getTemplateArgumentOrUnsubstitutedExpansionPattern(Arg);
20622062
assert(Arg.getKind() == TemplateArgument::Template &&
20632063
"unexpected nontype template argument kind in template rewrite");
20642064
return Arg.getAsTemplate();
@@ -2072,7 +2072,7 @@ TemplateName TemplateInstantiator::TransformTemplateName(
20722072
"Missing argument pack");
20732073

20742074
if (ArgumentsAreInjectedTemplateParams)
2075-
Arg = getTemplateArgumentorUnsubstitutedExpansionPattern(Arg);
2075+
Arg = getTemplateArgumentOrUnsubstitutedExpansionPattern(Arg);
20762076

20772077
else if (!getSema().ArgPackSubstIndex) {
20782078
// We have the template argument pack to substitute, but we're not
@@ -2138,7 +2138,7 @@ TemplateInstantiator::TransformTemplateParmRefExpr(DeclRefExpr *E,
21382138
if (TemplateArgs.isRewrite()) {
21392139
// We're rewriting the template parameter as a reference to another
21402140
// template parameter.
2141-
Arg = getTemplateArgumentorUnsubstitutedExpansionPattern(Arg);
2141+
Arg = getTemplateArgumentOrUnsubstitutedExpansionPattern(Arg);
21422142
assert(Arg.getKind() == TemplateArgument::Expression &&
21432143
"unexpected nontype template argument kind in template rewrite");
21442144
// FIXME: This can lead to the same subexpression appearing multiple times
@@ -2591,7 +2591,7 @@ TemplateInstantiator::TransformTemplateTypeParmType(TypeLocBuilder &TLB,
25912591
if (TemplateArgs.isRewrite()) {
25922592
// We're rewriting the template parameter as a reference to another
25932593
// template parameter.
2594-
Arg = getTemplateArgumentorUnsubstitutedExpansionPattern(Arg);
2594+
Arg = getTemplateArgumentOrUnsubstitutedExpansionPattern(Arg);
25952595
assert(Arg.getKind() == TemplateArgument::Type &&
25962596
"unexpected nontype template argument kind in template rewrite");
25972597
QualType NewT = Arg.getAsType();

0 commit comments

Comments
 (0)