svf-lib 1.0.2434 → 1.0.2435

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

@@ -614,79 +614,79 @@ private:
 
 
     /// Add a memory obj node
-    inline NodeID addObjNode(NodeID i, ObjTypeInfo* ti, const SVFType* type, const ICFGNode* node)
+    inline NodeID addObjNode(NodeID i, ObjTypeInfo* ti, const ICFGNode* node)
     {
-        return addFIObjNode( i, ti, type, node);
+        return addFIObjNode( i, ti, node);
     }
 
     /**
      * Creates and adds a heap object node to the SVFIR
      */
-    inline NodeID addHeapObjNode(NodeID i, ObjTypeInfo* ti, const SVFType* type, const ICFGNode* node)
+    inline NodeID addHeapObjNode(NodeID i, ObjTypeInfo* ti, const ICFGNode* node)
     {
         memToFieldsMap[i].set(i);
-        HeapObjVar *heapObj = new HeapObjVar(i, ti, type, node);
+        HeapObjVar *heapObj = new HeapObjVar(i, ti, node);
         return addObjNode(heapObj);
     }
 
     /**
      * Creates and adds a stack object node to the SVFIR
      */
-    inline NodeID addStackObjNode(NodeID i, ObjTypeInfo* ti, const SVFType* type, const ICFGNode* node)
+    inline NodeID addStackObjNode(NodeID i, ObjTypeInfo* ti, const ICFGNode* node)
     {
         memToFieldsMap[i].set(i);
-        StackObjVar *stackObj = new StackObjVar(i, ti, type, node);
+        StackObjVar *stackObj = new StackObjVar(i, ti, node);
         return addObjNode(stackObj);
     }
 
-    NodeID addFunObjNode(NodeID id,  ObjTypeInfo* ti, const SVFType* type, const ICFGNode* node)
+    NodeID addFunObjNode(NodeID id,  ObjTypeInfo* ti, const ICFGNode* node)
     {
         memToFieldsMap[id].set(id);
-        FunObjVar* funObj = new FunObjVar(id, ti, type, node);
+        FunObjVar* funObj = new FunObjVar(id, ti, node);
         return addObjNode(funObj);
     }
 
 
-    inline NodeID addConstantFPObjNode(NodeID i, ObjTypeInfo* ti, double dval, const SVFType* type, const ICFGNode* node)
+    inline NodeID addConstantFPObjNode(NodeID i, ObjTypeInfo* ti, double dval, const ICFGNode* node)
     {
         memToFieldsMap[i].set(i);
-        ConstFPObjVar* conObj = new ConstFPObjVar(i, dval, ti, type, node);
+        ConstFPObjVar* conObj = new ConstFPObjVar(i, dval, ti, node);
         return addObjNode(conObj);
     }
 
 
-    inline NodeID addConstantIntObjNode(NodeID i, ObjTypeInfo* ti, const std::pair<s64_t, u64_t>& intValue, const SVFType* type, const ICFGNode* node)
+    inline NodeID addConstantIntObjNode(NodeID i, ObjTypeInfo* ti, const std::pair<s64_t, u64_t>& intValue, const ICFGNode* node)
     {
         memToFieldsMap[i].set(i);
         ConstIntObjVar* conObj =
-            new ConstIntObjVar(i, intValue.first, intValue.second, ti, type, node);
+            new ConstIntObjVar(i, intValue.first, intValue.second, ti, node);
         return addObjNode(conObj);
     }
 
 
-    inline NodeID addConstantNullPtrObjNode(const NodeID i, ObjTypeInfo* ti, const SVFType* type, const ICFGNode* node)
+    inline NodeID addConstantNullPtrObjNode(const NodeID i, ObjTypeInfo* ti, const ICFGNode* node)
     {
         memToFieldsMap[i].set(i);
-        ConstNullPtrObjVar* conObj = new ConstNullPtrObjVar(i, ti, type, node);
+        ConstNullPtrObjVar* conObj = new ConstNullPtrObjVar(i, ti, node);
         return addObjNode(conObj);
     }
 
-    inline NodeID addGlobalObjNode(const NodeID i, ObjTypeInfo* ti, const SVFType* type, const ICFGNode* node)
+    inline NodeID addGlobalObjNode(const NodeID i, ObjTypeInfo* ti, const ICFGNode* node)
     {
         memToFieldsMap[i].set(i);
-        GlobalObjVar* gObj = new GlobalObjVar(i, ti, type, node);
+        GlobalObjVar* gObj = new GlobalObjVar(i, ti, node);
         return addObjNode(gObj);
     }
