svf-lib 1.0.1268 → 1.0.1270

package/SVF-linux/include/Graphs/ICFG.h

@@ -209,6 +209,11 @@ public:
     {
         return globalBlockNode;
     }
+    inline void addGlobalICFGNode()
+    {
+        globalBlockNode = new GlobalICFGNode(totalICFGNode++);
+        addICFGNode(globalBlockNode);
+    }
     //@}
 
 private:

package/SVF-linux/include/MemoryModel/SVFIR.h

@@ -92,7 +92,7 @@ private:
     OrderedNodeSet candidatePointers;
     ICFG* icfg; // ICFG
     CallSiteSet callSiteSet; /// all the callsites of a program
-
+    SVFModule* svfModule; /// SVF Module
     /// Constructor
     SVFIR(bool buildFromFile);
 
@@ -128,9 +128,14 @@ public:
     {
         return GepObjVarMap;
     }
-    /// Return ICFG
+    /// Set/Get ICFG
+    inline void setICFG(ICFG* i)
+    {
+        icfg = i;
+    }
     inline ICFG* getICFG()
     {
+        assert(icfg->totalICFGNode>0 && "empty ICFG! Build SVF IR first!");
         return icfg;
     }
     /// Return valid pointers
@@ -151,10 +156,15 @@ public:
     /// Whether to handle blackhole edge
     static void handleBlackHole(bool b);
     //@}
-    /// Get LLVM Module
+    /// Set/Get LLVM Module
+    inline void setModule(SVFModule* mod)
+    {
+        svfModule = mod;
+    }
     inline SVFModule* getModule()
     {
-        return SymbolTableInfo::SymbolInfo()->getModule();
+        assert(svfModule && "empty SVFModule! Build SVF IR first!");
+        return svfModule;
     }
     /// Get/set methods to get SVFStmts based on their kinds and ICFGNodes
     //@{

package/SVF-linux/include/SVF-FE/SVFIRBuilder.h

@@ -47,13 +47,13 @@ class SVFIRBuilder: public llvm::InstVisitor<SVFIRBuilder>
 
 private:
     SVFIR* pag;
-    SVFModule* svfMod;
+    SVFModule* svfModule;
     const BasicBlock* curBB;	///< Current basic block during SVFIR construction when visiting the module
     const Value* curVal;	///< Current Value during SVFIR construction when visiting the module
 
 public:
     /// Constructor
-    SVFIRBuilder(): pag(SVFIR::getPAG()), svfMod(nullptr), curBB(nullptr),curVal(nullptr)
+    SVFIRBuilder(SVFModule* mod): pag(SVFIR::getPAG()), svfModule(mod), curBB(nullptr),curVal(nullptr)
     {
     }
     /// Destructor
@@ -62,7 +62,7 @@ public:
     }
 
     /// Start building SVFIR here
-    virtual SVFIR* build(SVFModule* svfModule);
+    virtual SVFIR* build();
 
     /// Return SVFIR
     SVFIR* getPAG() const

package/SVF-osx/include/CFL/CFLBase.h

@@ -79,6 +79,9 @@ public:
     /// Solving CFL Reachability
     virtual void solve();
 
+    /// Finalize extra stat info passing
+    virtual void finalize();
+
     /// Perform analyze (main part of CFLR Analysis)
     virtual void analyze();
 
@@ -95,7 +98,7 @@ public:
     static double numOfStartEdges;                  // Number of start nonterminal labeled edges
     // Solver
     static double numOfIteration;                   // Number solving Iteration
-    static double numOfChecks;                      // Number of checks
+    static double numOfChecks;                  // Number of checks
     static double timeOfSolving;                    // time of solving CFL Reachability
     //@}
 

package/SVF-osx/include/CFL/CFLGrammar.txt

@@ -6,10 +6,10 @@ Productions:
    F -> epsilon | F copy | addr Memflow | F store V load | store Memflow load;
    Fbar -> epsilon | copybar Fbar | Memflowbar addrbar | loadbar V storebar Fbar | loadbar Memflowbar storebar;
    V -> Fbar V F | addrbar addr | gepbar_i V gep_i | gepbarpath V gep_0 | gepbar_i F gep_i | gepbar_i Fbar gep_i;
-   copy -> vgep； 
+   copy -> vgep;
    copybar -> vgepbar;
    gep_1 -> gep_0 F vgep | gep_0 F gep_1;
    gepbar_1 -> gepbar_1 Fbar gepbar_0 | vgepbar Fbar gepbar_0;
    gepbarpath -> gepbar_0 gepbar_0 | gepbarpath gepbar_0;
-   Memflow -> load store | Fbar Memflow | F Memflow Fbar | gep_i Memflow gepbar_i | gepbar_i Memflow gep_i;;
+   Memflow -> load store | Fbar Memflow | F Memflow Fbar | gep_i Memflow gepbar_i | gepbar_i Memflow gep_i;
    Memflowbar -> storebar loadbar | Memflowbar F | F Memflowbar Fbar | gep_i Memflowbar gepbar_i | gepbar_i Memflowbar gep_i;

package/SVF-osx/include/Util/ExtAPI.json

@@ -5689,8 +5689,8 @@
 		}
     },
     "_ZNSt5arrayIPK1ALm2EE4backEv":{
-        "return":  "void",
-        "arguments":  "()",
+        "return":  "%class.A** ",
+        "arguments":  "(%struct.std::array *)",
         "type": "CPP_EFT_DYNAMIC_CAST",
         "overwrite_app_function": 1,
         "GepStmt1": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-lib",
-  "version": "1.0.1268",
+  "version": "1.0.1270",
   "description": "SVF's npm support",
   "main": "index.js",
   "scripts": {