From 6063730526f6f30578da72f49b5756ff07d9e75e Mon Sep 17 00:00:00 2001
From: Sriteja Kummita <sriteja.ku@gmail.com>
Date: Mon, 20 Nov 2023 13:11:09 +0100
Subject: [PATCH] fix: review feedback

---
 .../DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h |  8 ++++----
 .../phasar/PhasarLLVM/Utils/AnalysisPrinterBase.h    |  2 +-
 .../phasar/PhasarLLVM/Utils/DefaultAnalysisPrinter.h |  2 +-
 .../IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp    | 10 +++++-----
 .../DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.cpp  | 12 ++++++------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h
index 866c21774..19bdd525a 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h
@@ -530,9 +530,9 @@ class IDETypeStateAnalysis
                       llvm::dyn_cast<llvm::AllocaInst>(Res.first)) {
                 if (Res.second == TSD->error()) {
                   Warning<IDETypeStateAnalysisDomain<TypeStateDescriptionTy>>
-                      War(&I, Res.first, TSD->error());
+                      Warn(&I, Res.first, TSD->error());
                   // ERROR STATE DETECTED
-                  this->Printer->onResult(War);
+                  this->Printer->onResult(Warn);
                 }
               }
             }
@@ -542,9 +542,9 @@ class IDETypeStateAnalysis
                       llvm::dyn_cast<llvm::AllocaInst>(Res.first)) {
                 if (Res.second == TSD->error()) {
                   Warning<IDETypeStateAnalysisDomain<TypeStateDescriptionTy>>
-                      War(&I, Res.first, TSD->error());
+                      Warn(&I, Res.first, TSD->error());
                   // ERROR STATE DETECTED
-                  this->Printer->onResult(War);
+                  this->Printer->onResult(Warn);
                 }
               }
             }
diff --git a/include/phasar/PhasarLLVM/Utils/AnalysisPrinterBase.h b/include/phasar/PhasarLLVM/Utils/AnalysisPrinterBase.h
index 2e636396f..9190ead07 100644
--- a/include/phasar/PhasarLLVM/Utils/AnalysisPrinterBase.h
+++ b/include/phasar/PhasarLLVM/Utils/AnalysisPrinterBase.h
@@ -20,7 +20,7 @@ template <typename AnalysisDomainTy> struct Warning {
         LatticeElement(std::move(Lattice)) {}
 };
 
-template <typename AnalysisDomainTy> struct Results {
+template <typename AnalysisDomainTy> struct DataflowAnalysisResults {
   std::vector<Warning<AnalysisDomainTy>> War;
 };
 
diff --git a/include/phasar/PhasarLLVM/Utils/DefaultAnalysisPrinter.h b/include/phasar/PhasarLLVM/Utils/DefaultAnalysisPrinter.h
index a75f912ee..7cbdf476b 100644
--- a/include/phasar/PhasarLLVM/Utils/DefaultAnalysisPrinter.h
+++ b/include/phasar/PhasarLLVM/Utils/DefaultAnalysisPrinter.h
@@ -39,7 +39,7 @@ class DefaultAnalysisPrinter : public AnalysisPrinterBase<AnalysisDomainTy> {
   }
 
 private:
-  Results<AnalysisDomainTy> AnalysisResults{};
+  DataflowAnalysisResults<AnalysisDomainTy> AnalysisResults{};
 };
 
 } // namespace psr
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp
index d57bd1303..6759ed4b9 100644
--- a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp
@@ -227,9 +227,9 @@ void IDEExtendedTaintAnalysis::reportLeakIfNecessary(
     const llvm::Value *LeakCandidate) {
   if (isSink(SinkCandidate, Inst)) {
     Leaks[Inst].insert(LeakCandidate);
-    Warning<IDEExtendedTaintAnalysisDomain> War(
+    Warning<IDEExtendedTaintAnalysisDomain> Warn(
         Inst, makeFlowFact(LeakCandidate), Top{});
-    Printer->onResult(War);
+    Printer->onResult(Warn);
   }
 }
 
@@ -754,9 +754,9 @@ void IDEExtendedTaintAnalysis::emitTextReport(
 
   for (auto &[Inst, LeakSet] : Leaks) {
     for (const auto &Leak : LeakSet) {
-      Warning<IDEExtendedTaintAnalysisDomain> War(Inst, makeFlowFact(Leak),
-                                                  Top{});
-      Printer->onResult(War);
+      Warning<IDEExtendedTaintAnalysisDomain> Warn(Inst, makeFlowFact(Leak),
+                                                   Top{});
+      Printer->onResult(Warn);
     }
   }
 
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.cpp
index 18ff4434c..a6ee4458b 100644
--- a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.cpp
@@ -410,9 +410,9 @@ auto IFDSTaintAnalysis::getSummaryFlowFunction([[maybe_unused]] n_t CallSite,
                          CallSite](d_t Source) -> container_type {
         if (Leak.count(Source)) {
           if (Leaks[CallSite].insert(Source).second) {
-            Warning<LLVMIFDSAnalysisDomainDefault> War(CallSite, Source,
-                                                       topElement());
-            Printer->onResult(War);
+            Warning<LLVMIFDSAnalysisDomainDefault> Warn(CallSite, Source,
+                                                        topElement());
+            Printer->onResult(Warn);
           }
         }
 
@@ -439,9 +439,9 @@ auto IFDSTaintAnalysis::getSummaryFlowFunction([[maybe_unused]] n_t CallSite,
 
     if (Leak.count(Source)) {
       if (Leaks[CallSite].insert(Source).second) {
-        Warning<LLVMIFDSAnalysisDomainDefault> War(CallSite, Source,
-                                                   topElement());
-        Printer->onResult(War);
+        Warning<LLVMIFDSAnalysisDomainDefault> Warn(CallSite, Source,
+                                                    topElement());
+        Printer->onResult(Warn);
       }
     }