commit afc6824fa6a8038bd11819deee0cc13a718b5ff4
author David Blaikie <dblaikie@gmail.com> Tue Jan 24 04:29:31 2012 +0000
committer David Blaikie <dblaikie@gmail.com> Tue Jan 24 04:29:31 2012 +0000
tree 5410f64d7bf1589610ffdfb8d8a39fc516efc4f2
parent 13ab2a417d8394cc0180ad5805e46ec935e65c06

More fixes/tests.

llvm-svn: 148777

clang/lib/Analysis/CFG.cpp

diff --git a/clang/lib/Analysis/CFG.cpp b/clang/lib/Analysis/CFG.cpp
index c760d49..c7040fc 100644
--- a/clang/lib/Analysis/CFG.cpp
+++ b/clang/lib/Analysis/CFG.cpp
@@ -721,7 +721,7 @@
     }
     
     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 @@
 
   // 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);