From e656b8397f05fd1b7c4a735372f79a52f4e32be5 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Mon, 23 Apr 2012 16:42:52 +0000 Subject: [PATCH] Teach RequireCompleteType about multi-dimensional arrays. Fixes . git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@155356 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaType.cpp | 3 ++- test/SemaObjCXX/ivar-construct.mm | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp index d0906ded0c..1b95f05c79 100644 --- a/lib/Sema/SemaType.cpp +++ b/lib/Sema/SemaType.cpp @@ -4195,7 +4195,8 @@ bool Sema::RequireCompleteType(SourceLocation Loc, QualType T, // class template specialization, or an array with known size of such, // try to instantiate it. QualType MaybeTemplate = T; - if (const ConstantArrayType *Array = Context.getAsConstantArrayType(T)) + while (const ConstantArrayType *Array + = Context.getAsConstantArrayType(MaybeTemplate)) MaybeTemplate = Array->getElementType(); if (const RecordType *Record = MaybeTemplate->getAs()) { if (ClassTemplateSpecializationDecl *ClassTemplateSpec diff --git a/test/SemaObjCXX/ivar-construct.mm b/test/SemaObjCXX/ivar-construct.mm index 535d2a0217..a066fca359 100644 --- a/test/SemaObjCXX/ivar-construct.mm +++ b/test/SemaObjCXX/ivar-construct.mm @@ -27,3 +27,11 @@ struct Z; // expected-note{{forward declaration}} @implementation B @end + +// +template struct Incomplete; // expected-note{{declared here}} + +@interface C { + Incomplete a[4][4][4]; // expected-error{{implicit instantiation of undefined template 'Incomplete'}} +} +@end -- 2.40.0