diff options
| -rw-r--r-- | lib/Analysis/CFG.cpp | 4 | ||||
| -rw-r--r-- | test/SemaCXX/warn-unreachable.cpp | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/lib/Analysis/CFG.cpp b/lib/Analysis/CFG.cpp index c760d49899..c7040fc6d4 100644 --- a/lib/Analysis/CFG.cpp +++ b/lib/Analysis/CFG.cpp @@ -721,7 +721,7 @@ void CFGBuilder::addAutomaticObjDtors(LocalScope::const_iterator B, } const CXXDestructorDecl *Dtor = Ty->getAsCXXRecordDecl()->getDestructor(); - if (cast<FunctionType>(Dtor->getType())->getNoReturnAttr()) + if (Dtor && cast<FunctionType>(Dtor->getType())->getNoReturnAttr()) Block = createNoReturnBlock(); else autoCreateBlock(); @@ -864,7 +864,7 @@ LocalScope* CFGBuilder::addLocalScopeForVarDecl(VarDecl *VD, // Check if type is a C++ class with non-trivial destructor. if (const CXXRecordDecl *CD = QT->getAsCXXRecordDecl()) - if (!CD->hasTrivialDestructor()) { + if (CD->hasDefinition() && !CD->hasTrivialDestructor()) { // Add the variable to scope Scope = createOrReuseLocalScope(Scope); Scope->addVar(VD); diff --git a/test/SemaCXX/warn-unreachable.cpp b/test/SemaCXX/warn-unreachable.cpp index 52da0b922e..59b6bf9f30 100644 --- a/test/SemaCXX/warn-unreachable.cpp +++ b/test/SemaCXX/warn-unreachable.cpp @@ -132,3 +132,12 @@ template<int a> struct aligned_storage : imp<a> { ~aligned_storage() { } }; + +// is this valid? +template<typename T> +class outer { + class inner; + void func() { + inner t; + } +}; |