diff options
| -rw-r--r-- | clang/lib/Sema/SemaTemplateInstantiate.cpp | 4 | ||||
| -rw-r--r-- | clang/test/SemaTemplate/derived.cpp | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaTemplateInstantiate.cpp b/clang/lib/Sema/SemaTemplateInstantiate.cpp index 5e3ced47f44..9babafedc95 100644 --- a/clang/lib/Sema/SemaTemplateInstantiate.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiate.cpp @@ -1754,6 +1754,10 @@ Sema::SubstBaseSpecifiers(CXXRecordDecl *Instantiation, Base = Pattern->bases_begin(), BaseEnd = Pattern->bases_end(); Base != BaseEnd; ++Base) { if (!Base->getType()->isDependentType()) { + if (const CXXRecordDecl *RD = Base->getType()->getAsCXXRecordDecl()) { + if (RD->isInvalidDecl()) + Instantiation->setInvalidDecl(); + } InstantiatedBases.push_back(new (Context) CXXBaseSpecifier(*Base)); continue; } diff --git a/clang/test/SemaTemplate/derived.cpp b/clang/test/SemaTemplate/derived.cpp index 7b91f9a3ed3..a76b34fda26 100644 --- a/clang/test/SemaTemplate/derived.cpp +++ b/clang/test/SemaTemplate/derived.cpp @@ -28,3 +28,12 @@ namespace rdar13267210 { } }; } + +namespace PR16292 { + class IncompleteClass; // expected-note{{forward declaration}} + class BaseClass { + IncompleteClass Foo; // expected-error{{field has incomplete type}} + }; + template<class T> class DerivedClass : public BaseClass {}; + void* p = new DerivedClass<void>; +} |
