diff options
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 5 | ||||
| -rw-r--r-- | test/SemaCXX/copy-assignment.cpp | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index cc6e2fa350..b7b802a72f 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -5955,8 +5955,11 @@ FieldDecl *Sema::CheckFieldDecl(DeclarationName Name, QualType T, QualType EltTy = Context.getBaseElementType(T); if (!EltTy->isDependentType() && - RequireCompleteType(Loc, EltTy, diag::err_field_incomplete)) + RequireCompleteType(Loc, EltTy, diag::err_field_incomplete)) { + // Fields of incomplete type force their record to be invalid. + Record->setInvalidDecl(); InvalidDecl = true; + } // C99 6.7.2.1p8: A member of a structure or union may have any type other // than a variably modified type. diff --git a/test/SemaCXX/copy-assignment.cpp b/test/SemaCXX/copy-assignment.cpp index bfe1501df8..5730b2af8f 100644 --- a/test/SemaCXX/copy-assignment.cpp +++ b/test/SemaCXX/copy-assignment.cpp @@ -97,3 +97,15 @@ void test() { i = a; // expected-error{{assigning to 'int' from incompatible type 'A'}} } +// <rdar://problem/8315440>: Don't crash +// FIXME: the recovery here is really bad. +namespace test1 { + template<typename T> class A : public unknown::X { // expected-error {{undeclared identifier 'unknown'}} expected-error {{expected class name}} + A(UndeclaredType n) : X(n) {} // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{undeclared identifier 'n'}} expected-error {{expected ';' at end}} expected-error {{field has incomplete type}} + }; + template<typename T> class B : public A<T> { + virtual void foo() {} + }; + extern template class A<char>; // expected-note {{in instantiation}} expected-note {{not complete}} + extern template class B<char>; +} |