diff options
Diffstat (limited to 'lib/AST')
| -rw-r--r-- | lib/AST/ASTContext.cpp | 9 | ||||
| -rw-r--r-- | lib/AST/DeclTemplate.cpp | 3 | ||||
| -rw-r--r-- | lib/AST/TemplateBase.cpp | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index 35d4b7a097..a98e0636d4 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -2246,9 +2246,10 @@ ASTContext::getDependentTemplateSpecializationType( return QualType(T, 0); } -QualType ASTContext::getPackExpansionType(QualType Pattern) { +QualType ASTContext::getPackExpansionType(QualType Pattern, + llvm::Optional<unsigned> NumExpansions) { llvm::FoldingSetNodeID ID; - PackExpansionType::Profile(ID, Pattern); + PackExpansionType::Profile(ID, Pattern, NumExpansions); assert(Pattern->containsUnexpandedParameterPack() && "Pack expansions must expand one or more parameter packs"); @@ -2260,13 +2261,13 @@ QualType ASTContext::getPackExpansionType(QualType Pattern) { QualType Canon; if (!Pattern.isCanonical()) { - Canon = getPackExpansionType(getCanonicalType(Pattern)); + Canon = getPackExpansionType(getCanonicalType(Pattern), NumExpansions); // Find the insert position again. PackExpansionTypes.FindNodeOrInsertPos(ID, InsertPos); } - T = new (*this) PackExpansionType(Pattern, Canon); + T = new (*this) PackExpansionType(Pattern, Canon, NumExpansions); Types.push_back(T); PackExpansionTypes.InsertNode(T, InsertPos); return QualType(T, 0); diff --git a/lib/AST/DeclTemplate.cpp b/lib/AST/DeclTemplate.cpp index 6ad62eab30..bd91facd08 100644 --- a/lib/AST/DeclTemplate.cpp +++ b/lib/AST/DeclTemplate.cpp @@ -319,7 +319,8 @@ ClassTemplateDecl::getInjectedClassNameSpecialization() { if (TemplateTypeParmDecl *TTP = dyn_cast<TemplateTypeParmDecl>(*Param)) { QualType ArgType = Context.getTypeDeclType(TTP); if (TTP->isParameterPack()) - ArgType = Context.getPackExpansionType(ArgType); + ArgType = Context.getPackExpansionType(ArgType, + llvm::Optional<unsigned>()); Arg = TemplateArgument(ArgType); } else if (NonTypeTemplateParmDecl *NTTP = diff --git a/lib/AST/TemplateBase.cpp b/lib/AST/TemplateBase.cpp index 42a936c500..f7c4ac832f 100644 --- a/lib/AST/TemplateBase.cpp +++ b/lib/AST/TemplateBase.cpp @@ -346,6 +346,7 @@ SourceRange TemplateArgumentLoc::getSourceRange() const { TemplateArgumentLoc TemplateArgumentLoc::getPackExpansionPattern(SourceLocation &Ellipsis, + llvm::Optional<unsigned> &NumExpansions, ASTContext &Context) const { assert(Argument.isPackExpansion()); @@ -363,6 +364,7 @@ TemplateArgumentLoc::getPackExpansionPattern(SourceLocation &Ellipsis, Ellipsis = Expansion.getEllipsisLoc(); TypeLoc Pattern = Expansion.getPatternLoc(); + NumExpansions = Expansion.getTypePtr()->getNumExpansions(); // FIXME: This is horrible. We know where the source location data is for // the pattern, and we have the pattern's type, but we are forced to copy @@ -382,10 +384,12 @@ TemplateArgumentLoc::getPackExpansionPattern(SourceLocation &Ellipsis, = cast<PackExpansionExpr>(Argument.getAsExpr()); Expr *Pattern = Expansion->getPattern(); Ellipsis = Expansion->getEllipsisLoc(); + // FIXME: Variadic templates num expansions return TemplateArgumentLoc(Pattern, Pattern); } case TemplateArgument::TemplateExpansion: + // FIXME: Variadic templates num expansions Ellipsis = getTemplateEllipsisLoc(); return TemplateArgumentLoc(Argument.getPackExpansionPattern(), getTemplateQualifierRange(), |