3 files changed, 27 insertions, 7 deletions
diff --git a/include/clang/Analysis/PathSensitive/Checker.h b/include/clang/Analysis/PathSensitive/Checker.h
index f6a5074fd8..91a4b6d1b1 100644
--- a/include/clang/Analysis/PathSensitive/Checker.h
+++ b/include/clang/Analysis/PathSensitive/Checker.h
@@ -42,6 +42,7 @@ class CheckerContext {
   const GRState *state;
   const Stmt *statement;
   const unsigned size;
+  bool DoneEvaluating; // FIXME: This is not a permanent API change.
 public:
   CheckerContext(ExplodedNodeSet &dst, GRStmtNodeBuilder &builder,
                  GRExprEngine &eng, ExplodedNode *pred,
@@ -52,10 +53,22 @@ public:
       OldTag(B.Tag, tag),
       OldPointKind(B.PointKind, K),
       OldHasGen(B.HasGeneratedNode),
-      state(st), statement(stmt), size(Dst.size()) {}
+      state(st), statement(stmt), size(Dst.size()),
+      DoneEvaluating(false) {}
 
   ~CheckerContext();
   
+  // FIXME: This were added to support CallAndMessageChecker to indicating
+  // to GRExprEngine to "stop evaluating" a message expression under certain
+  // cases.  This is *not* meant to be a permanent API change, and was added
+  // to aid in the transition of removing logic for checks from GRExprEngine.  
+  void setDoneEvaluating() {
+    DoneEvaluating = true;
+  }
+  bool isDoneEvaluating() const {
+    return DoneEvaluating;
+  }
+  
   ConstraintManager &getConstraintManager() {
       return Eng.getConstraintManager();
   }
@@ -152,7 +165,7 @@ private:
   friend class GRExprEngine;
 
   // FIXME: Remove the 'tag' option.
-  void GR_Visit(ExplodedNodeSet &Dst,
+  bool GR_Visit(ExplodedNodeSet &Dst,
                 GRStmtNodeBuilder &Builder,
                 GRExprEngine &Eng,
                 const Stmt *S,
@@ -164,6 +177,7 @@ private:
       _PreVisit(C, S);
     else
       _PostVisit(C, S);
+    return C.isDoneEvaluating();
   }
 
   // FIXME: Remove the 'tag' option.
diff --git a/include/clang/Analysis/PathSensitive/ExplodedGraph.h b/include/clang/Analysis/PathSensitive/ExplodedGraph.h
index a7bbdf939f..76cab1ddc1 100644
--- a/include/clang/Analysis/PathSensitive/ExplodedGraph.h
+++ b/include/clang/Analysis/PathSensitive/ExplodedGraph.h
@@ -352,10 +352,16 @@ public:
   typedef ImplTy::iterator       iterator;
   typedef ImplTy::const_iterator const_iterator;
 
-  inline unsigned size() const { return Impl.size();  }
-  inline bool empty()    const { return Impl.empty(); }
-
-  inline void clear() { Impl.clear(); }
+  unsigned size() const { return Impl.size();  }
+  bool empty()    const { return Impl.empty(); }
+
+  void clear() { Impl.clear(); }
+  void insert(const ExplodedNodeSet &S) {
+    if (empty())
+      Impl = S.Impl;
+    else
+      Impl.insert(S.begin(), S.end());
+  }
 
   inline iterator begin() { return Impl.begin(); }
   inline iterator end()   { return Impl.end();   }
diff --git a/include/clang/Analysis/PathSensitive/GRExprEngine.h b/include/clang/Analysis/PathSensitive/GRExprEngine.h
index 1512b9099f..99ff57443b 100644
--- a/include/clang/Analysis/PathSensitive/GRExprEngine.h
+++ b/include/clang/Analysis/PathSensitive/GRExprEngine.h
@@ -222,7 +222,7 @@ public:
 protected:
   /// CheckerVisit - Dispatcher for performing checker-specific logic
   ///  at specific statements.
-  void CheckerVisit(Stmt *S, ExplodedNodeSet &Dst, ExplodedNodeSet &Src, 
+  bool CheckerVisit(Stmt *S, ExplodedNodeSet &Dst, ExplodedNodeSet &Src, 
                     bool isPrevisit);
   
   void CheckerVisitBind(const Stmt *AssignE, const Stmt *StoreE,