-    inline NodeID addConstantAggObjNode(const NodeID i, ObjTypeInfo* ti, const SVFType* type, const ICFGNode* node)
+    inline NodeID addConstantAggObjNode(const NodeID i, ObjTypeInfo* ti, const ICFGNode* node)
     {
         memToFieldsMap[i].set(i);
-        ConstAggObjVar* conObj = new ConstAggObjVar(i, ti, type, node);
+        ConstAggObjVar* conObj = new ConstAggObjVar(i, ti, node);
         return addObjNode(conObj);
     }
-    inline NodeID addConstantDataObjNode(const NodeID i, ObjTypeInfo* ti, const SVFType* type, const ICFGNode* node)
+    inline NodeID addConstantDataObjNode(const NodeID i, ObjTypeInfo* ti, const ICFGNode* node)
     {
         memToFieldsMap[i].set(i);
-        ConstDataObjVar* conObj = new ConstDataObjVar(i, ti, type, node);
+        ConstDataObjVar* conObj = new ConstDataObjVar(i, ti, node);
         return addObjNode(conObj);
     }
 
@@ -708,10 +708,10 @@ private:
     /// Add a field obj node, this method can only invoked by getGepObjVar
     NodeID addGepObjNode(const BaseObjVar* baseObj, const APOffset& apOffset, const NodeID gepId);
     /// Add a field-insensitive node, this method can only invoked by getFIGepObjNode
-    NodeID addFIObjNode(NodeID i, ObjTypeInfo* ti, const SVFType* type, const ICFGNode* node)
+    NodeID addFIObjNode(NodeID i, ObjTypeInfo* ti, const ICFGNode* node)
     {
         memToFieldsMap[i].set(i);
-        BaseObjVar* baseObj = new BaseObjVar(i, ti, type, node);
+        BaseObjVar* baseObj = new BaseObjVar(i, ti, node);
         return addObjNode(baseObj);
     }
 
@@ -730,11 +730,11 @@ private:
         {
             ObjTypeInfo* ti = createObjTypeInfo(type);
             idToObjTypeInfoMap()[i] = ti;
-            return addObjNode(new DummyObjVar(i, ti, nullptr, type));
+            return addObjNode(new DummyObjVar(i, ti, nullptr));
         }
         else
         {
-            return addObjNode(new DummyObjVar(i, getObjTypeInfo(i), nullptr, type));
+            return addObjNode(new DummyObjVar(i, getObjTypeInfo(i), nullptr));
         }
     }
 

package/SVF-linux-aarch64/include/SVFIR/SVFStatements.h

@@ -129,7 +129,7 @@ public:
         return edgeId;
     }
     /// Whether src and dst nodes are both of pointer type
-    bool isPTAEdge() const;
+    virtual bool isPTAEdge() const;
 
     /// Get/set methods for llvm instruction
     //@{
@@ -343,6 +343,10 @@ public:
         return arrSize;
     }
 
