nested namespaces

Author: usx95

clang/include/clang/Analysis/Analyses/LifetimeSafety/Checker.h

@@ -19,9 +19,7 @@
 #include "clang/Analysis/Analyses/LifetimeSafety/LoanPropagation.h"
 #include "clang/Analysis/Analyses/LifetimeSafety/Reporter.h"
 
-namespace clang {
-namespace lifetimes {
-namespace internal {
+namespace clang::lifetimes::internal {
 
 /// Runs the lifetime checker, which detects use-after-free errors by
 /// examining loan expiration points and checking if any live origins hold
@@ -31,8 +29,6 @@ void runLifetimeChecker(LoanPropagationAnalysis &LoanPropagation,
                         AnalysisDeclContext &ADC,
                         LifetimeSafetyReporter *Reporter);
 
-} // namespace internal
-} // namespace lifetimes
-} // namespace clang
+} // namespace clang::lifetimes::internal
 
 #endif // LLVM_CLANG_ANALYSIS_ANALYSES_LIFETIMESAFETY_CHECKER_H

clang/include/clang/Analysis/Analyses/LifetimeSafety/Dataflow.h

@@ -24,8 +24,7 @@
 #include "llvm/Support/TimeProfiler.h"
 #include <optional>
 
-namespace clang::lifetimes {
-namespace internal {
+namespace clang::lifetimes::internal {
 
 enum class Direction { Forward, Backward };
 
@@ -185,6 +184,5 @@ class DataflowAnalysis {
   Lattice transfer(Lattice In, const UseFact &) { return In; }
   Lattice transfer(Lattice In, const TestPointFact &) { return In; }
 };
-} // namespace internal
-} // namespace clang::lifetimes
+} // namespace clang::lifetimes::internal
 #endif // LLVM_CLANG_ANALYSIS_ANALYSES_LIFETIMESAFETY_DATAFLOW_H

clang/include/clang/Analysis/Analyses/LifetimeSafety/Facts.h

@@ -16,15 +16,13 @@
 
 #include "clang/Analysis/Analyses/LifetimeSafety/Loans.h"
 #include "clang/Analysis/Analyses/LifetimeSafety/Origins.h"
-#include "clang/Analysis/Analyses/PostOrderCFGView.h"
 #include "clang/Analysis/AnalysisDeclContext.h"
 #include "clang/Analysis/CFG.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/Support/Debug.h"
 #include <cstdint>
 
