svf-lib 1.0.1328 → 1.0.1330

package/SVF-linux/include/DDA/DDAPass.h

@@ -89,7 +89,7 @@ private:
     void collectCxtInsenEdgeForRecur(PointerAnalysis* pta, const SVFG* svfg,SVFGEdgeSet& insensitveEdges);
     void collectCxtInsenEdgeForVFCycle(PointerAnalysis* pta, const SVFG* svfg,const SVFGSCC* svfgSCC, SVFGEdgeSet& insensitveEdges);
 
-    PointerAnalysis* _pta;	///<  pointer analysis to be executed.
+    std::unique_ptr<PointerAnalysis> _pta;	///<  pointer analysis to be executed.
     DDAClient* _client;		///<  DDA client used
 
 };

package/SVF-linux/include/DDA/FlowDDA.h

@@ -158,7 +158,7 @@ public:
     //@}
 
     /// Union pts
-    virtual bool unionDDAPts(LocDPItem dpm, const PointsTo& targetPts) override
+    bool unionDDAPts(LocDPItem dpm, const PointsTo& targetPts) override
     {
         if (isTopLevelPtrStmt(dpm.getLoc())) return unionPts(dpm.getCurNodeID(), targetPts);
         else return dpmToADCPtSetMap[dpm] |= targetPts;

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

@@ -81,7 +81,7 @@ public:
     ICFG();
 
     /// Destructor
-    virtual ~ICFG();
+    ~ICFG() override;
 
     /// Get a ICFG node
     inline ICFGNode* getICFGNode(NodeID id) const

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

@@ -102,14 +102,14 @@ protected:
     FunctionToFormalINsMapTy funToFormalINMap;
     FunctionToFormalOUTsMapTy funToFormalOUTMap;
     SVFGStat * stat;
-    MemSSA* mssa;
+    std::unique_ptr<MemSSA> mssa;
     PointerAnalysis* pta;
 
     /// Clean up memory
     void destroy();
 
     /// Constructor
-    SVFG(MemSSA* mssa, VFGK k);
+    SVFG(std::unique_ptr<MemSSA> mssa, VFGK k);
 
     /// Start building SVFG
     virtual void buildSVFG();
@@ -130,14 +130,13 @@ public:
     /// Clear MSSA
     inline void clearMSSA()
     {
-        delete mssa;
         mssa = nullptr;
     }
 
     /// Get SVFG memory SSA
     inline MemSSA* getMSSA() const
     {
-        return mssa;
+        return mssa.get();
     }
 
     /// Get Pointer Analysis

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

@@ -61,12 +61,12 @@ class SVFGOPT : public SVFG
 
 public:
     /// Constructor
-    SVFGOPT(MemSSA* _mssa, VFGK kind) : SVFG(_mssa, kind)
+    SVFGOPT(std::unique_ptr<MemSSA> mssa, VFGK kind) : SVFG(std::move(mssa), kind)
     {
         keepAllSelfCycle = keepContextSelfCycle = keepActualOutFormalIn = false;
     }
     /// Destructor
-    virtual ~SVFGOPT() {}
+    ~SVFGOPT() override = default;
 
     inline void setTokeepActualOutFormalIn()
     {
@@ -82,11 +82,11 @@ public:
     }
 
 protected:
-    virtual void buildSVFG();
+    void buildSVFG() override;
 
     /// Connect SVFG nodes between caller and callee for indirect call sites
     //@{
-    virtual inline void connectAParamAndFParam(const PAGNode* cs_arg, const PAGNode* fun_arg, const CallICFGNode*, CallSiteID csId, SVFGEdgeSetTy& edges)
+    inline void connectAParamAndFParam(const PAGNode* cs_arg, const PAGNode* fun_arg, const CallICFGNode*, CallSiteID csId, SVFGEdgeSetTy& edges) override
     {
         NodeID phiId = getDef(fun_arg);
         SVFGEdge* edge = addCallEdge(getDef(cs_arg), phiId, csId);
@@ -98,7 +98,7 @@ protected:
         }
     }
     /// Connect formal-ret and actual ret
