svf-lib 1.0.1132 → 1.0.1135

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

@@ -64,13 +64,9 @@ public:
         // Whole program analysis
         Andersen_BASE,		///< Base Andersen PTA
         Andersen_WPA,		///< Andersen PTA
-        AndersenLCD_WPA,	///< Lazy cycle detection andersen-style WPA
-        AndersenHCD_WPA,    ///< Hybird cycle detection andersen-style WPA
-        AndersenHLCD_WPA,   ///< Hybird lazy cycle detection andersen-style WPA
         AndersenSCD_WPA,    ///< Selective cycle detection andersen-style WPA
         AndersenSFR_WPA,    ///< Stride-based field representation
         AndersenWaveDiff_WPA,	///< Diff wave propagation andersen-style WPA
-        AndersenWaveDiffWithType_WPA,	///< Diff wave propagation with type info andersen-style WPA
         Steensgaard_WPA,      ///< Steensgaard PTA
         CSCallString_WPA,	///< Call string based context sensitive WPA
         CSSummary_WPA,		///< Summary based context sensitive WPA

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

@@ -35,7 +35,6 @@
 #include "WPA/WPASolver.h"
 #include "MemoryModel/SVFIR.h"
 #include "Graphs/ConsG.h"
-#include "Graphs/OfflineConsG.h"
 
 namespace SVF
 {
@@ -86,11 +85,7 @@ public:
     {
         return ( pta->getAnalysisTy() == Andersen_BASE
                  || pta->getAnalysisTy() == Andersen_WPA
-                 || pta->getAnalysisTy() == AndersenLCD_WPA
-                 || pta->getAnalysisTy() == AndersenHCD_WPA
-                 || pta->getAnalysisTy() == AndersenHLCD_WPA
                  || pta->getAnalysisTy() == AndersenWaveDiff_WPA
-                 || pta->getAnalysisTy() == AndersenWaveDiffWithType_WPA
                  || pta->getAnalysisTy() == AndersenSCD_WPA
                  || pta->getAnalysisTy() == AndersenSFR_WPA
                  || pta->getAnalysisTy() == TypeCPP_WPA
@@ -190,11 +185,7 @@ public:
     static inline bool classof(const PointerAnalysis *pta)
     {
         return (pta->getAnalysisTy() == Andersen_WPA
-                || pta->getAnalysisTy() == AndersenLCD_WPA
-                || pta->getAnalysisTy() == AndersenHCD_WPA
-                || pta->getAnalysisTy() == AndersenHLCD_WPA
                 || pta->getAnalysisTy() == AndersenWaveDiff_WPA
-                || pta->getAnalysisTy() == AndersenWaveDiffWithType_WPA
                 || pta->getAnalysisTy() == AndersenSCD_WPA
                 || pta->getAnalysisTy() == AndersenSFR_WPA);
     }
@@ -454,217 +445,6 @@ protected:
     virtual void mergeNodeToRep(NodeID nodeId,NodeID newRepId);
 };
 
-
-/*
- * Lazy Cycle Detection Based Andersen Analysis
- */
-class AndersenLCD : virtual public Andersen
-{
-
-private:
-    static AndersenLCD* lcdAndersen;
-    EdgeSet metEdges;
-    NodeSet lcdCandidates;
-
-public:
-    AndersenLCD(SVFIR* _pag, PTATY type = AndersenLCD_WPA) :
-        Andersen(_pag, type), metEdges({}), lcdCandidates( {})
-    {
-    }
-
-    /// Create an singleton instance directly instead of invoking llvm pass manager
-    static AndersenLCD* createAndersenLCD(SVFIR* _pag)
-    {
-        if (lcdAndersen == nullptr)
-        {
-            lcdAndersen = new AndersenLCD(_pag);
-            lcdAndersen->analyze();
-            return lcdAndersen;
-        }
-        return lcdAndersen;
-    }
-
-    static void releaseAndersenLCD()
-    {
-        if (lcdAndersen)
-            delete lcdAndersen;
-        lcdAndersen = nullptr;
-    }
-
-protected:
-    // 'lcdCandidates' is used to collect nodes need to be visited by SCC detector
-    //@{
-    inline bool hasLCDCandidate () const
-    {
-        return !lcdCandidates.empty();
-    };
-    inline void cleanLCDCandidate()
-    {
-        lcdCandidates.clear();
-    };
-    inline void addLCDCandidate(NodeID nodeId)
-    {
-        lcdCandidates.insert(nodeId);
-    };
-    //@}
-
-    // 'metEdges' is used to collect edges met by AndersenLCD, to avoid redundant visit
-    //@{
-    bool isMetEdge (ConstraintEdge* edge) const
-    {
-        EdgeSet::const_iterator it = metEdges.find(edge->getEdgeID());
-        return it != metEdges.end();
-    };
-    void addMetEdge(ConstraintEdge* edge)
-    {
-        metEdges.insert(edge->getEdgeID());
-    };
-    //@}
-
-    //AndersenLCD worklist processer
-    void solveWorklist();
-    // Solve constraints of each nodes
-    virtual void handleCopyGep(ConstraintNode* node);
-    // Collapse nodes and fields based on 'lcdCandidates'
-    void mergeSCC();
-    // AndersenLCD specified SCC detector, need to input a nodeStack 'lcdCandidate'
-    NodeStack& SCCDetect();
-    bool mergeSrcToTgt(NodeID nodeId, NodeID newRepId);
-};
-
-
-
-/*!
- * Hybrid Cycle Detection Based Andersen Analysis
- */
-class AndersenHCD : virtual public Andersen
-{
-
-public:
-    typedef SCCDetection<OfflineConsG*> OSCC;
-
-private:
-    static AndersenHCD* hcdAndersen;
-    NodeSet mergedNodes;
-    OfflineConsG* oCG;
-
-public:
-    AndersenHCD(SVFIR* _pag, PTATY type = AndersenHCD_WPA) :
-        Andersen(_pag, type), oCG(nullptr)
-    {
-    }
-
-    /// Create an singleton instance directly instead of invoking llvm pass manager
-    static AndersenHCD *createAndersenHCD(SVFIR* _pag)
-    {
-        if (hcdAndersen == nullptr)
-        {
-            hcdAndersen = new AndersenHCD(_pag);
-            hcdAndersen->analyze();
-            return hcdAndersen;
-        }
-        return hcdAndersen;
-    }
-
-    static void releaseAndersenHCD()
-    {
-        if (hcdAndersen)
-            delete hcdAndersen;
-        hcdAndersen = nullptr;
-    }
-
-protected:
-    virtual void initialize();
-
-    // Get offline rep node from offline constraint graph
-    //@{
-    inline bool hasOfflineRep(NodeID nodeId) const
-    {
-        return oCG->hasOCGRep(nodeId);
-    }
-    inline NodeID getOfflineRep(NodeID nodeId)
-    {
-        return oCG->getOCGRep(nodeId);
-    }
-    //@}
-
-    // The set 'mergedNodes' is used to record the merged node, therefore avoiding re-merge nodes
-    //@{
-    inline bool isaMergedNode(NodeID node) const
-    {
-        NodeSet::const_iterator it = mergedNodes.find(node);
-        return it != mergedNodes.end();
-    };
-    inline void setMergedNode(NodeID node)
-    {
-        if (!isaMergedNode(node))
-            mergedNodes.insert(node);
-    };
-    //@}
-
-    virtual void solveWorklist();
-    virtual void mergeSCC(NodeID nodeId);
-    void mergeNodeAndPts(NodeID node, NodeID tgt);
-
-};
-
-
-
-/*!
- * Hybrid Lazy Cycle Detection Based Andersen Analysis
- */
-class AndersenHLCD : public AndersenHCD, public AndersenLCD
-{
-
-private:
-    static AndersenHLCD* hlcdAndersen;
-
-public:
-    AndersenHLCD(SVFIR* _pag, PTATY type = AndersenHLCD_WPA) :
-        Andersen(_pag, type), AndersenHCD(_pag, type), AndersenLCD(_pag, type)
-    {
-    }
-
-    /// Create an singleton instance directly instead of invoking llvm pass manager
-    static AndersenHLCD *createAndersenHLCD(SVFIR* _pag)
-    {
-        if (hlcdAndersen == nullptr)
-        {
-            hlcdAndersen = new AndersenHLCD(_pag);
-            hlcdAndersen->analyze();
-            return hlcdAndersen;
-        }
-        return hlcdAndersen;
-    }
-
-    static void releaseAndersenHLCD()
-    {
-        if (hlcdAndersen)
-            delete hlcdAndersen;
-        hlcdAndersen = nullptr;
-    }
-
-protected:
-    void initialize()
-    {
-        AndersenHCD::initialize();
-    }
-    void solveWorklist()
-    {
-        AndersenHCD::solveWorklist();
-    }
-    void handleCopyGep(ConstraintNode* node)
-    {
-        AndersenLCD::handleCopyGep(node);
-    }
-    void mergeSCC(NodeID nodeId);
-    bool mergeSrcToTgt(NodeID nodeId, NodeID newRepId)
-    {
-        return AndersenLCD::mergeSrcToTgt(nodeId, newRepId);
-    }
-
-};
-
 } // End namespace SVF
 
 #endif /* ANDERSENPASS_H_ */

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

@@ -64,13 +64,9 @@ public:
         // Whole program analysis
         Andersen_BASE,		///< Base Andersen PTA
         Andersen_WPA,		///< Andersen PTA
-        AndersenLCD_WPA,	///< Lazy cycle detection andersen-style WPA
-        AndersenHCD_WPA,    ///< Hybird cycle detection andersen-style WPA
-        AndersenHLCD_WPA,   ///< Hybird lazy cycle detection andersen-style WPA
         AndersenSCD_WPA,    ///< Selective cycle detection andersen-style WPA
         AndersenSFR_WPA,    ///< Stride-based field representation
         AndersenWaveDiff_WPA,	///< Diff wave propagation andersen-style WPA
-        AndersenWaveDiffWithType_WPA,	///< Diff wave propagation with type info andersen-style WPA
         Steensgaard_WPA,      ///< Steensgaard PTA
         CSCallString_WPA,	///< Call string based context sensitive WPA
         CSSummary_WPA,		///< Summary based context sensitive WPA

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

@@ -35,7 +35,6 @@
 #include "WPA/WPASolver.h"
 #include "MemoryModel/SVFIR.h"
 #include "Graphs/ConsG.h"
-#include "Graphs/OfflineConsG.h"
 
 namespace SVF
 {
@@ -86,11 +85,7 @@ public:
     {
         return ( pta->getAnalysisTy() == Andersen_BASE
                  || pta->getAnalysisTy() == Andersen_WPA
-                 || pta->getAnalysisTy() == AndersenLCD_WPA
-                 || pta->getAnalysisTy() == AndersenHCD_WPA
-                 || pta->getAnalysisTy() == AndersenHLCD_WPA
                  || pta->getAnalysisTy() == AndersenWaveDiff_WPA
-                 || pta->getAnalysisTy() == AndersenWaveDiffWithType_WPA
                  || pta->getAnalysisTy() == AndersenSCD_WPA
                  || pta->getAnalysisTy() == AndersenSFR_WPA
                  || pta->getAnalysisTy() == TypeCPP_WPA
@@ -190,11 +185,7 @@ public:
     static inline bool classof(const PointerAnalysis *pta)
     {
         return (pta->getAnalysisTy() == Andersen_WPA
-                || pta->getAnalysisTy() == AndersenLCD_WPA
-                || pta->getAnalysisTy() == AndersenHCD_WPA
-                || pta->getAnalysisTy() == AndersenHLCD_WPA
                 || pta->getAnalysisTy() == AndersenWaveDiff_WPA
-                || pta->getAnalysisTy() == AndersenWaveDiffWithType_WPA
                 || pta->getAnalysisTy() == AndersenSCD_WPA
                 || pta->getAnalysisTy() == AndersenSFR_WPA);
     }
@@ -454,217 +445,6 @@ protected:
     virtual void mergeNodeToRep(NodeID nodeId,NodeID newRepId);
 };
 
-
-/*
- * Lazy Cycle Detection Based Andersen Analysis
- */
-class AndersenLCD : virtual public Andersen
-{
-
-private:
-    static AndersenLCD* lcdAndersen;
-    EdgeSet metEdges;
-    NodeSet lcdCandidates;
-
-public:
-    AndersenLCD(SVFIR* _pag, PTATY type = AndersenLCD_WPA) :
-        Andersen(_pag, type), metEdges({}), lcdCandidates( {})
-    {
-    }
-
-    /// Create an singleton instance directly instead of invoking llvm pass manager
-    static AndersenLCD* createAndersenLCD(SVFIR* _pag)
-    {
-        if (lcdAndersen == nullptr)
-        {
-            lcdAndersen = new AndersenLCD(_pag);
-            lcdAndersen->analyze();
-            return lcdAndersen;
-        }
-        return lcdAndersen;
-    }
-
-    static void releaseAndersenLCD()
-    {
-        if (lcdAndersen)
-            delete lcdAndersen;
-        lcdAndersen = nullptr;
-    }
-
-protected:
-    // 'lcdCandidates' is used to collect nodes need to be visited by SCC detector
-    //@{
-    inline bool hasLCDCandidate () const
-    {
-        return !lcdCandidates.empty();
-    };
-    inline void cleanLCDCandidate()
-    {
-        lcdCandidates.clear();
-    };
-    inline void addLCDCandidate(NodeID nodeId)
-    {
-        lcdCandidates.insert(nodeId);
-    };
-    //@}
-
-    // 'metEdges' is used to collect edges met by AndersenLCD, to avoid redundant visit
-    //@{
-    bool isMetEdge (ConstraintEdge* edge) const
-    {
-        EdgeSet::const_iterator it = metEdges.find(edge->getEdgeID());
-        return it != metEdges.end();
-    };
-    void addMetEdge(ConstraintEdge* edge)
-    {
-        metEdges.insert(edge->getEdgeID());
-    };
-    //@}
-
-    //AndersenLCD worklist processer
-    void solveWorklist();
-    // Solve constraints of each nodes
-    virtual void handleCopyGep(ConstraintNode* node);
-    // Collapse nodes and fields based on 'lcdCandidates'
-    void mergeSCC();
-    // AndersenLCD specified SCC detector, need to input a nodeStack 'lcdCandidate'
-    NodeStack& SCCDetect();
-    bool mergeSrcToTgt(NodeID nodeId, NodeID newRepId);
-};
-
-
-
-/*!
- * Hybrid Cycle Detection Based Andersen Analysis
- */
-class AndersenHCD : virtual public Andersen
-{
-
-public:
-    typedef SCCDetection<OfflineConsG*> OSCC;
-
-private:
-    static AndersenHCD* hcdAndersen;
-    NodeSet mergedNodes;
-    OfflineConsG* oCG;
-
-public:
-    AndersenHCD(SVFIR* _pag, PTATY type = AndersenHCD_WPA) :
-        Andersen(_pag, type), oCG(nullptr)
-    {
-    }
-
-    /// Create an singleton instance directly instead of invoking llvm pass manager
-    static AndersenHCD *createAndersenHCD(SVFIR* _pag)
-    {
-        if (hcdAndersen == nullptr)
-        {
-            hcdAndersen = new AndersenHCD(_pag);
-            hcdAndersen->analyze();
-            return hcdAndersen;
-        }
-        return hcdAndersen;
-    }
-
-    static void releaseAndersenHCD()
-    {
-        if (hcdAndersen)
-            delete hcdAndersen;
-        hcdAndersen = nullptr;
-    }
-
-protected:
-    virtual void initialize();
-
-    // Get offline rep node from offline constraint graph
-    //@{
-    inline bool hasOfflineRep(NodeID nodeId) const
-    {
-        return oCG->hasOCGRep(nodeId);
-    }
-    inline NodeID getOfflineRep(NodeID nodeId)
-    {
-        return oCG->getOCGRep(nodeId);
-    }
-    //@}
-
-    // The set 'mergedNodes' is used to record the merged node, therefore avoiding re-merge nodes
-    //@{
-    inline bool isaMergedNode(NodeID node) const
-    {
-        NodeSet::const_iterator it = mergedNodes.find(node);
-        return it != mergedNodes.end();
-    };
-    inline void setMergedNode(NodeID node)
-    {
-        if (!isaMergedNode(node))
-            mergedNodes.insert(node);
-    };
-    //@}
-
-    virtual void solveWorklist();
-    virtual void mergeSCC(NodeID nodeId);
-    void mergeNodeAndPts(NodeID node, NodeID tgt);
-
-};
-
-
-
-/*!
- * Hybrid Lazy Cycle Detection Based Andersen Analysis
- */
-class AndersenHLCD : public AndersenHCD, public AndersenLCD
-{
-
-private:
-    static AndersenHLCD* hlcdAndersen;
-
-public:
-    AndersenHLCD(SVFIR* _pag, PTATY type = AndersenHLCD_WPA) :
-        Andersen(_pag, type), AndersenHCD(_pag, type), AndersenLCD(_pag, type)
-    {
-    }
-
-    /// Create an singleton instance directly instead of invoking llvm pass manager
-    static AndersenHLCD *createAndersenHLCD(SVFIR* _pag)
-    {
-        if (hlcdAndersen == nullptr)
-        {
-            hlcdAndersen = new AndersenHLCD(_pag);
-            hlcdAndersen->analyze();
-            return hlcdAndersen;
-        }
-        return hlcdAndersen;
-    }
-
-    static void releaseAndersenHLCD()
-    {
-        if (hlcdAndersen)
-            delete hlcdAndersen;
-        hlcdAndersen = nullptr;
-    }
-
-protected:
-    void initialize()
-    {
-        AndersenHCD::initialize();
-    }
-    void solveWorklist()
-    {
-        AndersenHCD::solveWorklist();
-    }
-    void handleCopyGep(ConstraintNode* node)
-    {
-        AndersenLCD::handleCopyGep(node);
-    }
-    void mergeSCC(NodeID nodeId);
-    bool mergeSrcToTgt(NodeID nodeId, NodeID newRepId)
-    {
-        return AndersenLCD::mergeSrcToTgt(nodeId, newRepId);
-    }
-
-};
-
 } // End namespace SVF
 
 #endif /* ANDERSENPASS_H_ */

package/package.json

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