-namespace clang::lifetimes {
-namespace internal {
+namespace clang::lifetimes::internal {
 /// An abstract base class for a single, atomic lifetime-relevant event.
 class Fact {
 
@@ -65,9 +63,7 @@ class Fact {
   }
 
   virtual void dump(llvm::raw_ostream &OS, const LoanManager &,
-                    const OriginManager &) const {
-    OS << "Fact (Kind: " << static_cast<int>(K) << ")\n";
-  }
+                    const OriginManager &) const;
 };
 
 /// A `ProgramPoint` identifies a location in the CFG by pointing to a specific
@@ -88,13 +84,7 @@ class IssueFact : public Fact {
   LoanID getLoanID() const { return LID; }
   OriginID getOriginID() const { return OID; }
   void dump(llvm::raw_ostream &OS, const LoanManager &LM,
-            const OriginManager &OM) const override {
-    OS << "Issue (";
-    LM.getLoan(getLoanID()).dump(OS);
-    OS << ", ToOrigin: ";
-    OM.dump(getOriginID(), OS);
-    OS << ")\n";
-  }
+            const OriginManager &OM) const override;
 };
 
 class ExpireFact : public Fact {
@@ -111,11 +101,7 @@ class ExpireFact : public Fact {
   SourceLocation getExpiryLoc() const { return ExpiryLoc; }
 
   void dump(llvm::raw_ostream &OS, const LoanManager &LM,
-            const OriginManager &) const override {
-    OS << "Expire (";
-    LM.getLoan(getLoanID()).dump(OS);
-    OS << ")\n";
-  }
+            const OriginManager &) const override;
 };
 
 class OriginFlowFact : public Fact {
@@ -139,14 +125,7 @@ class OriginFlowFact : public Fact {
   bool getKillDest() const { return KillDest; }
 
   void dump(llvm::raw_ostream &OS, const LoanManager &,
-            const OriginManager &OM) const override {
-    OS << "OriginFlow (Dest: ";
-    OM.dump(getDestOriginID(), OS);
-    OS << ", Src: ";
-    OM.dump(getSrcOriginID(), OS);
-    OS << (getKillDest() ? "" : ", Merge");
-    OS << ")\n";
-  }
+            const OriginManager &OM) const override;
 };
 
 class ReturnOfOriginFact : public Fact {
@@ -160,11 +139,7 @@ class ReturnOfOriginFact : public Fact {
   ReturnOfOriginFact(OriginID OID) : Fact(Kind::ReturnOfOrigin), OID(OID) {}
   OriginID getReturnedOriginID() const { return OID; }
   void dump(llvm::raw_ostream &OS, const LoanManager &,
-            const OriginManager &OM) const override {
-    OS << "ReturnOfOrigin (";
-    OM.dump(getReturnedOriginID(), OS);
-    OS << ")\n";
-  }
+            const OriginManager &OM) const override;
 };
 
 class UseFact : public Fact {
@@ -187,11 +162,7 @@ class UseFact : public Fact {
   bool isWritten() const { return IsWritten; }
 
   void dump(llvm::raw_ostream &OS, const LoanManager &,
-            const OriginManager &OM) const override {
-    OS << "Use (";
-    OM.dump(getUsedOrigin(OM), OS);
-    OS << ", " << (isWritten() ? "Write" : "Read") << ")\n";
-  }
+            const OriginManager &OM) const override;
 };
 
 /// A dummy-fact used to mark a specific point in the code for testing.
@@ -208,9 +179,7 @@ class TestPointFact : public Fact {
   StringRef getAnnotation() const { return Annotation; }
 
   void dump(llvm::raw_ostream &OS, const LoanManager &,
-            const OriginManager &) const override {
-    OS << "TestPoint (Annotation: \"" << getAnnotation() << "\")\n";
-  }
+            const OriginManager &) const override;
 };
 
 class FactManager {
@@ -233,26 +202,7 @@ class FactManager {
     return new (Mem) FactType(std::forward<Args>(args)...);
   }
 
-  void dump(const CFG &Cfg, AnalysisDeclContext &AC) const {
-    llvm::dbgs() << "==========================================\n";
-    llvm::dbgs() << "       Lifetime Analysis Facts:\n";
-    llvm::dbgs() << "==========================================\n";
-    if (const Decl *D = AC.getDecl())
-      if (const auto *ND = dyn_cast<NamedDecl>(D))
-        llvm::dbgs() << "Function: " << ND->getQualifiedNameAsString() << "\n";
-    // Print blocks in the order as they appear in code for a stable ordering.
-    for (const CFGBlock *B : *AC.getAnalysis<PostOrderCFGView>()) {
-      llvm::dbgs() << "  Block B" << B->getBlockID() << ":\n";
-      auto It = BlockToFactsMap.find(B);
-      if (It != BlockToFactsMap.end()) {
-        for (const Fact *F : It->second) {
-          llvm::dbgs() << "    ";
-          F->dump(llvm::dbgs(), LoanMgr, OriginMgr);
-        }
-      }
-      llvm::dbgs() << "  End of Block\n";
-    }
-  }
+  void dump(const CFG &Cfg, AnalysisDeclContext &AC) const;
 
   LoanManager &getLoanMgr() { return LoanMgr; }
   const LoanManager &getLoanMgr() const { return LoanMgr; }
@@ -266,7 +216,6 @@ class FactManager {
       BlockToFactsMap;
   llvm::BumpPtrAllocator FactAllocator;
 };
-} // namespace internal
-} // namespace clang::lifetimes
+} // namespace clang::lifetimes::internal
 
 #endif // LLVM_CLANG_ANALYSIS_ANALYSES_LIFETIMESAFETY_FACTS_H

