From 5bd30395b96ce7ab3e5495a2af5639c3b29669ea Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Sun, 15 Mar 2009 20:12:13 +0000 Subject: (Hopefully) instantiate dependent array types correctly. llvm-svn: 67032 --- clang/lib/Sema/SemaTemplateInstantiate.cpp | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'clang/lib/Sema') diff --git a/clang/lib/Sema/SemaTemplateInstantiate.cpp b/clang/lib/Sema/SemaTemplateInstantiate.cpp index b7f0bbc923a..dbdc5a8a716 100644 --- a/clang/lib/Sema/SemaTemplateInstantiate.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiate.cpp @@ -283,9 +283,27 @@ QualType TemplateTypeInstantiator:: InstantiateDependentSizedArrayType(const DependentSizedArrayType *T, unsigned Quals) const { - // FIXME: Implement this - assert(false && "Cannot instantiate DependentSizedArrayType yet"); - return QualType(); + Expr *ArraySize = T->getSizeExpr(); + assert(ArraySize->isValueDependent() && + "dependent sized array types must have value dependent size expr"); + + // Instantiate the element type if needed + QualType ElementType = T->getElementType(); + if (ElementType->isDependentType()) { + ElementType = Instantiate(ElementType); + if (ElementType.isNull()) + return QualType(); + } + + // Instantiate the size expression + Sema::OwningExprResult InstantiatedArraySize = + SemaRef.InstantiateExpr(ArraySize, TemplateArgs, NumTemplateArgs); + if (InstantiatedArraySize.isInvalid()) + return QualType(); + + return SemaRef.BuildArrayType(ElementType, T->getSizeModifier(), + (Expr *)InstantiatedArraySize.release(), + T->getIndexTypeQualifier(), Loc, Entity); } QualType -- cgit v1.2.3