[PATCH] D103677: [analyzer] Extract ControlDependencyHandler

[Valeriy Savchenko via Phabricator via cfe-commits]

vsavchenko created this revision.
vsavchenko added reviewers: NoQ, xazax.hun, martong, steakhal, Szelethus, manas, RedDocMD.
Herald added subscribers: ASDenysPetrov, dkrupp, donat.nagy, mikhail.ramalho, a.sidorin, rnkovacs, szepet, baloghadamsoftware.
vsavchenko requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D103677

Files:
  clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp


Index: clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp
===================================================================
--- clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp
+++ clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp
@@ -2090,17 +2090,14 @@
   }
 };
 
-class DefaultExpressionHandler final : public ExpressionHandler {
+class ControlDependencyHandler final : public ExpressionHandler {
 public:
   using ExpressionHandler::ExpressionHandler;
 
   Tracker::Result handle(const Expr *Inner, const ExplodedNode *InputNode,
                          const ExplodedNode *LVNode,
                          TrackingOptions Opts) override {
-    ProgramStateRef LVState = LVNode->getState();
-    const StackFrameContext *SFC = LVNode->getStackFrame();
     PathSensitiveBugReport &Report = getParentTracker().getReport();
-    Tracker::Result Result;
 
     // We only track expressions if we believe that they are important. Chances
     // are good that control dependencies to the tracking point are also
@@ -2108,14 +2105,31 @@
     // this point.
     // TODO: Shouldn't we track control dependencies of every bug location,
     // rather than only tracked expressions?
-    if (LVState->getAnalysisManager()
+    if (LVNode->getState()
+            ->getAnalysisManager()
             .getAnalyzerOptions()
             .ShouldTrackConditions) {
       Report.addVisitor<TrackControlDependencyCondBRVisitor>(
           &getParentTracker(), InputNode);
-      Result.FoundSomethingToTrack = true;
+      return {true};
     }
 
+    return {};
+  }
+};
+
+class DefaultExpressionHandler final : public ExpressionHandler {
+public:
+  using ExpressionHandler::ExpressionHandler;
+
+  Tracker::Result handle(const Expr *Inner, const ExplodedNode *InputNode,
+                         const ExplodedNode *LVNode,
+                         TrackingOptions Opts) override {
+    ProgramStateRef LVState = LVNode->getState();
+    const StackFrameContext *SFC = LVNode->getStackFrame();
+    PathSensitiveBugReport &Report = getParentTracker().getReport();
+    Tracker::Result Result;
+
     // The message send could be nil due to the receiver being nil.
     // At this point in the path, the receiver should be live since we are at
     // the message send expr. If it is nil, start tracking it.
@@ -2297,7 +2311,8 @@
 
 Tracker::Tracker(PathSensitiveBugReport &Report) : Report(Report) {
   // Default expression handlers.
-  addHighPriorityHandler<DefaultExpressionHandler>();
+  addLowPriorityHandler<ControlDependencyHandler>();
+  addLowPriorityHandler<DefaultExpressionHandler>();
   addLowPriorityHandler<RValueHandler>();
   // Default store handlers.
   addHighPriorityHandler<DefaultStoreHandler>();


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D103677.349792.patch
Type: text/x-patch
Size: 2735 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20210604/d45ee0ad/attachment.bin>