clang/include/clang/Analysis/Analyses/LifetimeSafety/FactsGenerator.h

@@ -22,8 +22,7 @@
 #include "clang/Analysis/CFG.h"
 #include "llvm/ADT/SmallVector.h"
 
-namespace clang::lifetimes {
-namespace internal {
+namespace clang::lifetimes::internal {
 
 class FactsGenerator : public ConstStmtVisitor<FactsGenerator> {
   using Base = ConstStmtVisitor<FactsGenerator>;
@@ -102,7 +101,6 @@ class FactsGenerator : public ConstStmtVisitor<FactsGenerator> {
   llvm::DenseMap<const DeclRefExpr *, UseFact *> UseFacts;
 };
 
-} // namespace internal
-} // namespace clang::lifetimes
+} // namespace clang::lifetimes::internal
 
 #endif // LLVM_CLANG_ANALYSIS_ANALYSES_LIFETIMESAFETY_FACTSGENERATOR_H

clang/include/clang/Analysis/Analyses/LifetimeSafety/LifetimeSafety.h

@@ -52,8 +52,19 @@ class LifetimeSafetyAnalysis {
 
   void run();
 
-  /// Returns the set of loans an origin holds at a specific program point.
-  LoanSet getLoansAtPoint(OriginID OID, ProgramPoint PP) const;
+  /// Returns the loan propagation analysis object.
+  /// \note This is intended for testing only.
+  LoanPropagationAnalysis &getLoanPropagationAnalysis() const {
+    assert(LoanPropagation && "Analysis has not been run.");
+    return *LoanPropagation;
+  }
+
+  /// Returns the live origin analysis object.
+  /// \note This is intended for testing only.
+  LiveOriginAnalysis &getLiveOriginAnalysis() const {
+    assert(LiveOrigins && "Analysis has not been run.");
+    return *LiveOrigins;
+  }
 
   /// Returns the set of origins that are live at a specific program point,
   /// along with the confidence level of their liveness.

clang/include/clang/Analysis/Analyses/LifetimeSafety/LiveOrigins.h

@@ -29,8 +29,7 @@
 #include "llvm/ADT/ImmutableMap.h"
 #include "llvm/Support/Debug.h"
 
-namespace clang::lifetimes {
-namespace internal {
+namespace clang::lifetimes::internal {
 
 using OriginSet = llvm::ImmutableSet<OriginID>;
 
@@ -132,7 +131,6 @@ class LiveOriginAnalysis
   FactManager &FactMgr;
   LivenessMap::Factory &Factory;
 };
-} // namespace internal
-} // namespace clang::lifetimes
+} // namespace clang::lifetimes::internal
 
 #endif // LLVM_CLANG_ANALYSIS_ANALYSES_LIFETIMESAFETY_LIVE_ORIGINS_H

clang/include/clang/Analysis/Analyses/LifetimeSafety/LoanPropagation.h

@@ -23,8 +23,7 @@
 #include "llvm/ADT/ImmutableSet.h"
 #include "llvm/Support/Debug.h"
 
-namespace clang::lifetimes {
-namespace internal {
+namespace clang::lifetimes::internal {
 
 // Using LLVM's immutable collections is efficient for dataflow analysis
 // as it avoids deep copies during state transitions.
@@ -91,7 +90,6 @@ class LoanPropagationAnalysis
     return LoanSetFactory.getEmptySet();
   }
 };
-} // namespace internal
-} // namespace clang::lifetimes
+} // namespace clang::lifetimes::internal
 
 #endif // LLVM_CLANG_ANALYSIS_ANALYSES_LIFETIMESAFETY_LOAN_PROPAGATION_H

