Revert r76831, there are many Analyzer test failures on multiple platforms.

--- Reverse-merging r76831 into '.':
U    include/clang/Analysis/PathSensitive/GRExprEngine.h
U    lib/Analysis/GRExprEngine.cpp

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

diff --git a/include/clang/Analysis/PathSensitive/GRExprEngine.h b/include/clang/Analysis/PathSensitive/GRExprEngine.h
index 49c329a75cecedb4cd607b62abac226b04da0323..534b595c0d351364498a707f280f6b4511de789e 100644 (file)
--- a/include/clang/Analysis/PathSensitive/GRExprEngine.h
+++ b/include/clang/Analysis/PathSensitive/GRExprEngine.h
@@ -585,9 +585,6 @@ protected:
                                      ObjCMessageExpr::arg_iterator E,
                                      NodeTy* Pred, NodeSet& Dst);
   
-  void VisitObjCMessageExprDispatchCheckers(ObjCMessageExpr* ME, NodeTy* Pred,
-                                            NodeSet& Dst);
-  
   void VisitObjCMessageExprDispatchHelper(ObjCMessageExpr* ME, NodeTy* Pred,
                                           NodeSet& Dst);
   

diff --git a/lib/Analysis/GRExprEngine.cpp b/lib/Analysis/GRExprEngine.cpp
index dd2bda13314d0252b3fd61a3e0d5f71d5a2c88e8..eb31f84b0c4d80204b5956b82b3c390ea2c7c348 100644 (file)
--- a/lib/Analysis/GRExprEngine.cpp
+++ b/lib/Analysis/GRExprEngine.cpp
@@ -1855,12 +1855,12 @@ void GRExprEngine::VisitObjCMessageExprArgHelper(ObjCMessageExpr* ME,
       Visit(Receiver, Pred, Tmp);
       
       for (NodeSet::iterator NI = Tmp.begin(), NE = Tmp.end(); NI != NE; ++NI)
-        VisitObjCMessageExprDispatchCheckers(ME, *NI, Dst);
+        VisitObjCMessageExprDispatchHelper(ME, *NI, Dst);
       
       return;
     }
     
-    VisitObjCMessageExprDispatchCheckers(ME, Pred, Dst);
+    VisitObjCMessageExprDispatchHelper(ME, Pred, Dst);
     return;
   }
   
@@ -1873,19 +1873,6 @@ void GRExprEngine::VisitObjCMessageExprArgHelper(ObjCMessageExpr* ME,
     VisitObjCMessageExprArgHelper(ME, AI, AE, *NI, Dst);
 }
 
-void GRExprEngine::VisitObjCMessageExprDispatchCheckers(ObjCMessageExpr* ME,
-                                                        NodeTy* Pred,
-                                                        NodeSet& Dst) {
-  NodeSet Src;
-  Src.Add(Pred);
-  NodeSet DstTmp;
-  // Perform the previsit of the ObjCMessageExpr, storing the results in DstTmp.
-  CheckerVisit(ME, Src, DstTmp, true);
-  
-  for (NodeSet::iterator NI = DstTmp.begin(), NE = DstTmp.end(); NI != NE; ++NI)
-    VisitObjCMessageExprDispatchHelper(ME, *NI, Dst);
-}
-
 void GRExprEngine::VisitObjCMessageExprDispatchHelper(ObjCMessageExpr* ME,
                                                       NodeTy* Pred,
                                                       NodeSet& Dst) {
@@ -2056,7 +2043,7 @@ void GRExprEngine::VisitObjCMessageExprDispatchHelper(ObjCMessageExpr* ME,
       return;
     }    
   }
-
+  
   // Check if we raise an exception.  For now treat these as sinks.  Eventually
   // we will want to handle exceptions properly.