Added extra guard for null Stmt* when traversing the AST using VisitChildren.

Added assertion that Block-level statements should not be NULL.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@42376 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Analysis/Visitors/CFGRecStmtVisitor.h b/include/clang/Analysis/Visitors/CFGRecStmtVisitor.h
index a17b207777b7a0246ec492b86eaa0e269356feed..002c2f0546ab030896f0aa7d2be77d8d83b21bcf 100644 (file)
--- a/include/clang/Analysis/Visitors/CFGRecStmtVisitor.h
+++ b/include/clang/Analysis/Visitors/CFGRecStmtVisitor.h
@@ -28,6 +28,8 @@ public:
   }
   
   void BlockStmt_Visit(Stmt* S) {
+    assert (S);
+    
     static_cast< CFGStmtVisitor<ImplClass>* >(this)->BlockStmt_Visit(S);
     static_cast< ImplClass* >(this)->VisitChildren(S);
   }

diff --git a/include/clang/Analysis/Visitors/CFGStmtVisitor.h b/include/clang/Analysis/Visitors/CFGStmtVisitor.h
index 86181c8551ad1199e3436cbebc355a96629b74c2..afc987309370842b12de321f9210ce034889e504 100644 (file)
--- a/include/clang/Analysis/Visitors/CFGStmtVisitor.h
+++ b/include/clang/Analysis/Visitors/CFGStmtVisitor.h
@@ -96,7 +96,7 @@ public:
   /// VisitChildren: Call "Visit" on each child of S.
   void VisitChildren(Stmt* S) {
     for (Stmt::child_iterator I=S->child_begin(), E=S->child_end(); I != E;++I)
-      static_cast<ImplClass*>(this)->Visit(*I);    
+      if (*I) static_cast<ImplClass*>(this)->Visit(*I);    
   }
 };