clean up code and prepare for Graph DB implementation

yuleisui · yuleisui · commit 1dbfe7f43326 · 2025-10-03T16:06:43.000+10:00
diff --git a/svf-llvm/tools/CFL/cfl.cpp b/svf-llvm/tools/CFL/cfl.cpp
@@ -47,12 +47,6 @@ int main(int argc, char ** argv)
                         argc, argv, "CFL Reachability Analysis", "[options] <input-bitcode...>"
                     );
 
-    // If the WriteAnder option is set to "ir_annotator", pre-processes the bytecodes of the modules
-    if (Options::WriteAnder() == "ir_annotator")
-    {
-        LLVMModuleSet::preProcessBCs(moduleNameVec);
-    }
-
     // Pointer to the SVF Intermediate Representation (IR) of the module
     SVFIR* svfir = nullptr;
 
diff --git a/svf-llvm/tools/DDA/dda.cpp b/svf-llvm/tools/DDA/dda.cpp
@@ -52,11 +52,6 @@ int main(int argc, char ** argv)
                         argc, argv, "Demand-Driven Points-to Analysis", "[options] <input-bitcode...>"
                     );
 
-    if (Options::WriteAnder() == "ir_annotator")
-    {
-        LLVMModuleSet::preProcessBCs(moduleNameVec);
-    }
-
     LLVMModuleSet::buildSVFModule(moduleNameVec);
     SVFIRBuilder builder;
     SVFIR* pag = builder.build();
diff --git a/svf-llvm/tools/Example/svf-ex.cpp b/svf-llvm/tools/Example/svf-ex.cpp
@@ -147,11 +147,6 @@ int main(int argc, char ** argv)
                         argc, argv, "Whole Program Points-to Analysis", "[options] <input-bitcode...>"
                     );
 
-    if (Options::WriteAnder() == "ir_annotator")
-    {
-        LLVMModuleSet::preProcessBCs(moduleNameVec);
-    }
-
     LLVMModuleSet::buildSVFModule(moduleNameVec);
 
     /// Build Program Assignment Graph (SVFIR)
diff --git a/svf-llvm/tools/LLVM2SVF/llvm2svf.cpp b/svf-llvm/tools/LLVM2SVF/llvm2svf.cpp
@@ -55,11 +55,6 @@ int main(int argc, char** argv)
     auto moduleNameVec = OptionBase::parseOptions(
                              argc, argv, "llvm2svf", "[options] <input-bitcode...>");
 
-    if (Options::WriteAnder() == "ir_annotator")
-    {
-        LLVMModuleSet::preProcessBCs(moduleNameVec);
-    }
-
     const std::string jsonPath = replaceExtension(moduleNameVec.front());
     // PAG is borrowed from a unique_ptr, so we don't need to delete it.
 
diff --git a/svf-llvm/tools/MTA/mta.cpp b/svf-llvm/tools/MTA/mta.cpp
@@ -38,11 +38,6 @@ int main(int argc, char ** argv)
                         argc, argv, "MTA Analysis", "[options] <input-bitcode...>"
                     );
 
-    if (Options::WriteAnder() == "ir_annotator")
-    {
-        LLVMModuleSet::preProcessBCs(moduleNameVec);
-    }
-
     LLVMModuleSet::buildSVFModule(moduleNameVec);
     SVFIRBuilder builder;
     SVFIR* pag = builder.build();
diff --git a/svf-llvm/tools/SABER/saber.cpp b/svf-llvm/tools/SABER/saber.cpp
@@ -47,11 +47,6 @@ int main(int argc, char ** argv)
                         argc, argv, "Source-Sink Bug Detector", "[options] <input-bitcode...>"
                     );
 
-    if (Options::WriteAnder() == "ir_annotator")
-    {
-        LLVMModuleSet::preProcessBCs(moduleNameVec);
-    }
-
     LLVMModuleSet::buildSVFModule(moduleNameVec);
     SVFIRBuilder builder;
     SVFIR* pag = builder.build();
