[clang] [analyzer][NFC] Match the parameters order of getEndPath and finalizeVisitor with VisitNode (PR #212883)

Benedek Kaibas via cfe-commits cfe-commits at lists.llvm.org
Thu Jul 30 04:03:52 PDT 2026


https://github.com/benedekaibas updated https://github.com/llvm/llvm-project/pull/212883

>From 2b7e69544ab1e4a73cd06fd478e09c22f39455f1 Mon Sep 17 00:00:00 2001
From: benedekaibas <kaibas01 at allegheny.edu>
Date: Thu, 30 Jul 2026 13:02:06 +0200
Subject: [PATCH] Correct clang-format highlighting.

---
 .../Core/BugReporter/BugReporterVisitors.h       | 10 +++++-----
 .../Core/BugReporter/Z3CrosscheckVisitor.h       |  2 +-
 .../StaticAnalyzer/Checkers/MallocChecker.cpp    |  4 ++--
 .../RetainCountDiagnostics.cpp                   | 16 ++++++++--------
 .../StaticAnalyzer/Checkers/VAListChecker.cpp    |  4 ++--
 clang/lib/StaticAnalyzer/Core/BugReporter.cpp    |  4 ++--
 .../StaticAnalyzer/Core/BugReporterVisitors.cpp  | 14 +++++++-------
 .../StaticAnalyzer/Core/Z3CrosscheckVisitor.cpp  |  4 ++--
 8 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitors.h b/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitors.h
index 03d3b97876ac9..495e74e47e51d 100644
--- a/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitors.h
+++ b/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitors.h
@@ -75,8 +75,8 @@ class BugReporterVisitor : public llvm::FoldingSetNode {
 
   /// Last function called on the visitor, no further calls to VisitNode
   /// would follow.
-  virtual void finalizeVisitor(BugReporterContext &BRC,
-                               const ExplodedNode *EndPathNode,
+  virtual void finalizeVisitor(const ExplodedNode *EndPathNode,
+                               BugReporterContext &BRC,
                                PathSensitiveBugReport &BR);
 
   /// Provide custom definition for the final diagnostic piece on the
@@ -84,8 +84,8 @@ class BugReporterVisitor : public llvm::FoldingSetNode {
   ///
   /// NOTE that this function can be implemented on at most one used visitor,
   /// and otherwise it crahes at runtime.
-  virtual PathDiagnosticPieceRef getEndPath(BugReporterContext &BRC,
-                                            const ExplodedNode *N,
+  virtual PathDiagnosticPieceRef getEndPath(const ExplodedNode *N,
+                                            BugReporterContext &BRC,
                                             PathSensitiveBugReport &BR);
 
   virtual void Profile(llvm::FoldingSetNodeID &ID) const = 0;
@@ -541,7 +541,7 @@ class LikelyFalsePositiveSuppressionBRVisitor final
     return nullptr;
   }
 
-  void finalizeVisitor(BugReporterContext &BRC, const ExplodedNode *N,
+  void finalizeVisitor(const ExplodedNode *N, BugReporterContext &BRC,
                        PathSensitiveBugReport &BR) override;
 };
 
diff --git a/clang/include/clang/StaticAnalyzer/Core/BugReporter/Z3CrosscheckVisitor.h b/clang/include/clang/StaticAnalyzer/Core/BugReporter/Z3CrosscheckVisitor.h
index 439f37fa8604f..952ee09902dde 100644
--- a/clang/include/clang/StaticAnalyzer/Core/BugReporter/Z3CrosscheckVisitor.h
+++ b/clang/include/clang/StaticAnalyzer/Core/BugReporter/Z3CrosscheckVisitor.h
@@ -37,7 +37,7 @@ class Z3CrosscheckVisitor final : public BugReporterVisitor {
                                    BugReporterContext &BRC,
                                    PathSensitiveBugReport &BR) override;
 
-  void finalizeVisitor(BugReporterContext &BRC, const ExplodedNode *EndPathNode,
+  void finalizeVisitor(const ExplodedNode *EndPathNode, BugReporterContext &BRC,
                        PathSensitiveBugReport &BR) override;
 
 private:
diff --git a/clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp
index 32c767d89dd55..5ee5601a9319a 100644
--- a/clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp
@@ -1074,8 +1074,8 @@ class MallocBugVisitor final : public BugReporterVisitor {
                                    BugReporterContext &BRC,
                                    PathSensitiveBugReport &BR) override;
 
-  PathDiagnosticPieceRef getEndPath(BugReporterContext &BRC,
-                                    const ExplodedNode *EndPathNode,
+  PathDiagnosticPieceRef getEndPath(const ExplodedNode *EndPathNode,
+                                    BugReporterContext &BRC,
                                     PathSensitiveBugReport &BR) override {
     if (!IsLeak)
       return nullptr;
diff --git a/clang/lib/StaticAnalyzer/Checkers/RetainCountChecker/RetainCountDiagnostics.cpp b/clang/lib/StaticAnalyzer/Checkers/RetainCountChecker/RetainCountDiagnostics.cpp
index 0b7c8f5f69a38..59d11c4d8ae2c 100644
--- a/clang/lib/StaticAnalyzer/Checkers/RetainCountChecker/RetainCountDiagnostics.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/RetainCountChecker/RetainCountDiagnostics.cpp
@@ -277,8 +277,8 @@ class RefCountReportVisitor : public BugReporterVisitor {
                                    BugReporterContext &BRC,
                                    PathSensitiveBugReport &BR) override;
 
-  PathDiagnosticPieceRef getEndPath(BugReporterContext &BRC,
-                                    const ExplodedNode *N,
+  PathDiagnosticPieceRef getEndPath(const ExplodedNode *N,
+                                    BugReporterContext &BRC,
                                     PathSensitiveBugReport &BR) override;
 };
 
@@ -288,8 +288,8 @@ class RefLeakReportVisitor : public RefCountReportVisitor {
       : RefCountReportVisitor(Sym, /*IsReleaseUnowned=*/false),
         LastBinding(LastBinding) {}
 
-  PathDiagnosticPieceRef getEndPath(BugReporterContext &BRC,
-                                    const ExplodedNode *N,
+  PathDiagnosticPieceRef getEndPath(const ExplodedNode *N,
+                                    BugReporterContext &BRC,
                                     PathSensitiveBugReport &BR) override;
 
 private:
@@ -691,16 +691,16 @@ static AllocationInfo GetAllocationSite(ProgramStateManager &StateMgr,
 }
 
 PathDiagnosticPieceRef
-RefCountReportVisitor::getEndPath(BugReporterContext &BRC,
-                                  const ExplodedNode *EndN,
+RefCountReportVisitor::getEndPath(const ExplodedNode *EndN,
+                                  BugReporterContext &BRC,
                                   PathSensitiveBugReport &BR) {
   BR.markInteresting(Sym);
   return BugReporterVisitor::getDefaultEndPath(BRC, EndN, BR);
 }
 
 PathDiagnosticPieceRef
-RefLeakReportVisitor::getEndPath(BugReporterContext &BRC,
-                                 const ExplodedNode *EndN,
+RefLeakReportVisitor::getEndPath(const ExplodedNode *EndN,
+                                 BugReporterContext &BRC,
                                  PathSensitiveBugReport &BR) {
 
   // Tell the BugReporterContext to report cases when the tracked symbol is
diff --git a/clang/lib/StaticAnalyzer/Checkers/VAListChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/VAListChecker.cpp
index 09197a85e439c..833fda1185077 100644
--- a/clang/lib/StaticAnalyzer/Checkers/VAListChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/VAListChecker.cpp
@@ -96,8 +96,8 @@ class VAListChecker : public Checker<check::PreCall, check::PreStmt<VAArgExpr>,
       ID.AddPointer(&X);
       ID.AddPointer(Reg);
     }
-    PathDiagnosticPieceRef getEndPath(BugReporterContext &BRC,
-                                      const ExplodedNode *EndPathNode,
+    PathDiagnosticPieceRef getEndPath(const ExplodedNode *EndPathNode,
+                                      BugReporterContext &BRC,
                                       PathSensitiveBugReport &BR) override {
       if (!IsLeak)
         return nullptr;
diff --git a/clang/lib/StaticAnalyzer/Core/BugReporter.cpp b/clang/lib/StaticAnalyzer/Core/BugReporter.cpp
index b609a98b0aed2..ad36d1c55a64a 100644
--- a/clang/lib/StaticAnalyzer/Core/BugReporter.cpp
+++ b/clang/lib/StaticAnalyzer/Core/BugReporter.cpp
@@ -2850,9 +2850,9 @@ generateVisitorsDiagnostics(PathSensitiveBugReport *R,
     if (!Pred) {
       PathDiagnosticPieceRef LastPiece;
       for (auto &V : visitors) {
-        V->finalizeVisitor(BRC, ErrorNode, *R);
+        V->finalizeVisitor(ErrorNode, BRC, *R);
 
-        if (auto Piece = V->getEndPath(BRC, ErrorNode, *R)) {
+        if (auto Piece = V->getEndPath(ErrorNode, BRC, *R)) {
           assert(!LastPiece &&
                  "There can only be one final piece in a diagnostic.");
           assert(Piece->getKind() == PathDiagnosticPiece::Kind::Event &&
diff --git a/clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp b/clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp
index 8ab375b32af89..170d96699890b 100644
--- a/clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp
+++ b/clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp
@@ -346,14 +346,14 @@ static bool wasRegionOfInterestModifiedAt(const SubRegion *RegionOfInterest,
 // Implementation of BugReporterVisitor.
 //===----------------------------------------------------------------------===//
 
-PathDiagnosticPieceRef BugReporterVisitor::getEndPath(BugReporterContext &,
-                                                      const ExplodedNode *,
-                                                      PathSensitiveBugReport &) {
+PathDiagnosticPieceRef
+BugReporterVisitor::getEndPath(const ExplodedNode *, BugReporterContext &,
+                               PathSensitiveBugReport &) {
   return nullptr;
 }
 
-void BugReporterVisitor::finalizeVisitor(BugReporterContext &,
-                                         const ExplodedNode *,
+void BugReporterVisitor::finalizeVisitor(const ExplodedNode *,
+                                         BugReporterContext &,
                                          PathSensitiveBugReport &) {}
 
 PathDiagnosticPieceRef
@@ -1115,7 +1115,7 @@ class ReturnVisitor : public TrackingBugReporterVisitor {
     llvm_unreachable("Invalid visit mode!");
   }
 
-  void finalizeVisitor(BugReporterContext &, const ExplodedNode *,
+  void finalizeVisitor(const ExplodedNode *, BugReporterContext &,
                        PathSensitiveBugReport &BR) override {
     if (EnableNullFPSuppression && ShouldInvalidate)
       BR.markInvalid(ReturnVisitor::getTag(), CalleeSF);
@@ -3252,7 +3252,7 @@ bool ConditionBRVisitor::isPieceMessageGeneric(
 //===----------------------------------------------------------------------===//
 
 void LikelyFalsePositiveSuppressionBRVisitor::finalizeVisitor(
-    BugReporterContext &BRC, const ExplodedNode *N,
+    const ExplodedNode *N, BugReporterContext &BRC,
     PathSensitiveBugReport &BR) {
   // Here we suppress false positives coming from system headers. This list is
   // based on known issues.
diff --git a/clang/lib/StaticAnalyzer/Core/Z3CrosscheckVisitor.cpp b/clang/lib/StaticAnalyzer/Core/Z3CrosscheckVisitor.cpp
index f609798042639..b4dd625d10101 100644
--- a/clang/lib/StaticAnalyzer/Core/Z3CrosscheckVisitor.cpp
+++ b/clang/lib/StaticAnalyzer/Core/Z3CrosscheckVisitor.cpp
@@ -54,8 +54,8 @@ Z3CrosscheckVisitor::Z3CrosscheckVisitor(Z3CrosscheckVisitor::Z3Result &Result,
     : Constraints(ConstraintMap::Factory().getEmptyMap()), Result(Result),
       Opts(Opts) {}
 
-void Z3CrosscheckVisitor::finalizeVisitor(BugReporterContext &BRC,
-                                          const ExplodedNode *EndPathNode,
+void Z3CrosscheckVisitor::finalizeVisitor(const ExplodedNode *EndPathNode,
+                                          BugReporterContext &BRC,
                                           PathSensitiveBugReport &BR) {
   // Collect new constraints
   addConstraints(EndPathNode, /*OverwriteConstraintsOnExistingSyms=*/true);



More information about the cfe-commits mailing list