-    virtual inline void connectFRetAndARet(const PAGNode* fun_ret, const PAGNode* cs_ret, CallSiteID csId, SVFGEdgeSetTy& edges)
+    inline void connectFRetAndARet(const PAGNode* fun_ret, const PAGNode* cs_ret, CallSiteID csId, SVFGEdgeSetTy& edges) override
     {
         NodeID phiId = getDef(cs_ret);
         NodeID retdef = getDef(fun_ret);
@@ -117,7 +117,7 @@ protected:
         }
     }
     /// Connect actual-in and formal-in
-    virtual inline void connectAInAndFIn(const ActualINSVFGNode* actualIn, const FormalINSVFGNode* formalIn, CallSiteID csId, SVFGEdgeSetTy& edges)
+    inline void connectAInAndFIn(const ActualINSVFGNode* actualIn, const FormalINSVFGNode* formalIn, CallSiteID csId, SVFGEdgeSetTy& edges) override
     {
         NodeBS intersection = actualIn->getPointsTo();
         intersection &= formalIn->getPointsTo();
@@ -130,7 +130,7 @@ protected:
         }
     }
     /// Connect formal-out and actual-out
-    virtual inline void connectFOutAndAOut(const FormalOUTSVFGNode* formalOut, const ActualOUTSVFGNode* actualOut, CallSiteID csId, SVFGEdgeSetTy& edges)
+    inline void connectFOutAndAOut(const FormalOUTSVFGNode* formalOut, const ActualOUTSVFGNode* actualOut, CallSiteID csId, SVFGEdgeSetTy& edges) override
     {
         NodeBS intersection = formalOut->getPointsTo();
         intersection &= actualOut->getPointsTo();

package/SVF-linux/include/MSSA/MemSSA.h

@@ -154,6 +154,8 @@ private:
     MRSet varKills;
     //@}
 
+    std::vector<std::unique_ptr<MRVer>> usedMRVers;
+
     /// Release the memory
     void destroy();
 

package/SVF-linux/include/MSSA/SVFGBuilder.h

@@ -49,27 +49,18 @@ public:
     typedef SVFG::SVFGEdgeSetTy SVFGEdgeSet;
 
     /// Constructor
-    SVFGBuilder(bool _SVFGWithIndCall = false): svfg(nullptr), SVFGWithIndCall(_SVFGWithIndCall) {}
+    explicit SVFGBuilder(bool _SVFGWithIndCall = false): svfg(nullptr), SVFGWithIndCall(_SVFGWithIndCall) {}
 
     /// Destructor
-    virtual ~SVFGBuilder() {}
-
-    static SVFG* globalSvfg;
+    virtual ~SVFGBuilder() = default;
 
     SVFG* buildPTROnlySVFG(BVDataPTAImpl* pta);
     SVFG* buildFullSVFG(BVDataPTAImpl* pta);
 
-    /// Clean up
-    static void releaseSVFG()
-    {
-        if (globalSvfg)
-            delete globalSvfg;
-        globalSvfg = nullptr;
-    }
     /// Get SVFG instance
     inline SVFG* getSVFG() const
     {
-        return svfg;
+        return svfg.get();
     }
 
     /// Mark feasible VF edge by removing it from set vfEdgesAtIndCallSite
@@ -85,7 +76,7 @@ public:
     }
 
     /// Build Memory SSA
-    virtual MemSSA* buildMSSA(BVDataPTAImpl* pta, bool ptrOnlyMSSA);
+    virtual std::unique_ptr<MemSSA> buildMSSA(BVDataPTAImpl* pta, bool ptrOnlyMSSA);
 
 protected:
     /// Create a DDA SVFG. By default actualOut and FormalIN are removed, unless withAOFI is set true.
