svf-lib 1.0.2182 → 1.0.2184

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

@@ -37,9 +37,9 @@
 namespace SVF
 {
 
-class MemObj;
 class ObjTypeInfo;
 class StInfo;
+class BaseObjVar;
 
 /*!
  * Symbol table of the memory model for analysis
@@ -70,8 +70,9 @@ public:
     /// llvm value to sym id map
     /// local (%) and global (@) identifiers are pointer types which have a value node id.
     typedef OrderedMap<const SVFValue*, SymID> ValueToIDMapTy;
-    /// sym id to memory object map
-    typedef OrderedMap<SymID, MemObj*> IDToMemMapTy;
+    /// sym id to obj type info map
+    typedef OrderedMap<SymID, ObjTypeInfo*> IDToTypeInfoMapTy;
+
     /// function to sym id map
     typedef OrderedMap<const SVFFunction*, SymID> FunToIDMapTy;
     /// struct type to struct info map
@@ -83,7 +84,7 @@ private:
     ValueToIDMapTy objSymMap;  ///< map a obj reference to its sym id
     FunToIDMapTy returnSymMap; ///< return map
     FunToIDMapTy varargSymMap; ///< vararg map
-    IDToMemMapTy objMap;       ///< map a memory sym id to its obj
+    IDToTypeInfoMapTy objTypeInfoMap;       ///< map a memory sym id to its obj
 
     // Singleton pattern here to enable instance of SymbolTableInfo can only be created once.
     static SymbolTableInfo* symInfo;
@@ -171,15 +172,6 @@ public:
         return (isBlkObj(id) || isConstantObj(id));
     }
 
-    inline MemObj* getBlkObj() const
-    {
-        return getObj(blackholeSymID());
-    }
-    inline MemObj* getConstantObj() const
-    {
-        return getObj(constantSymID());
-    }
-
     inline SymID blkPtrSymID() const
     {
         return BlkPtr;
@@ -200,10 +192,6 @@ public:
         return BlackHole;
     }
 
-    /// Can only be invoked by SVFIR::addDummyNode() when creating SVFIR from file.
-    const MemObj* createDummyObj(SymID symId, const SVFType* type);
-    // @}
-
     /// Get different kinds of syms
     //@{
     SymID getValSym(const SVFValue* val);
@@ -220,10 +208,10 @@ public:
         return iter->second;
     }
 
-    inline MemObj* getObj(SymID id) const
+    inline ObjTypeInfo* getObjTypeInfo(SymID id) const
     {
-        IDToMemMapTy::const_iterator iter = objMap.find(id);
-        assert(iter!=objMap.end() && "obj not found");
+        IDToTypeInfoMapTy::const_iterator iter = objTypeInfoMap.find(id);
+        assert(iter!=objTypeInfoMap.end() && "obj type info not found");
         return iter->second;
     }
 
@@ -267,14 +255,14 @@ public:
         return objSymMap;
     }
 
-    inline IDToMemMapTy& idToObjMap()
+    inline IDToTypeInfoMapTy& idToObjTypeInfoMap()
     {
-        return objMap;
+        return objTypeInfoMap;
     }
 
-    inline const IDToMemMapTy& idToObjMap() const
+    inline const IDToTypeInfoMapTy& idToObjTypeInfoMap() const
     {
-        return objMap;
+        return objTypeInfoMap;
     }
 
     inline FunToIDMapTy& retSyms()
@@ -311,6 +299,11 @@ public:
         return svfTypes.find(T) != svfTypes.end();
     }
 
+    /// Create an objectInfo based on LLVM type (value is null, and type could be null, representing a dummy object)
+    ObjTypeInfo* createObjTypeInfo(const SVFType* type);
+
+    const ObjTypeInfo* createDummyObjTypeInfo(SymID symId, const SVFType* type);
+
     ///Get a reference to the components of struct_info.
     /// Number of flattened elements of an array or struct
     u32_t getNumOfFlattenElements(const SVFType* T);
@@ -333,8 +326,7 @@ public:
     virtual void dump();
 
     /// Given an offset from a Gep Instruction, return it modulus offset by considering memory layout
-    virtual APOffset getModulusOffset(const MemObj* obj,
-                                      const APOffset& apOffset);
+    virtual APOffset getModulusOffset(const BaseObjVar* baseObj, const APOffset& apOffset);
 
     ///The struct type with the most fields
     const SVFType* maxStruct;
@@ -359,9 +351,6 @@ protected:
     /// Return the flattened field type for struct type only
     const std::vector<const SVFType*>& getFlattenFieldTypes(const SVFStructType *T);
 
-    /// Create an objectInfo based on LLVM type (value is null, and type could be null, representing a dummy object)
-    ObjTypeInfo* createObjTypeInfo(const SVFType* type);
-
     /// (owned) All SVF Types
     /// Every type T is mapped to StInfo
     /// which contains size (fsize) , offset(foffset)
@@ -375,113 +364,6 @@ protected:
 
 class SVFBaseNode;
 
-/*!
- * Memory object symbols or MemObj (address-taken variables in LLVM-based languages)
- */
-class MemObj
-{
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-    friend class SVFIRBuilder;
-
-private:
-    /// Type information of this object
-    ObjTypeInfo* typeInfo;
-    /// The unique value of this symbol/variable
-    const SVFValue* refVal;
-    /// The unique id to represent this symbol
-    SymID symId;
-
-    const SVFBaseNode* gNode;
-
-public:
-    /// Constructor
-    MemObj(SymID id, ObjTypeInfo* ti, const SVFValue* val = nullptr, const SVFBaseNode* node = nullptr);
-
-    /// Destructor
-    virtual ~MemObj()
-    {
-        destroy();
-    }
-
-    virtual const std::string toString() const;
-
-    /// Get the reference value to this object
-    inline const SVFValue* getValue() const
-    {
-        return refVal;
-    }
-
-    /// Get the reference value to this object
-    inline const SVFBaseNode* getGNode() const
-    {
-        return gNode;
-    }
-
-    /// Get the memory object id
-    inline SymID getId() const
-    {
-        return symId;
-    }
-
-    /// Get obj type
-    const SVFType* getType() const;
-
-    /// Get the number of elements of this object
-    u32_t getNumOfElements() const;
-
-    /// Set the number of elements of this object
-    void setNumOfElements(u32_t num);
-
-    /// Get max field offset limit
-    u32_t getMaxFieldOffsetLimit() const;
-
-    /// Return true if its field limit is 0
-    bool isFieldInsensitive() const;
-
-    /// Set the memory object to be field insensitive
-    void setFieldInsensitive();
-
-    /// Set the memory object to be field sensitive (up to max field limit)
-    void setFieldSensitive();
-
-    /// Whether it is a black hole object
-    bool isBlackHoleObj() const;
-
-    /// Get the byte size of this object
-    u32_t getByteSizeOfObj() const;
-
-    /// Check if byte size is a const value
-    bool isConstantByteSize() const;
-
-
-    /// object attributes methods
-    //@{
-    bool isFunction() const;
-    bool isGlobalObj() const;
-    bool isStaticObj() const;
-    bool isStack() const;
-    bool isHeap() const;
-    bool isStruct() const;
-    bool isArray() const;
-    bool isVarStruct() const;
-    bool isVarArray() const;
-    bool isConstantStruct() const;
-    bool isConstantArray() const;
-    bool isConstDataOrConstGlobal() const;
-    bool isConstDataOrAggData() const;
-    //@}
-
-    /// Operator overloading
-    inline bool operator==(const MemObj& mem) const
-    {
-        return getValue() == mem.getValue();
-    }
-
-    /// Clean up memory
-    void destroy();
-};
-
 /*!
  * Type Info of an abstract memory object
  */

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);