svf-lib 1.0.917 → 1.0.920

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

@@ -43,13 +43,13 @@ public:
 
     NodeBS _StrongUpdateStores;
 
-    void performStatPerQuery(NodeID ptr);
+    void performStatPerQuery(NodeID ptr) override;
 
-    void performStat();
+    void performStat() override;
 
-    void printStat();
+    void printStat(std::string str = "") override;
 
-    void printStatPerQuery(NodeID ptr, const PointsTo& pts);
+    void printStatPerQuery(NodeID ptr, const PointsTo& pts) override;
 
     void getNumOfOOBQuery();
 

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

@@ -347,16 +347,14 @@ class IntraMSSAPHISVFGNode : public MSSAPHISVFGNode
 {
 
 public:
-    const MRVer* resVer;
     /// Constructor
     IntraMSSAPHISVFGNode(NodeID id, const MRVer* resVer): MSSAPHISVFGNode(id, resVer, MIntraPhi)
     {
-        resVer = resVer; 
     }
 
-     inline const MRVer* getMRVer() const
+    inline const MRVer* getMRVer() const
     {
-        return resVer;
+        return getResVer();
     }
 
     inline OPVers::const_iterator opVerBegin() const

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

@@ -80,9 +80,9 @@ public:
     {
 
     }
-    virtual void performStat();
+    virtual void performStat() override;
 
-    virtual void printStat();
+    virtual void printStat(std::string str = "") override;
 
 private:
     MemSSA* mssa;
@@ -100,9 +100,9 @@ public:
 
     virtual ~SVFGStat() {}
 
-    virtual void performStat();
+    virtual void performStat() override;
 
-    virtual void printStat();
+    virtual void printStat(std::string str = "") override;
 
     virtual void performSCCStat(SVFGEdgeSet insensitiveCalRetEdges);
 
@@ -205,13 +205,13 @@ private:
 
     int avgInDegree;	///< average in degrees of SVFG nodes.
     int avgOutDegree;	///< average out degrees of SVFG nodes.
-    unsigned maxInDegree;	///< max in degrees of SVFG nodes.
-    unsigned maxOutDegree;	///< max out degrees of SVFG nodes.
+    u32_t maxInDegree;	///< max in degrees of SVFG nodes.
+    u32_t maxOutDegree;	///< max out degrees of SVFG nodes.
 
     int avgIndInDegree;	///< average indirect in degrees of SVFG nodes.
     int avgIndOutDegree;	///< average indirect out degrees of SVFG nodes.
-    int maxIndInDegree;	///< max indirect in degrees of SVFG nodes.
-    int maxIndOutDegree;	///< max indirect out degrees of SVFG nodes.
+    u32_t maxIndInDegree;	///< max indirect in degrees of SVFG nodes.
+    u32_t maxIndOutDegree;	///< max indirect out degrees of SVFG nodes.
 
     double addTopLevelNodeTimeStart;
     double addTopLevelNodeTimeEnd;

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

@@ -217,6 +217,7 @@ private:
     static FSMPTA* mfspta;
     MHP* mhp;
     LockAnalysis* lockana;
+    using FlowSensitive::initialize;
 };
 
 } // End namespace SVF

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