@@ -97,7 +88,7 @@ protected:
 
     /// SVFG Edges connected at indirect call/ret sites
     SVFGEdgeSet vfEdgesAtIndCallSite;
-    SVFG* svfg;
+    std::unique_ptr<SVFG> svfg;
     /// SVFG with precomputed indirect call edges
     bool SVFGWithIndCall;
 };

package/SVF-linux/include/MTA/MTA.h

@@ -89,8 +89,8 @@ public:
     }
 private:
     ThreadCallGraph* tcg;
-    TCT* tct;
-    MTAStat* stat;
+    std::unique_ptr<TCT> tct;
+    std::unique_ptr<MTAStat> stat;
     MHP* mhp;
     LockAnalysis* lsa;
 };

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

@@ -234,16 +234,16 @@ public:
     typedef typename MutablePTData<Key, KeySet, Data, DataSet>::PtsMap PtsMap;
 
     /// Constructor
-    MutableDiffPTData(bool reversePT = true, PTDataTy ty = PTDataTy::Diff) : BaseDiffPTData(reversePT, ty), mutPTData(reversePT) { }
+    explicit MutableDiffPTData(bool reversePT = true, PTDataTy ty = PTDataTy::Diff) : BaseDiffPTData(reversePT, ty), mutPTData(reversePT) { }
 
-    virtual ~MutableDiffPTData() { }
+    ~MutableDiffPTData() override = default;
 
     virtual inline const PtsMap& getPtsMap() const
     {
         return mutPTData.getPtsMap();
     }
 
-    virtual inline void clear() override
+    inline void clear() override
     {
         mutPTData.clear();
     }

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

@@ -44,7 +44,7 @@ public:
 public:
     PersistentPointsToCache(void) : idCounter(1)
     {
-        idToPts.push_back(new Data());
+        idToPts.push_back(std::make_unique<Data>());
         ptsToId[Data()] = emptyPointsToId();
 
         initStats();
@@ -53,7 +53,6 @@ public:
     /// Clear the cache.
     void clear()
     {
-        for (const Data *d : idToPts) delete d;
         idToPts.clear();
         ptsToId.clear();
 
@@ -69,7 +68,7 @@ public:
 
         // Put the empty data back in.
         ptsToId[Data()] = emptyPointsToId();
-        idToPts.push_back(new Data());
+        idToPts.push_back(std::make_unique<Data>());
 
         idCounter = 1;
         // Cache is empty...
@@ -79,7 +78,7 @@ public:
     /// Remaps all points-to sets stored in the cache to the current mapping.
     void remapAllPts(void)
     {
-        for (Data *d : idToPts) d->checkAndRemap();
+        for (auto &d : idToPts) d->checkAndRemap();
 
         // Rebuild ptsToId from idToPts.
         ptsToId.clear();
@@ -96,7 +95,7 @@ public:
 
         // Otherwise, insert it.
         PointsToID id = newPointsToId();
-        idToPts.push_back(new Data(pts));
+        idToPts.push_back(std::make_unique<Data>(pts));
         ptsToId[pts] = id;
 
         return id;
@@ -345,7 +344,7 @@ public:
     Map<Data, unsigned> getAllPts(void)
     {
         Map<Data, unsigned> allPts;
-        for (const Data *d : idToPts) allPts[*d] = 1;
+        for (const auto &d : idToPts) allPts[*d] = 1;
         return allPts;
     }
 
@@ -389,7 +388,7 @@ private:
         else
         {
             resultId = newPointsToId();
-            idToPts.push_back(new Data(result));
+            idToPts.push_back(std::make_unique<Data>(result));
             ptsToId[result] = resultId;
         }
 
@@ -426,7 +425,7 @@ private:
     /// Elements are only added through push_back, so the number of elements
     /// stored is the size of the vector.
     /// Not const so we can remap.
-    std::vector<Data *> idToPts;
+    std::vector<std::unique_ptr<Data>> idToPts;
     /// Maps points-to sets to their corresponding ID.
     PTSToIDMap ptsToId;