svf-lib 1.0.2181 → 1.0.2183

package/SVF-linux/Release-build/include/SVFIR/SVFIR.h

@@ -572,9 +572,9 @@ private:
         return addValNode(val, node, i);
     }
 
-    NodeID addFunValNode(const CallGraphNode* callGraphNode, NodeID i, const ICFGNode* icfgNode)
+    NodeID addFunValNode(NodeID i, const ICFGNode* icfgNode, const CallGraphNode* callGraphNode)
     {
-        FunValVar* node = new FunValVar(callGraphNode, i, icfgNode);
+        FunValVar* node = new FunValVar(i, icfgNode, callGraphNode);
         return addValNode(nullptr, node, i);
     }
 
@@ -585,17 +585,17 @@ private:
         return addValNode(nullptr, node, i);
     }
 
-    inline NodeID addConstantFPValNode(const SVFValue* curInst, double dval, const NodeID i,
+    inline NodeID addConstantFPValNode(const SVFValue* curInst, const NodeID i, double dval,
                                        const ICFGNode* icfgNode)
     {
-        SVFVar* node = new ConstantFPValVar(curInst,  dval, i, icfgNode);
+        SVFVar* node = new ConstantFPValVar(curInst,  i, dval, icfgNode);
         return addNode(node, i);
     }
 
-    inline NodeID addConstantIntValNode(const SVFValue* curInst, const std::pair<s64_t, u64_t>& intValue, const NodeID i,
+    inline NodeID addConstantIntValNode(const SVFValue* curInst, NodeID i, const std::pair<s64_t, u64_t>& intValue,
                                         const ICFGNode* icfgNode)
     {
-        SVFVar* node = new ConstantIntValVar(curInst, intValue.first, intValue.second, i, icfgNode);
+        SVFVar* node = new ConstantIntValVar(curInst, i, intValue.first, intValue.second, icfgNode);
         return addNode(node, i);
     }
 
@@ -629,47 +629,47 @@ private:
     /**
      * Creates and adds a heap object node to the SVFIR
      */
-    inline NodeID addHeapObjNode(const SVFValue* val, const SVFFunction* f, NodeID i)
+    inline NodeID addHeapObjNode(const SVFValue* val, NodeID i, const SVFFunction* f)
     {
         const MemObj* mem = getMemObj(val);
         assert(mem->getId() == i && "not same object id?");
         memToFieldsMap[i].set(i);
-        HeapObjVar *node = new HeapObjVar(f, val->getType(), i, mem);
+        HeapObjVar *node = new HeapObjVar(i, mem, val->getType(), f);
         return addObjNode(val, node, i);
     }
 
     /**
      * Creates and adds a stack object node to the SVFIR
      */
-    inline NodeID addStackObjNode(const SVFValue* val, const SVFFunction* f, NodeID i)
+    inline NodeID addStackObjNode(const SVFValue* val, NodeID i, const SVFFunction* f)
     {
         const MemObj* mem = getMemObj(val);
         assert(mem->getId() == i && "not same object id?");
         memToFieldsMap[i].set(i);
-        StackObjVar *node = new  StackObjVar(f, val->getType(), i, mem);
+        StackObjVar *node = new  StackObjVar(i, mem, val->getType(), f);
         return addObjNode(val, node, i);
     }
 
-    NodeID addFunObjNode(const CallGraphNode* callGraphNode, NodeID id);
+    NodeID addFunObjNode(NodeID id, const CallGraphNode* callGraphNode);
 
 
-    inline NodeID addConstantFPObjNode(const SVFValue* curInst, double dval, const NodeID i)
+    inline NodeID addConstantFPObjNode(const SVFValue* curInst, NodeID i, double dval)
     {
         const MemObj* mem = getMemObj(curInst);
         NodeID base = mem->getId();
         memToFieldsMap[base].set(mem->getId());
-        ConstantFPObjVar* node = new ConstantFPObjVar(curInst, dval, mem->getId(), mem);
+        ConstantFPObjVar* node = new ConstantFPObjVar(curInst, i, dval, mem);
         return addObjNode(curInst, node, mem->getId());
     }
 
 
-    inline NodeID addConstantIntObjNode(const SVFValue* curInst, const std::pair<s64_t, u64_t>& intValue, const NodeID i)
+    inline NodeID addConstantIntObjNode(const SVFValue* curInst, NodeID i, const std::pair<s64_t, u64_t>& intValue)
     {
         const MemObj* mem = getMemObj(curInst);
         NodeID base = mem->getId();
         memToFieldsMap[base].set(mem->getId());
         ConstantIntObjVar* node =
-            new ConstantIntObjVar(curInst, intValue.first, intValue.second, mem->getId(), mem);
+            new ConstantIntObjVar(curInst, i, intValue.first, intValue.second,  mem);
         return addObjNode(curInst, node, mem->getId());
     }
 
@@ -702,15 +702,15 @@ private:
     }
 
     /// Add a unique return node for a procedure
-    inline NodeID addRetNode(const CallGraphNode* callGraphNode, NodeID i)
+    inline NodeID addRetNode(NodeID i, const CallGraphNode* callGraphNode)
     {
-        SVFVar *node = new RetPN(callGraphNode,i);
+        SVFVar *node = new RetPN(i, callGraphNode);
         return addRetNode(callGraphNode, node, i);
     }
     /// Add a unique vararg node for a procedure
-    inline NodeID addVarargNode(const CallGraphNode* val, NodeID i)
+    inline NodeID addVarargNode(NodeID i, const CallGraphNode* val)
     {
-        SVFVar *node = new VarArgPN(val,i);
+        SVFVar *node = new VarArgPN(i, val);
         return addNode(node,i);
     }
 

package/SVF-linux/Release-build/include/SVFIR/SVFVariables.h

@@ -724,8 +724,8 @@ public:
     //@}
 
     /// Constructor
-    HeapObjVar(const SVFFunction* func, const SVFType* svfType, NodeID i,
-               const MemObj* mem, PNODEK ty = HeapObjNode);
+    HeapObjVar(NodeID i, const MemObj* mem, const SVFType* svfType,
+               const SVFFunction* fun, PNODEK ty = HeapObjNode);
 
     /// Return name of a LLVM value
     inline const std::string getValueName() const
@@ -785,8 +785,8 @@ public:
     //@}
 
     /// Constructor
-    StackObjVar(const SVFFunction* f, const SVFType* svfType, NodeID i,
-                const MemObj* mem, PNODEK ty = StackObjNode);
+    StackObjVar(NodeID i, const MemObj* mem, const SVFType* svfType,
+                const SVFFunction* fun, PNODEK ty = StackObjNode);
 
     /// Return name of a LLVM value
     inline const std::string getValueName() const
@@ -838,7 +838,7 @@ public:
     }
 
     /// Constructor
