svf-lib 1.0.1183 → 1.0.1184

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

@@ -45,11 +45,6 @@ public:
     typedef ConstraintEdge::ConstraintEdgeSetTy::const_iterator const_iterator;
     bool _isPWCNode;
 
-    enum SCCEdgeFlag
-    {
-        Copy, Direct
-    };
-
 private:
     ConstraintEdge::ConstraintEdgeSetTy loadInEdges; ///< all incoming load edge of this node
     ConstraintEdge::ConstraintEdgeSetTy loadOutEdges; ///< all outgoing load edge of this node
@@ -72,19 +67,11 @@ private:
     ConstraintEdge::ConstraintEdgeSetTy addressOutEdges; ///< all outgoing address edge of this node
 
 public:
-
-    static SCCEdgeFlag sccEdgeFlag;
-
+    /// For stride-based field representation
     NodeBS strides;
-    bool newExpand;
     NodeBS baseIds;
 
-    static void setSCCEdgeFlag(SCCEdgeFlag f)
-    {
-        sccEdgeFlag = f;
-    }
-
-    ConstraintNode(NodeID i) : GenericConsNodeTy(i, 0), _isPWCNode(false), newExpand(false)
+    ConstraintNode(NodeID i) : GenericConsNodeTy(i, 0), _isPWCNode(false)
     {
 
     }
@@ -165,69 +152,14 @@ public:
 
     ///  Iterators
     //@{
