summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2012-04-23 16:42:52 +0000
committerDouglas Gregor <dgregor@apple.com>2012-04-23 16:42:52 +0000
commit39f39ff4b7d0eead8580f8f27489240fcb2e444a (patch)
treea5d5df9627b164f85db048830196022557053b1c
parent969186fa4b2f52b5fb67a4a73cfc828899a4874a (diff)
downloadbcm5719-llvm-39f39ff4b7d0eead8580f8f27489240fcb2e444a.tar.gz
bcm5719-llvm-39f39ff4b7d0eead8580f8f27489240fcb2e444a.zip
Teach RequireCompleteType about multi-dimensional arrays. Fixes
<rdar://problem/11284902>. llvm-svn: 155356
-rw-r--r--clang/lib/Sema/SemaType.cpp3
-rw-r--r--clang/test/SemaObjCXX/ivar-construct.mm8
2 files changed, 10 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaType.cpp b/clang/lib/Sema/SemaType.cpp
index d0906ded0cb..1b95f05c79a 100644
--- a/clang/lib/Sema/SemaType.cpp
+++ b/clang/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<RecordType>()) {
if (ClassTemplateSpecializationDecl *ClassTemplateSpec
diff --git a/clang/test/SemaObjCXX/ivar-construct.mm b/clang/test/SemaObjCXX/ivar-construct.mm
index 535d2a0217f..a066fca3595 100644
--- a/clang/test/SemaObjCXX/ivar-construct.mm
+++ b/clang/test/SemaObjCXX/ivar-construct.mm
@@ -27,3 +27,11 @@ struct Z; // expected-note{{forward declaration}}
@implementation B
@end
+
+// <rdar://problem/11284902>
+template<typename T> struct Incomplete; // expected-note{{declared here}}
+
+@interface C {
+ Incomplete<int> a[4][4][4]; // expected-error{{implicit instantiation of undefined template 'Incomplete<int>'}}
+}
+@end
OpenPOWER on IntegriCloud