@@ -273,7 +273,7 @@ protected:
     {
         // Collect call sites of all RC_ACCESS function calls.
         std::vector<const CallInst*> csInsts;
-        const Function *F;
+        const Function *F = nullptr;
  		for(auto it = M->llvmFunBegin(); it != M->llvmFunEnd(); it++){
  			const std::string fName = (*it)->getName().str();
  			if(fName.find(RC_ACCESS) != std::string::npos) {

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

@@ -268,6 +268,12 @@ public:
                || ptd->getPTDTY() == PTDataTy::MutVersioned
                || ptd->getPTDTY() == PTDataTy::PersVersioned;
     }
+private:
+    using BasePTData::getPts;
+    using BasePTData::addPts;
+    using BasePTData::unionPts;
+    using BasePTData::clearPts;
+    using BasePTData::clearFullPts;
     ///@}
 };
 

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

@@ -257,11 +257,6 @@ public:
     /// Similar to getPts, this also needs to be implemented in child classes.
     virtual const NodeSet& getRevPts(NodeID nodeId) = 0;
 
-    /// Clear points-to data
-    virtual void clearPts()
-    {
-    }
-
     /// Print targets of a function pointer
     void printIndCSTargets(const CallICFGNode* cs, const FunctionSet& targets);
 

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

@@ -411,13 +411,13 @@ private:
     const Value *refVal;
     /// The unique id to represent this symbol
     SymID symId;
-public:
 
+public:
     /// Constructor
     MemObj(SymID id, ObjTypeInfo* ti, const Value *val = nullptr);
 
     /// Destructor
-    ~MemObj()
+    virtual ~MemObj()
     {
         destroy();
     }

package/SVF-linux/include/Util/IRAnnotator.h

@@ -85,7 +85,7 @@ private:
         {
             std::string label = it->getName().str();
             std::string toErase = "gepnode-";
-            SVF::s32_t pos = label.find(toErase);
+            std::size_t pos = label.find(toErase);
             if (pos == std::string::npos)
             {
                 continue;
@@ -128,7 +128,7 @@ private:
         {
             processBasicBlockNode(basicBlock, nodeId, writeFlag);
         }
-        else if (auto constant = const_cast<Constant *>(SVFUtil::dyn_cast<Constant>(value)))
+        else if (SVFUtil::isa<Constant>(value))
         {
             processConstantNode(nodeId, writeFlag);
         }

package/SVF-linux/include/WPA/Andersen.h

@@ -534,7 +534,7 @@ protected:
     // Solve constraints of each nodes
     virtual void handleCopyGep(ConstraintNode* node);
     // Collapse nodes and fields based on 'lcdCandidates'
-    virtual void mergeSCC();
+    void mergeSCC();
     // AndersenLCD specified SCC detector, need to input a nodeStack 'lcdCandidate'
     NodeStack& SCCDetect();
     bool mergeSrcToTgt(NodeID nodeId, NodeID newRepId);

package/SVF-linux/include/WPA/AndersenSFR.h

@@ -150,7 +150,7 @@ protected:
     void initialize();
     void PWCDetect();
     void fieldExpand(NodeSet& initials, s32_t offset, NodeBS& strides, PointsTo& expandPts);
-    bool processGepPts(PointsTo& pts, const GepCGEdge* edge);
+    bool processGepPts(const PointsTo& pts, const GepCGEdge* edge);
     bool mergeSrcToTgt(NodeID nodeId, NodeID newRepId);
 
 };

package/SVF-osx/include/DDA/DDAStat.h

@@ -43,13 +43,13 @@ public:
 
     NodeBS _StrongUpdateStores;
 
-    void performStatPerQuery(NodeID ptr);
+    void performStatPerQuery(NodeID ptr) override;
 
-    void performStat();
+    void performStat() override;
 
-    void printStat();
+    void printStat(std::string str = "") override;
 
-    void printStatPerQuery(NodeID ptr, const PointsTo& pts);
+    void printStatPerQuery(NodeID ptr, const PointsTo& pts) override;
 
     void getNumOfOOBQuery();
 

package/SVF-osx/include/Graphs/SVFGNode.h

@@ -347,16 +347,14 @@ class IntraMSSAPHISVFGNode : public MSSAPHISVFGNode
 {
 
 public:
-    const MRVer* resVer;
     /// Constructor
     IntraMSSAPHISVFGNode(NodeID id, const MRVer* resVer): MSSAPHISVFGNode(id, resVer, MIntraPhi)
     {
-        resVer = resVer; 
     }
 
-     inline const MRVer* getMRVer() const
+    inline const MRVer* getMRVer() const
     {
-        return resVer;
+        return getResVer();
     }
 
     inline OPVers::const_iterator opVerBegin() const

package/SVF-osx/include/Graphs/SVFGStat.h

@@ -80,9 +80,9 @@ public:
     {
 
     }
-    virtual void performStat();
+    virtual void performStat() override;
 
-    virtual void printStat();
+    virtual void printStat(std::string str = "") override;
 
 private:
     MemSSA* mssa;
@@ -100,9 +100,9 @@ public:
 
     virtual ~SVFGStat() {}
 
-    virtual void performStat();
+    virtual void performStat() override;
 
-    virtual void printStat();
+    virtual void printStat(std::string str = "") override;
 
     virtual void performSCCStat(SVFGEdgeSet insensitiveCalRetEdges);
 
@@ -205,13 +205,13 @@ private:
 
     int avgInDegree;	///< average in degrees of SVFG nodes.
     int avgOutDegree;	///< average out degrees of SVFG nodes.
-    unsigned maxInDegree;	///< max in degrees of SVFG nodes.
-    unsigned maxOutDegree;	///< max out degrees of SVFG nodes.
+    u32_t maxInDegree;	///< max in degrees of SVFG nodes.
+    u32_t maxOutDegree;	///< max out degrees of SVFG nodes.
 
     int avgIndInDegree;	///< average indirect in degrees of SVFG nodes.
     int avgIndOutDegree;	///< average indirect out degrees of SVFG nodes.
-    int maxIndInDegree;	///< max indirect in degrees of SVFG nodes.
-    int maxIndOutDegree;	///< max indirect out degrees of SVFG nodes.
+    u32_t maxIndInDegree;	///< max indirect in degrees of SVFG nodes.
+    u32_t maxIndOutDegree;	///< max indirect out degrees of SVFG nodes.
 
     double addTopLevelNodeTimeStart;
     double addTopLevelNodeTimeEnd;

package/SVF-osx/include/MTA/FSMPTA.h

@@ -217,6 +217,7 @@ private:
     static FSMPTA* mfspta;
     MHP* mhp;
     LockAnalysis* lockana;
+    using FlowSensitive::initialize;
 };
 
 } // End namespace SVF

package/SVF-osx/include/MTA/MTAResultValidator.h

@@ -273,7 +273,7 @@ protected:
     {
         // Collect call sites of all RC_ACCESS function calls.
         std::vector<const CallInst*> csInsts;
-        const Function *F;
+        const Function *F = nullptr;
  		for(auto it = M->llvmFunBegin(); it != M->llvmFunEnd(); it++){
  			const std::string fName = (*it)->getName().str();
  			if(fName.find(RC_ACCESS) != std::string::npos) {

package/SVF-osx/include/MemoryModel/AbstractPointsToDS.h

@@ -268,6 +268,12 @@ public:
                || ptd->getPTDTY() == PTDataTy::MutVersioned
                || ptd->getPTDTY() == PTDataTy::PersVersioned;
     }
+private:
+    using BasePTData::getPts;
+    using BasePTData::addPts;
+    using BasePTData::unionPts;
+    using BasePTData::clearPts;
+    using BasePTData::clearFullPts;
     ///@}
 };
 

package/SVF-osx/include/MemoryModel/PointerAnalysis.h

@@ -257,11 +257,6 @@ public:
     /// Similar to getPts, this also needs to be implemented in child classes.
     virtual const NodeSet& getRevPts(NodeID nodeId) = 0;
 
-    /// Clear points-to data
-    virtual void clearPts()
-    {
-    }
-
     /// Print targets of a function pointer
     void printIndCSTargets(const CallICFGNode* cs, const FunctionSet& targets);
 

package/SVF-osx/include/MemoryModel/SymbolTableInfo.h

@@ -411,13 +411,13 @@ private:
     const Value *refVal;
     /// The unique id to represent this symbol
     SymID symId;
-public:
 
+public:
     /// Constructor
     MemObj(SymID id, ObjTypeInfo* ti, const Value *val = nullptr);
 
     /// Destructor
-    ~MemObj()
+    virtual ~MemObj()
     {
         destroy();
     }

package/SVF-osx/include/Util/IRAnnotator.h

@@ -85,7 +85,7 @@ private:
         {
             std::string label = it->getName().str();
             std::string toErase = "gepnode-";
-            SVF::s32_t pos = label.find(toErase);
+            std::size_t pos = label.find(toErase);
             if (pos == std::string::npos)
             {
                 continue;
@@ -128,7 +128,7 @@ private:
         {
             processBasicBlockNode(basicBlock, nodeId, writeFlag);
         }
-        else if (auto constant = const_cast<Constant *>(SVFUtil::dyn_cast<Constant>(value)))
+        else if (SVFUtil::isa<Constant>(value))
         {
             processConstantNode(nodeId, writeFlag);
         }

package/SVF-osx/include/WPA/Andersen.h

@@ -534,7 +534,7 @@ protected:
     // Solve constraints of each nodes
     virtual void handleCopyGep(ConstraintNode* node);
     // Collapse nodes and fields based on 'lcdCandidates'
-    virtual void mergeSCC();
+    void mergeSCC();
     // AndersenLCD specified SCC detector, need to input a nodeStack 'lcdCandidate'
     NodeStack& SCCDetect();
     bool mergeSrcToTgt(NodeID nodeId, NodeID newRepId);

package/SVF-osx/include/WPA/AndersenSFR.h

@@ -150,7 +150,7 @@ protected:
     void initialize();
     void PWCDetect();
     void fieldExpand(NodeSet& initials, s32_t offset, NodeBS& strides, PointsTo& expandPts);
-    bool processGepPts(PointsTo& pts, const GepCGEdge* edge);
+    bool processGepPts(const PointsTo& pts, const GepCGEdge* edge);
     bool mergeSrcToTgt(NodeID nodeId, NodeID newRepId);
 
 };

package/package.json

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