-    inline iterator directOutEdgeBegin()
-    {
-        if (sccEdgeFlag == Copy)
-            return copyOutEdges.begin();
-        else
-            return directOutEdges.begin();
-    }
-
-    inline iterator directOutEdgeEnd()
-    {
-        if (sccEdgeFlag == Copy)
-            return copyOutEdges.end();
-        else
-            return directOutEdges.end();
-    }
-
-    inline iterator directInEdgeBegin()
-    {
-        if (sccEdgeFlag == Copy)
-            return copyInEdges.begin();
-        else
-            return directInEdges.begin();
-    }
-
-    inline iterator directInEdgeEnd()
-    {
-        if (sccEdgeFlag == Copy)
-            return copyInEdges.end();
-        else
-            return directInEdges.end();
-    }
-
-    inline const_iterator directOutEdgeBegin() const
-    {
-        if (sccEdgeFlag == Copy)
-            return copyOutEdges.begin();
-        else
-            return directOutEdges.begin();
-    }
-
-    inline const_iterator directOutEdgeEnd() const
-    {
-        if (sccEdgeFlag == Copy)
-            return copyOutEdges.end();
-        else
-            return directOutEdges.end();
-    }
-
-    inline const_iterator directInEdgeBegin() const
-    {
-        if (sccEdgeFlag == Copy)
-            return copyInEdges.begin();
-        else
-            return directInEdges.begin();
-    }
-
-    inline const_iterator directInEdgeEnd() const
-    {
-        if (sccEdgeFlag == Copy)
-            return copyInEdges.end();
-        else
-            return directInEdges.end();
-    }
+    iterator directOutEdgeBegin();
+    iterator directOutEdgeEnd();
+    iterator directInEdgeBegin();
+    iterator directInEdgeEnd();
+    const_iterator directOutEdgeBegin() const;
+    const_iterator directOutEdgeEnd() const;
+    const_iterator directInEdgeBegin() const;
+    const_iterator directInEdgeEnd() const;
 
     ConstraintEdge::ConstraintEdgeSetTy& incomingAddrEdges()
     {

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

@@ -234,8 +234,8 @@ public:
     static const llvm::cl::opt<std :: string> WriteAnder;
     // static const llvm::cl::opt<string> ReadAnder;
     static const llvm::cl::opt<std :: string> ReadAnder;
-    static const llvm::cl::opt<bool> PtsDiff;
-    static const llvm::cl::opt<bool> MergePWC;
+    static const llvm::cl::opt<bool> DiffPts;
+    static llvm::cl::opt<bool> DetectPWC;
     static const llvm::cl::opt<bool> VtableInSVFIR;
 
     // WPAPass.cpp

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

@@ -35,6 +35,7 @@
 #include "WPA/WPASolver.h"
 #include "MemoryModel/SVFIR.h"
 #include "Graphs/ConsG.h"
+#include "Util/Options.h"
 
 namespace SVF
 {
@@ -151,7 +152,7 @@ public:
 
     /// Constructor
     Andersen(SVFIR* _pag, PTATY type = Andersen_WPA, bool alias_check = true)
-        :  AndersenBase(_pag, type, alias_check), pwcOpt(false), diffOpt(true)
+        :  AndersenBase(_pag, type, alias_check)
     {
     }
 
@@ -223,28 +224,9 @@ public:
 
     void dumpTopLevelPtsTo();
 
-    void setPWCOpt(bool flag)
+    void setDetectPWC(bool flag)
     {
-        pwcOpt = flag;
-        if (pwcOpt)
-            setSCCEdgeFlag(ConstraintNode::Direct);
-        else
-            setSCCEdgeFlag(ConstraintNode::Copy);
-    }
-
-    bool mergePWC() const
-    {
-        return pwcOpt;
-    }
-
-    void setDiffOpt(bool flag)
-    {
-        diffOpt = flag;
-    }
-
-    bool enableDiff() const
-    {
-        return diffOpt;
+        Options::DetectPWC = flag;
     }
 
 protected:
@@ -252,13 +234,10 @@ protected:
     CallSite2DummyValPN callsite2DummyValPN;        ///< Map an instruction to a dummy obj which created at an indirect callsite, which invokes a heap allocator
     void heapAllocatorViaIndCall(CallSite cs,NodePairSet &cpySrcNodes);
 
-    bool pwcOpt;
-    bool diffOpt;
-
     /// Handle diff points-to set.
     virtual inline void computeDiffPts(NodeID id)
     {
-        if (enableDiff())
+        if (Options::DiffPts)
         {
             NodeID rep = sccRepNode(id);
             getDiffPTDataTy()->computeDiffPts(rep, getDiffPTDataTy()->getPts(rep));
@@ -267,7 +246,7 @@ protected:
     virtual inline const PointsTo& getDiffPts(NodeID id)
     {
         NodeID rep = sccRepNode(id);
-        if (enableDiff())
+        if (Options::DiffPts)
             return getDiffPTDataTy()->getDiffPts(rep);
         else
             return getPTDataTy()->getPts(rep);
@@ -276,7 +255,7 @@ protected:
     /// Handle propagated points-to set.
     inline void updatePropaPts(NodeID dstId, NodeID srcId)
     {
-        if (!enableDiff())
+        if (!Options::DiffPts)
             return;
         NodeID srcRep = sccRepNode(srcId);
         NodeID dstRep = sccRepNode(dstId);
@@ -284,7 +263,7 @@ protected:
     }
     inline void clearPropaPts(NodeID src)
     {
-        if (enableDiff())
+        if (Options::DiffPts)
         {
             NodeID rep = sccRepNode(src);
             getDiffPTDataTy()->clearPropaPts(rep);
@@ -293,11 +272,6 @@ protected:
 
     virtual void initWorklist() {}
 
-    virtual void setSCCEdgeFlag(ConstraintNode::SCCEdgeFlag f)
-    {
-        ConstraintNode::sccEdgeFlag = f;
-    }
-
     /// Override WPASolver function in order to use the default solver
     virtual void processNode(NodeID nodeId);
 
@@ -424,6 +398,7 @@ public:
         diffWave = nullptr;
     }
 
+    virtual void initialize();
     virtual void solveWorklist();
     virtual void processNode(NodeID nodeId);
     virtual void postProcessNode(NodeID nodeId);

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

@@ -0,0 +1,160 @@
+//===- AndersenSFR.h -- SFR based field-sensitive Andersen's analysis-------------//
+//
+//                     SVF: Static Value-Flow Analysis
+//
+// Copyright (C) <2013-2017>  <Yulei Sui>
+//
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//===----------------------------------------------------------------------===//
+
+/*
+ * AndersenSFR.h
+ *
+ *  Created on: 09, Feb, 2019
+ *      Author: Yuxiang Lei
+ */
+
+#ifndef PROJECT_ANDERSENSFR_H
+#define PROJECT_ANDERSENSFR_H
+
+
+#include "WPA/Andersen.h"
+#include "WPA/CSC.h"
+#include "MemoryModel/PointsTo.h"
+
+namespace SVF
+{
+
+/*!
+ * Selective Cycle Detection Based Andersen Analysis
+ */
+class AndersenSCD : public Andersen
+{
+public:
+    typedef Map<NodeID, NodeID> NodeToNodeMap;
+
+protected:
+    static AndersenSCD* scdAndersen;
+    NodeSet sccCandidates;
+    NodeToNodeMap pwcReps;
+
+public:
+    AndersenSCD(SVFIR* _pag, PTATY type = AndersenSCD_WPA) :
+        Andersen(_pag,type)
+    {
+    }
+
+    /// Create an singleton instance directly instead of invoking llvm pass manager
+    static AndersenSCD *createAndersenSCD(SVFIR* _pag)
+    {
+        if (scdAndersen == nullptr)
+        {
+            new AndersenSCD(_pag);
+            scdAndersen->analyze();
+            return scdAndersen;
+        }
+        return scdAndersen;
+    }
+
+    static void releaseAndersenSCD()
+    {
+        if (scdAndersen)
+            delete scdAndersen;
+        scdAndersen = nullptr;
+    }
+
+protected:
+    inline void addSccCandidate(NodeID nodeId)
+    {
+        sccCandidates.insert(sccRepNode(nodeId));
+    }
+
+    virtual NodeStack& SCCDetect();
+    virtual void PWCDetect();
+    virtual void solveWorklist();
+    virtual void handleLoadStore(ConstraintNode* node);
+    virtual void processAddr(const AddrCGEdge* addr);
+    virtual bool addCopyEdge(NodeID src, NodeID dst);
+    virtual bool updateCallGraph(const CallSiteToFunPtrMap& callsites);
+    virtual void processPWC(ConstraintNode* rep);
+    virtual void handleCopyGep(ConstraintNode* node);
+
+};
+
+
+
+/*!
+ * Selective Cycle Detection with Stride-based Field Representation
+ */
+class AndersenSFR : public AndersenSCD
+{
+public:
+    typedef Map<NodeID, NodeBS> NodeStrides;
+    typedef Map<NodeID, NodeSet> FieldReps;
+    typedef Map<NodeID, pair<NodeID, NodeSet>> SFRTrait;
+
+private:
+    static AndersenSFR* sfrAndersen;
+
+    CSC* csc;
+    NodeSet sfrObjNodes;
+    FieldReps fieldReps;
+
+public:
+    AndersenSFR(SVFIR* _pag, PTATY type = AndersenSFR_WPA) :
+        AndersenSCD(_pag, type), csc(nullptr)
+    {
+    }
+
+    /// Create an singleton instance directly instead of invoking llvm pass manager
+    static AndersenSFR *createAndersenSFR(SVFIR* _pag)
+    {
+        if (sfrAndersen == nullptr)
+        {
+            new AndersenSFR(_pag);
+            sfrAndersen->analyze();
+            return sfrAndersen;
+        }
+        return sfrAndersen;
+    }
+
+    static void releaseAndersenSFR()
+    {
+        if (sfrAndersen)
+            delete sfrAndersen;
+    }
+
+    ~AndersenSFR()
+    {
+        if (csc != nullptr)
+        {
+            delete(csc);
+            csc = nullptr;
+        }
+    }
+
+protected:
+    void initialize();
+    void PWCDetect();
+    void fieldExpand(NodeSet& initials, s32_t offset, NodeBS& strides, PointsTo& expandPts);
+    bool processGepPts(const PointsTo& pts, const GepCGEdge* edge);
+    bool mergeSrcToTgt(NodeID nodeId, NodeID newRepId);
+
+};
+
+} // End namespace SVF
+
+#endif //PROJECT_ANDERSENSFR_H

package/package.json

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