clang/include/clang/Analysis/Analyses/LifetimeSafety/Loans.h

@@ -18,8 +18,7 @@
 #include "clang/Analysis/Analyses/LifetimeSafety/Utils.h"
 #include "llvm/Support/raw_ostream.h"
 
-namespace clang::lifetimes {
-namespace internal {
+namespace clang::lifetimes::internal {
 
 using LoanID = utils::ID<struct LoanTag>;
 inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, LoanID ID) {
@@ -49,10 +48,7 @@ struct Loan {
   Loan(LoanID id, AccessPath path, const Expr *IssueExpr)
       : ID(id), Path(path), IssueExpr(IssueExpr) {}
 
-  void dump(llvm::raw_ostream &OS) const {
-    OS << ID << " (Path: ";
-    OS << Path.D->getNameAsString() << ")";
-  }
+  void dump(llvm::raw_ostream &OS) const;
 };
 
 /// Manages the creation, storage and retrieval of loans.
@@ -79,7 +75,6 @@ class LoanManager {
   /// optimisation.
   llvm::SmallVector<Loan> AllLoans;
 };
-} // namespace internal
-} // namespace clang::lifetimes
+} // namespace clang::lifetimes::internal
 
 #endif // LLVM_CLANG_ANALYSIS_ANALYSES_LIFETIMESAFETY_LOANS_H

clang/include/clang/Analysis/Analyses/LifetimeSafety/Origins.h

@@ -18,8 +18,7 @@
 #include "clang/AST/Expr.h"
 #include "clang/Analysis/Analyses/LifetimeSafety/Utils.h"
 
-namespace clang::lifetimes {
-namespace internal {
+namespace clang::lifetimes::internal {
 
 using OriginID = utils::ID<struct OriginTag>;
 inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, OriginID ID) {
@@ -123,17 +122,7 @@ class OriginManager {
     return NewID;
   }
 
-  void dump(OriginID OID, llvm::raw_ostream &OS) const {
-    OS << OID << " (";
-    Origin O = getOrigin(OID);
-    if (const ValueDecl *VD = O.getDecl())
-      OS << "Decl: " << VD->getNameAsString();
-    else if (const Expr *E = O.getExpr())
-      OS << "Expr: " << E->getStmtClassName();
-    else
-      OS << "Unknown";
-    OS << ")";
-  }
+  void dump(OriginID OID, llvm::raw_ostream &OS) const;
 
 private:
   OriginID getNextOriginID() { return NextOriginID++; }
@@ -145,7 +134,6 @@ class OriginManager {
   llvm::DenseMap<const clang::ValueDecl *, OriginID> DeclToOriginID;
   llvm::DenseMap<const clang::Expr *, OriginID> ExprToOriginID;
 };
-} // namespace internal
-} // namespace clang::lifetimes
+} // namespace clang::lifetimes::internal
 
 #endif // LLVM_CLANG_ANALYSIS_ANALYSES_LIFETIMESAFETY_ORIGINS_H

clang/include/clang/Analysis/Analyses/LifetimeSafety/Utils.h

@@ -14,10 +14,7 @@
 #include "llvm/ADT/ImmutableMap.h"
 #include "llvm/ADT/ImmutableSet.h"
 
-namespace clang::lifetimes {
-namespace internal {
-
-namespace utils {
+namespace clang::lifetimes::internal::utils {
 
 /// A generic, type-safe wrapper for an ID, distinguished by its `Tag` type.
 /// Used for giving ID to loans and origins.
@@ -95,9 +92,7 @@ join(const llvm::ImmutableMap<K, V> &A, const llvm::ImmutableMap<K, V> &B,
   }
   return Res;
 }
-} // namespace utils
-} // namespace internal
-} // namespace clang::lifetimes
+} // namespace clang::lifetimes::internal::utils
 
 namespace llvm {
 template <typename Tag>