+    virtual bool isPTAEdge() const override
+    {
+        return true;
+    }
 };
 
 /*!

package/SVF-linux-aarch64/include/SVFIR/SVFVariables.h

@@ -533,9 +533,8 @@ public:
     //@}
 
     /// Constructor
-    BaseObjVar(NodeID i, ObjTypeInfo* ti,
-               const SVFType* svfType, const ICFGNode* node, PNODEK ty = BaseObjNode)
-        : ObjVar(i, svfType, ty), typeInfo(ti), icfgNode(node)
+    BaseObjVar(NodeID i, ObjTypeInfo* ti, const ICFGNode* node, PNODEK ty = BaseObjNode)
+        : ObjVar(i, ti->getType(), ty), typeInfo(ti), icfgNode(node)
     {
     }
 
@@ -564,12 +563,6 @@ public:
         return id;
     }
 
-    /// Get obj type
-    const SVFType* getType() const
-    {
-        return typeInfo->getType();
-    }
-
     /// Get the number of elements of this object
     u32_t getNumOfElements() const
     {
@@ -832,8 +825,8 @@ public:
     //@}
 
     /// Constructor
-    HeapObjVar(NodeID i, ObjTypeInfo* ti, const SVFType* svfType, const ICFGNode* node):
-        BaseObjVar(i, ti, svfType, node, HeapObjNode)
+    HeapObjVar(NodeID i, ObjTypeInfo* ti, const ICFGNode* node):
+        BaseObjVar(i, ti, node, HeapObjNode)
     {
     }
 
@@ -888,8 +881,8 @@ public:
     //@}
 
     /// Constructor
-    StackObjVar(NodeID i, ObjTypeInfo* ti, const SVFType* svfType, const ICFGNode* node):
-        BaseObjVar(i, ti, svfType, node, StackObjNode)
+    StackObjVar(NodeID i, ObjTypeInfo* ti, const ICFGNode* node):
+        BaseObjVar(i, ti, node, StackObjNode)
     {
     }
 
@@ -962,7 +955,7 @@ public:
     //@}
 
     /// Constructor
-    FunObjVar(NodeID i, ObjTypeInfo* ti, const SVFType* svfType, const ICFGNode* node);
+    FunObjVar(NodeID i, ObjTypeInfo* ti, const ICFGNode* node);
 
 
     virtual ~FunObjVar()
@@ -1599,8 +1592,8 @@ public:
     //@}
 
     /// Constructor
-    GlobalObjVar(NodeID i, ObjTypeInfo* ti, const SVFType* svfType, const ICFGNode* node,
-                 PNODEK ty = GlobalObjNode): BaseObjVar(i, ti, svfType, node, ty)
+    GlobalObjVar(NodeID i, ObjTypeInfo* ti, const ICFGNode* node,
+                 PNODEK ty = GlobalObjNode): BaseObjVar(i, ti, node, ty)
     {
 
     }
@@ -1643,8 +1636,8 @@ public:
     //@}
 
     /// Constructor
-    ConstAggObjVar(NodeID i, ObjTypeInfo* ti, const SVFType* svfType, const ICFGNode* node)
-        : BaseObjVar(i,  ti, svfType, node, ConstAggObjNode)
+    ConstAggObjVar(NodeID i, ObjTypeInfo* ti, const ICFGNode* node)
+        : BaseObjVar(i,  ti, node, ConstAggObjNode)
     {
 
     }
@@ -1695,8 +1688,8 @@ public:
     //@}
 
     /// Constructor
-    ConstDataObjVar(NodeID i, ObjTypeInfo* ti, const SVFType* svfType, const ICFGNode* node, PNODEK ty = ConstDataObjNode)
-        : BaseObjVar(i, ti, svfType, node, ty)
+    ConstDataObjVar(NodeID i, ObjTypeInfo* ti, const ICFGNode* node, PNODEK ty = ConstDataObjNode)
+        : BaseObjVar(i, ti, node, ty)
     {
     }
 
@@ -1756,8 +1749,8 @@ public:
     //@}
 
     /// Constructor
-    ConstFPObjVar(NodeID i, double dv, ObjTypeInfo* ti, const SVFType* svfType, const ICFGNode* node)
-        : ConstDataObjVar(i, ti, svfType, node, ConstFPObjNode), dval(dv)
+    ConstFPObjVar(NodeID i, double dv, ObjTypeInfo* ti, const ICFGNode* node)
+        : ConstDataObjVar(i, ti, node, ConstFPObjNode), dval(dv)
     {
     }
 
@@ -1825,12 +1818,11 @@ public:
     //@}
 
     /// Constructor
-    ConstIntObjVar(NodeID i, s64_t sv, u64_t zv, ObjTypeInfo* ti, const SVFType* svfType, const ICFGNode* node)
-        : ConstDataObjVar(i, ti, svfType, node, ConstIntObjNode), zval(zv), sval(sv)
+    ConstIntObjVar(NodeID i, s64_t sv, u64_t zv, ObjTypeInfo* ti, const ICFGNode* node)
+        : ConstDataObjVar(i, ti, node, ConstIntObjNode), zval(zv), sval(sv)
     {
     }
 
-
     virtual const std::string toString() const;
 };
 
@@ -1874,8 +1866,8 @@ public:
     //@}
 
     /// Constructor
-    ConstNullPtrObjVar(NodeID i, ObjTypeInfo* ti, const SVFType* svfType, const ICFGNode* node)
-        : ConstDataObjVar(i, ti, svfType, node, ConstNullptrObjNode)
+    ConstNullPtrObjVar(NodeID i, ObjTypeInfo* ti, const ICFGNode* node)
+        : ConstDataObjVar(i, ti, node, ConstNullptrObjNode)
     {
     }
     virtual bool isConstDataOrAggDataButNotNullPtr() const
@@ -2073,8 +2065,8 @@ public:
     //@}
 
     /// Constructor
-    DummyObjVar(NodeID i, ObjTypeInfo* ti, const ICFGNode* node, const SVFType* svfType = SVFType::getSVFPtrType())
-        : BaseObjVar(i, ti, svfType, node, DummyObjNode)
+    DummyObjVar(NodeID i, ObjTypeInfo* ti, const ICFGNode* node)
+        : BaseObjVar(i, ti, node, DummyObjNode)
     {
     }
 

package/package.json

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