-    FunValVar(const CallGraphNode* cgn, NodeID i, const ICFGNode* icn,
+    FunValVar(NodeID i, const ICFGNode* icn, const CallGraphNode* cgn,
               PNODEK ty = FunValNode);
 
     virtual const std::string toString() const;
@@ -886,7 +886,7 @@ public:
     //@}
 
     /// Constructor
-    FunObjVar(const CallGraphNode* cgNode, NodeID i, const MemObj* mem,
+    FunObjVar(NodeID i, const MemObj* mem, const CallGraphNode* cgNode,
               PNODEK ty = FunObjNode);
 
     inline const CallGraphNode* getCallGraphNode() const
@@ -1069,7 +1069,7 @@ public:
     }
 
     /// Constructor
-    ConstantFPValVar(const SVFValue* val, double dv, NodeID i, const ICFGNode* icn,
+    ConstantFPValVar(const SVFValue* val, NodeID i, double dv, const ICFGNode* icn,
                      PNODEK ty = ConstantFPValNode)
         : ConstantDataValVar(val, i,  icn, ty), dval(dv)
     {
@@ -1128,7 +1128,7 @@ public:
     }
 
     /// Constructor
-    ConstantIntValVar(const SVFValue* val, s64_t sv, u64_t zv, NodeID i, const ICFGNode* icn,
+    ConstantIntValVar(const SVFValue* val, NodeID i, s64_t sv, u64_t zv, const ICFGNode* icn,
                       PNODEK ty = ConstantIntValNode)
         : ConstantDataValVar(val, i,  icn, ty), zval(zv), sval(sv)
     {
@@ -1327,7 +1327,7 @@ public:
     //@}
 
     /// Constructor
-    ConstantFPObjVar(const SVFValue* val, double dv, NodeID i, const MemObj* m, PNODEK ty = ConstantFPObjNode)
+    ConstantFPObjVar(const SVFValue* val, NodeID i, double dv, const MemObj* m, PNODEK ty = ConstantFPObjNode)
         : ConstantDataObjVar(val, i, m, ty), dval(dv)
     {
     }
@@ -1402,7 +1402,7 @@ public:
     //@}
 
     /// Constructor
-    ConstantIntObjVar(const SVFValue* val, s64_t sv, u64_t zv, NodeID i, const MemObj* m, PNODEK ty = ConstantIntObjNode)
+    ConstantIntObjVar(const SVFValue* val, NodeID i, s64_t sv, u64_t zv, const MemObj* m, PNODEK ty = ConstantIntObjNode)
         : ConstantDataObjVar(val, i, m, ty), zval(zv), sval(sv)
     {
     }
@@ -1505,7 +1505,7 @@ public:
 
 
     /// Constructor
-    RetPN(const CallGraphNode* node, NodeID i);
+    RetPN(NodeID i, const CallGraphNode* node);
 
     inline const CallGraphNode* getCallGraphNode() const
     {
@@ -1559,7 +1559,7 @@ public:
     //@}
 
     /// Constructor
-    VarArgPN(const CallGraphNode* node, NodeID i) : ValVar(nullptr, i, VarargNode), callGraphNode(node) {}
+    VarArgPN(NodeID i, const CallGraphNode* node) : ValVar(nullptr, i, VarargNode), callGraphNode(node) {}
 
     virtual const SVFFunction* getFunction() const;
 

package/SVF-osx/Release-build/include/DDA/DDAVFSolver.h

@@ -473,8 +473,6 @@ protected:
         NodeID id = getPtrNodeID(var);
         const BaseObjVar* baseObj = _pag->getBaseObject(id);
         assert(baseObj && "base object is null??");
-        const MemObj* obj = _pag->getObject(id);
-        assert(obj && "object not found!!");
         if(SVFUtil::isa<StackObjVar>(baseObj))
         {
             if(const SVFFunction* svffun = _pag->getGNode(id)->getFunction())
@@ -645,14 +643,14 @@ protected:
 
     inline bool isArrayCondMemObj(const CVar& var) const
     {
-        const MemObj* mem = _pag->getObject(getPtrNodeID(var));
-        assert(mem && "memory object is null??");
-        return mem->isArray();
+        const BaseObjVar* obj = _pag->getBaseObject(getPtrNodeID(var));
+        assert(obj && "base object is null??");
+        return obj->isArray();
     }
     inline bool isFieldInsenCondMemObj(const CVar& var) const
     {
-        const MemObj* mem =  _pag->getBaseObj(getPtrNodeID(var));
-        return mem->isFieldInsensitive();
+        const BaseObjVar* baseObj = _pag->getBaseObject(getPtrNodeID(var));
+        return baseObj->isFieldInsensitive();
     }
     //@}
 private:

package/SVF-osx/Release-build/include/Graphs/ConsG.h

@@ -323,8 +323,8 @@ public:
     }
     inline bool isSingleFieldObj(NodeID id) const
     {
-        const MemObj* mem = pag->getBaseObj(id);
-        return (mem->getMaxFieldOffsetLimit() == 1);
+        const BaseObjVar* baseObj = pag->getBaseObject(id);
+        return (baseObj->getMaxFieldOffsetLimit() == 1);
     }
     /// Get a field of a memory object
     inline NodeID getGepObjVar(NodeID id, const APOffset& apOffset)

package/SVF-osx/Release-build/include/Graphs/IRGraph.h

@@ -65,10 +65,11 @@ protected:
     SymbolTableInfo* symInfo;
 
     /// Add a node into the graph
-    inline NodeID addNode(SVFVar* node, NodeID i)
+    inline NodeID addNode(SVFVar* node)
     {
-        addGNode(i,node);
-        return i;
+        assert(node && "cannot add a null node");
+        addGNode(node->getId(),node);
+        return node->getId();
     }
     /// Add an edge into the graph
     bool addEdge(SVFVar* src, SVFVar* dst, SVFStmt* edge);
@@ -94,12 +95,6 @@ protected:
             inserted.first->second.emplace(edge);
         }
     }
-    /// get MemObj according to LLVM value
-    inline const MemObj* getMemObj(const SVFValue* val) const
-    {
-        return symInfo->getObj(symInfo->getObjSym(val));
-    }
-
 public:
     IRGraph(bool buildFromFile)
         : fromFile(buildFromFile), nodeNumAfterPAGBuild(0), totalPTAPAGEdge(0)
@@ -174,14 +169,6 @@ public:
     {
         return symInfo->nullPtrSymID();
     }
-    inline const MemObj* getBlackHoleObj() const
-    {
-        return symInfo->getBlkObj();
-    }
-    inline const MemObj* getConstantObj() const
-    {
-        return symInfo->getConstantObj();
-    }
 
     inline u32_t getValueNodeNum() const
     {
@@ -189,7 +176,7 @@ public:
     }
     inline u32_t getObjectNodeNum() const
     {
-        return symInfo->idToObjMap().size();
+        return symInfo->idToObjTypeInfoMap().size();
     }
     inline u32_t getNodeNumAfterPAGBuild() const
     {

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

@@ -309,9 +309,9 @@ public:
 
     inline bool isArrayMemObj(NodeID id) const
     {
-        const MemObj* mem = pag->getObject(id);
-        assert(mem && "memory object is null??");
-        return mem->isArray();
+        const BaseObjVar* obj = pag->getBaseObject(id);
+        assert(obj && "base object is null??");
+        return obj->isArray();
     }
     //@}
 
@@ -339,13 +339,13 @@ public:
     }
     inline void setObjFieldInsensitive(NodeID id)
     {
-        MemObj* mem =  const_cast<MemObj*>(pag->getBaseObj(id));
-        mem->setFieldInsensitive();
+        BaseObjVar* baseObj = const_cast<BaseObjVar*>(pag->getBaseObject(id));
+        baseObj->setFieldInsensitive();
     }
     inline bool isFieldInsensitive(NodeID id) const
     {
-        const MemObj* mem =  pag->getBaseObj(id);
-        return mem->isFieldInsensitive();
+        const BaseObjVar* baseObj = pag->getBaseObject(id);
+        return baseObj->isFieldInsensitive();
     }
     ///@}
 

package/SVF-osx/Release-build/include/SVF-LLVM/SymbolTableBuilder.h

@@ -118,9 +118,9 @@ protected:
     ///Get a reference to StructInfo.
     StInfo* getOrAddSVFTypeInfo(const Type* T);
 
-    MemObj* createBlkObj(SymID symId);
+    ObjTypeInfo* createBlkObjTypeInfo(SymID symId);
 
-    MemObj* createConstantObj(SymID symId);
+    ObjTypeInfo* createConstantObjTypeInfo(SymID symId);
 };
 
 } // End namespace SVF

package/SVF-osx/Release-build/include/SVFIR/SVFFileSystem.h

@@ -129,8 +129,6 @@ class SVFMetadataAsValue;
 
 class SVFLoopAndDomInfo; // Part of SVFFunction
 
-// Classes created upon buildSymbolTableInfo
-class MemObj;
 
 // Classes created upon ICFG construction
 class ICFGNode;
@@ -422,7 +420,6 @@ private:
 
     cJSON* toJson(const AccessPath& ap);
     cJSON* toJson(const SVFLoop* loop);
-    cJSON* toJson(const MemObj* memObj);
     cJSON* toJson(const ObjTypeInfo* objTypeInfo);  // Only owned by MemObj
     cJSON* toJson(const SVFLoopAndDomInfo* ldInfo); // Only owned by SVFFunction
     cJSON* toJson(const StInfo* stInfo);
@@ -528,7 +525,6 @@ private:
 
     // Other classes
     cJSON* contentToJson(const SVFLoop* loop);
-    cJSON* contentToJson(const MemObj* memObj); // Owned by SymbolTable->objMap
     cJSON* contentToJson(const StInfo* stInfo);
     ///@}
 
@@ -899,13 +895,8 @@ class SymbolTableInfoReader
 
 private:
     const cJSON* symTabFieldJson = nullptr;
-    ReaderIDToObjMap<MemObj> memObjMap;
 
 public:
-    inline MemObj* getMemObjPtr(unsigned id) const
-    {
-        return memObjMap.getPtr(id);
-    }
 
     template <typename MemObjCreator>
     void createObjs(const cJSON* symTabJson, MemObjCreator memObjCreator)
@@ -915,7 +906,6 @@ public:
 
         const cJSON* const allMemObj = symTabJson->child;
         CHECK_JSON_KEY(allMemObj);
-        memObjMap.createObjs(allMemObj, memObjCreator);
 
         symTabFieldJson = allMemObj->next;
     }
@@ -1104,7 +1094,6 @@ private:
 
     void readJson(const cJSON* obj, AccessPath& ap);
     void readJson(const cJSON* obj, SVFLoop*& loop);
-    void readJson(const cJSON* obj, MemObj*& memObj);
     void readJson(const cJSON* obj,
                   ObjTypeInfo*& objTypeInfo); // Only owned by MemObj
     void readJson(const cJSON* obj,
@@ -1257,7 +1246,6 @@ private:
     void fill(const cJSON*& fieldJson, TDForkPE* stmt);
     void fill(const cJSON*& fieldJson, TDJoinPE* stmt);
 
-    void fill(const cJSON*& fieldJson, MemObj* memObj);
     void fill(const cJSON*& fieldJson, StInfo* stInfo);
     // ICFG
     void virtFill(const cJSON*& fieldJson, ICFGNode* node);