Skip to content

Commit d64b95c

Browse files
committed
fixup! [Sema] Default arguments for template parameters affect ContainsUnexpandedPacks
- Rename function - Use static instead of anonymous namespace
1 parent ae4021d commit d64b95c

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

clang/lib/AST/DeclTemplate.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,12 @@ using namespace clang;
4444
// TemplateParameterList Implementation
4545
//===----------------------------------------------------------------------===//
4646

47-
namespace {
4847
template <class TemplateParam>
49-
bool DefaultArgumentContainsUnexpandedPack(const TemplateParam &P) {
48+
static bool
49+
DefaultTemplateArgumentContainsUnexpandedPack(const TemplateParam &P) {
5050
return P.hasDefaultArgument() &&
5151
P.getDefaultArgument().getArgument().containsUnexpandedParameterPack();
5252
}
53-
} // namespace
5453

5554
TemplateParameterList::TemplateParameterList(const ASTContext& C,
5655
SourceLocation TemplateLoc,
@@ -69,18 +68,18 @@ TemplateParameterList::TemplateParameterList(const ASTContext& C,
6968
bool IsPack = P->isTemplateParameterPack();
7069
if (const auto *NTTP = dyn_cast<NonTypeTemplateParmDecl>(P)) {
7170
if (!IsPack && (NTTP->getType()->containsUnexpandedParameterPack() ||
72-
DefaultArgumentContainsUnexpandedPack(*NTTP)))
71+
DefaultTemplateArgumentContainsUnexpandedPack(*NTTP)))
7372
ContainsUnexpandedParameterPack = true;
7473
if (NTTP->hasPlaceholderTypeConstraint())
7574
HasConstrainedParameters = true;
7675
} else if (const auto *TTP = dyn_cast<TemplateTemplateParmDecl>(P)) {
7776
if (!IsPack &&
7877
(TTP->getTemplateParameters()->containsUnexpandedParameterPack() ||
79-
DefaultArgumentContainsUnexpandedPack(*TTP))) {
78+
DefaultTemplateArgumentContainsUnexpandedPack(*TTP))) {
8079
ContainsUnexpandedParameterPack = true;
8180
}
8281
} else if (const auto *TTP = dyn_cast<TemplateTypeParmDecl>(P)) {
83-
if (!IsPack && DefaultArgumentContainsUnexpandedPack(*TTP)) {
82+
if (!IsPack && DefaultTemplateArgumentContainsUnexpandedPack(*TTP)) {
8483
ContainsUnexpandedParameterPack = true;
8584
} else if (const TypeConstraint *TC = TTP->getTypeConstraint();
8685
TC && TC->getImmediatelyDeclaredConstraint()

0 commit comments

Comments
 (0)