53c53,55
< if (!(isa<TemplateTypeParmDecl>(*Param) &&
---
>
> if (!(*Param)->isTemplateParameterPack() &&
> !(isa<TemplateTypeParmDecl>(*Param) &&
189c191,192
< IdentifierInfo *Id, bool Typename) {
---
> IdentifierInfo *Id, bool Typename,
> bool ParameterPack) {
191c194
< return new (C) TemplateTypeParmDecl(DC, L, Id, Typename, Type);
---
> return new (C) TemplateTypeParmDecl(DC, L, Id, Typename, Type, ParameterPack);
248a252,257
> if (!isAddingFromParameterPack()) {
> // Add begin and end indicies.
> Indices.push_back(Args.size());
> Indices.push_back(Args.size());
> }
>
251a261,272
> void TemplateArgumentListBuilder::BeginParameterPack() {
> assert(!isAddingFromParameterPack() && "Already adding to parameter pack!");
>
> Indices.push_back(Args.size());
> }
>
> void TemplateArgumentListBuilder::EndParameterPack() {
> assert(isAddingFromParameterPack() && "Not adding to parameter pack!");
>
> Indices.push_back(Args.size());
> }
>