diff --git a/svf-llvm/tools/WPA/wpa.cpp b/svf-llvm/tools/WPA/wpa.cpp
@@ -52,11 +52,6 @@ int main(int argc, char** argv)
     }
     else
     {
-        if (Options::WriteAnder() == "ir_annotator")
-        {
-            LLVMModuleSet::preProcessBCs(moduleNameVec);
-        }
-
         LLVMModuleSet::buildSVFModule(moduleNameVec);
 
         /// Build SVFIR
diff --git a/svf/include/Graphs/BasicBlockG.h b/svf/include/Graphs/BasicBlockG.h
@@ -44,10 +44,7 @@ class FunObjVar;
 typedef GenericEdge<SVFBasicBlock> GenericBasicBlockEdgeTy;
 class BasicBlockEdge: public GenericBasicBlockEdgeTy
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
-public:
 public:
     /// Constructor
     BasicBlockEdge(SVFBasicBlock* s, SVFBasicBlock* d) : GenericBasicBlockEdgeTy(s, d, 0)
@@ -73,8 +70,6 @@ typedef GenericNode<SVFBasicBlock, BasicBlockEdge> GenericBasicBlockNodeTy;
 class SVFBasicBlock : public GenericBasicBlockNodeTy
 {
     friend class LLVMModuleSet;
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
     friend class SVFIRBuilder;
     friend class FunObjVar;
     friend class ICFGBuilder;
diff --git a/svf/include/Graphs/CHG.h b/svf/include/Graphs/CHG.h
@@ -77,8 +77,6 @@ class CommonCHGraph
 typedef GenericEdge<CHNode> GenericCHEdgeTy;
 class CHEdge: public GenericCHEdgeTy
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     typedef enum
@@ -107,8 +105,6 @@ class CHEdge: public GenericCHEdgeTy
 typedef GenericNode<CHNode, CHEdge> GenericCHNodeTy;
 class CHNode: public GenericCHNodeTy
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     typedef enum
@@ -232,8 +228,6 @@ class CHNode: public GenericCHNodeTy
 typedef GenericGraph<CHNode, CHEdge> GenericCHGraphTy;
 class CHGraph: public CommonCHGraph, public GenericCHGraphTy
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
     friend class CHGBuilder;
 
 public:
diff --git a/svf/include/Graphs/GenericGraph.h b/svf/include/Graphs/GenericGraph.h
@@ -49,8 +49,6 @@ template <typename, typename> class GenericGraphReader;
 template<class NodeTy>
 class GenericEdge
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     /// Node type
@@ -142,8 +140,6 @@ class GenericEdge
 template<class NodeTy,class EdgeTy>
 class GenericNode: public SVFValue
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     typedef NodeTy NodeType;
@@ -340,8 +336,6 @@ class GenericNode: public SVFValue
 template<class NodeTy, class EdgeTy>
 class GenericGraph
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
     friend class GenericGraphWriter<NodeTy, EdgeTy>;
     friend class GenericGraphReader<NodeTy, EdgeTy>;
 
diff --git a/svf/include/Graphs/ICFG.h b/svf/include/Graphs/ICFG.h
@@ -47,8 +47,6 @@ typedef GenericGraph<ICFGNode,ICFGEdge> GenericICFGTy;
 class ICFG : public GenericICFGTy
 {
     friend class ICFGBuilder;
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
     friend class ICFGSimplification;
 
 public:
diff --git a/svf/include/Graphs/ICFGEdge.h b/svf/include/Graphs/ICFGEdge.h
@@ -43,8 +43,6 @@ class RetPE;
 typedef GenericEdge<ICFGNode> GenericICFGEdgeTy;
 class ICFGEdge : public GenericICFGEdgeTy
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     /// ten types of ICFG edge
@@ -112,8 +110,6 @@ class ICFGEdge : public GenericICFGEdgeTy
  */
 class IntraCFGEdge : public ICFGEdge
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
     friend class ICFG;
     friend class SVFIRBuilder;
 
@@ -181,8 +177,6 @@ class IntraCFGEdge : public ICFGEdge
  */
 class CallCFGEdge : public ICFGEdge
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     std::vector<const CallPE*> callPEs;
@@ -232,8 +226,6 @@ class CallCFGEdge : public ICFGEdge
  */
 class RetCFGEdge : public ICFGEdge
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     const RetPE* retPE;
diff --git a/svf/include/Graphs/ICFGNode.h b/svf/include/Graphs/ICFGNode.h
@@ -53,8 +53,6 @@ typedef GenericNode<ICFGNode, ICFGEdge> GenericICFGNodeTy;
 
 class ICFGNode : public GenericICFGNodeTy
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
 
@@ -194,14 +192,9 @@ class GlobalICFGNode : public ICFGNode
  */
 class IntraICFGNode : public ICFGNode
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 private:
     bool isRet;
 
-    /// Constructor to create empty IntraICFGNode (for SVFIRReader/deserialization)
-    IntraICFGNode(NodeID id) : ICFGNode(id, IntraBlock), isRet(false) {}
-
 public:
     IntraICFGNode(NodeID id, const SVFBasicBlock* b, bool isReturn) : ICFGNode(id, IntraBlock), isRet(isReturn)
     {
@@ -277,17 +270,12 @@ class InterICFGNode : public ICFGNode
  */
 class FunEntryICFGNode : public InterICFGNode
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     typedef std::vector<const SVFVar *> FormalParmNodeVec;
 private:
     FormalParmNodeVec FPNodes;
 
-    /// Constructor to create empty FunEntryICFGNode (for SVFIRReader/deserialization)
-    FunEntryICFGNode(NodeID id) : InterICFGNode(id, FunEntryBlock) {}
-
 public:
     FunEntryICFGNode(NodeID id, const FunObjVar* f);
 
@@ -347,15 +335,10 @@ class FunEntryICFGNode : public InterICFGNode
  */
 class FunExitICFGNode : public InterICFGNode
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     const SVFVar *formalRet;
 
-    /// Constructor to create empty FunExitICFGNode (for SVFIRReader/deserialization)
-    FunExitICFGNode(NodeID id) : InterICFGNode(id, FunExitBlock), formalRet{} {}
-
 public:
     FunExitICFGNode(NodeID id, const FunObjVar* f);
 
@@ -415,8 +398,6 @@ class FunExitICFGNode : public InterICFGNode
  */
 class CallICFGNode : public InterICFGNode
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     typedef std::vector<const ValVar *> ActualParmNodeVec;
@@ -431,9 +412,6 @@ class CallICFGNode : public InterICFGNode
     s32_t virtualFunIdx;            /// virtual function index of the virtual table(s) at a virtual call
     std::string funNameOfVcall;     /// the function name of this virtual call
 
-    /// Constructor to create empty CallICFGNode (for SVFIRReader/deserialization)
-    CallICFGNode(NodeID id) : InterICFGNode(id, FunCallBlock), ret{} {}
-
 public:
     CallICFGNode(NodeID id, const SVFBasicBlock* b, const SVFType* ty,
                  const FunObjVar* cf, bool iv, bool ivc, s32_t vfi,
@@ -591,19 +569,11 @@ class CallICFGNode : public InterICFGNode
  */
 class RetICFGNode : public InterICFGNode
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     const SVFVar *actualRet;
     const CallICFGNode* callBlockNode;
 
-    /// Constructor to create empty RetICFGNode (for SVFIRReader/deserialization)
-    RetICFGNode(NodeID id)
-        : InterICFGNode(id, FunRetBlock), actualRet{}, callBlockNode{}
-    {
-    }
-
 public:
     RetICFGNode(NodeID id, CallICFGNode* cb) :
         InterICFGNode(id, FunRetBlock), actualRet(nullptr), callBlockNode(cb)
diff --git a/svf/include/Graphs/IRGraph.h b/svf/include/Graphs/IRGraph.h
@@ -50,8 +50,6 @@ class ObjTypeInfo;
  */
 class IRGraph : public GenericGraph<SVFVar, SVFStmt>
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
     friend class SVFIRBuilder;
     friend class SymbolTableBuilder;
 
diff --git a/svf/include/MemoryModel/AccessPath.h b/svf/include/MemoryModel/AccessPath.h
@@ -51,8 +51,6 @@ class SVFVar;
 */
 class AccessPath
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     enum LSRelation
diff --git a/svf/include/MemoryModel/SVFLoop.h b/svf/include/MemoryModel/SVFLoop.h
@@ -37,8 +37,6 @@ namespace SVF
 
 class SVFLoop
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
     typedef Set<const ICFGEdge *> ICFGEdgeSet;
     typedef Set<const ICFGNode *> ICFGNodeSet;
diff --git a/svf/include/SVFIR/ObjTypeInfo.h b/svf/include/SVFIR/ObjTypeInfo.h
@@ -41,8 +41,6 @@ namespace SVF
  */
 class ObjTypeInfo
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
     friend class SymbolTableBuilder;
 
 public:
diff --git a/svf/include/SVFIR/SVFIR.h b/svf/include/SVFIR/SVFIR.h
@@ -45,8 +45,6 @@ class SVFIR : public IRGraph
     friend class ExternalPAG;
     friend class PAGBuilderFromFile;
     friend class TypeBasedHeapCloning;
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
     friend class BVDataPTAImpl;
 
 public:
diff --git a/svf/include/SVFIR/SVFStatements.h b/svf/include/SVFIR/SVFStatements.h
diff --git a/svf/include/SVFIR/SVFType.h b/svf/include/SVFIR/SVFType.h
diff --git a/svf/include/SVFIR/SVFVariables.h b/svf/include/SVFIR/SVFVariables.h
diff --git a/svf/include/Util/NodeIDAllocator.h b/svf/include/Util/NodeIDAllocator.h
diff --git a/svf/include/Util/SVFLoopAndDomInfo.h b/svf/include/Util/SVFLoopAndDomInfo.h
diff --git a/svf/include/Util/SparseBitVector.h b/svf/include/Util/SparseBitVector.h
diff --git a/svf/lib/Util/Options.cpp b/svf/lib/Util/Options.cpp

Original file line number	Diff line number	Diff line change
`@@ -52,11 +52,6 @@ int main(int argc, char** argv)`
`52`	`52`	`}`
`53`	`53`	`else`
`54`	`54`	`{`
`55`		`- if (Options::WriteAnder() == "ir_annotator")`
`56`		`- {`
`57`		`- LLVMModuleSet::preProcessBCs(moduleNameVec);`
`58`		`- }`
`59`		`-`
`60`	`55`	`LLVMModuleSet::buildSVFModule(moduleNameVec);`
`61`	`56`
`62`	`57`	`/// Build SVFIR`