svf-lib 1.0.849 → 1.0.853

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

@@ -292,20 +292,7 @@ public:
     //@}
 
     /// Due to constaint expression, curInst is used to distinguish different instructions (e.g., memorycpy) when creating GepValVar.
-    inline NodeID getGepValVar(const Value* curInst, NodeID base, const LocationSet& ls) const
-    {
-        GepValueVarMap::const_iterator iter = GepValObjMap.find(curInst);
-        if(iter==GepValObjMap.end()){
-            return UINT_MAX;
-        }
-        else{
-            NodeLocationSetMap::const_iterator lit = iter->second.find(std::make_pair(base, ls));
-            if(lit==iter->second.end())
-                return UINT_MAX;
-            else
-                return lit->second;
-        }
-    }
+    NodeID getGepValVar(const Value* curInst, NodeID base, const LocationSet& ls) const;
 
     /// Add/get indirect callsites
     //@{
@@ -411,27 +398,8 @@ public:
         assert(obj && "not an object node?");
         return SymbolTableInfo::isConstantObj(id) || obj->isConstDataOrConstGlobal();
     }
-    inline bool isNonPointerObj(NodeID id) const
-    {
-        SVFVar* node = getGNode(id);
-        if (FIObjVar* fiNode = SVFUtil::dyn_cast<FIObjVar>(node))
-        {
-            return (fiNode->getMemObj()->hasPtrObj() == false);
-        }
-        else if (GepObjVar* gepNode = SVFUtil::dyn_cast<GepObjVar>(node))
-        {
-            return (gepNode->getMemObj()->isNonPtrFieldObj(gepNode->getLocationSet()));
-        }
-        else if (SVFUtil::isa<DummyObjVar>(node))
-        {
-            return false;
-        }
-        else
-        {
-            assert(false && "expecting a object node");
-            return false;
-        }
-    }
+    /// Whether an object can point to any other object or any of its fields is a pointer type.
+    bool isNonPointerObj(NodeID id) const;
     //@}
 
     /// Base and Offset methods for Value and Object node
@@ -462,7 +430,7 @@ public:
     {
         return addDummyValNode(NodeIDAllocator::get()->allocateValueId());
     }
-    inline NodeID addDummyObjNode(const Type* type = nullptr)
+    inline NodeID addDummyObjNode(const Type* type)
     {
         return addDummyObjNode(NodeIDAllocator::get()->allocateObjectId(), type);
     }

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

@@ -81,8 +81,7 @@ protected:
     const Value* value; ///< value of this SVFIR node
     SVFStmt::KindToSVFStmtMapTy InEdgeKindToSetMap;
     SVFStmt::KindToSVFStmtMapTy OutEdgeKindToSetMap;
-    bool isTLPointer;	/// top-level pointer
-    bool isATPointer;	/// address-taken pointer
+    bool isPtr;	/// whether it is a pointer (top-level or address-taken)
 
 public:
     /// Constructor
@@ -117,17 +116,7 @@ public:
     /// Whether it is a pointer
     virtual inline bool isPointer() const
     {
-        return isTopLevelPtr() || isAddressTakenPtr();
-    }
-    /// Whether it is a top-level pointer
-    inline bool isTopLevelPtr() const
-    {
-        return isTLPointer;
-    }
-    /// Whether it is an address-taken pointer
-    inline bool isAddressTakenPtr() const
-    {
-        return isATPointer;
+        return isPtr;
     }
     /// Whether it is constant data, i.e., "0", "1.001", "str"
     /// or llvm's metadata, i.e., metadata !4087

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

@@ -389,7 +389,7 @@ protected:
     virtual void collectSimpleTypeInfo(const Type* T);
 
     /// Create an objectInfo based on LLVM type (value is null, and type could be null, representing a dummy object)
-    ObjTypeInfo* createObjTypeInfo(const Type *type = nullptr);
+    ObjTypeInfo* createObjTypeInfo(const Type *type);
 
     /// Every type T is mapped to StInfo
     /// which contains size (fsize) , offset(foffset)
@@ -592,7 +592,7 @@ public:
  */
 class ObjTypeInfo
 {
-
+friend class SymbolTableBuilder;
 public:
     typedef enum
     {
@@ -619,30 +619,18 @@ private:
     /// maximum number of field object can be created
     /// minimum number is 0 (field insensitive analysis)
     u32_t maxOffsetLimit;
+
+    void resetTypeForHeapStaticObj(const Type* type);
 public:
 
     /// Constructors
-    ObjTypeInfo(const Value*, const Type* t, u32_t max) :
-        type(t), flags(0), maxOffsetLimit(max)
-    {
-    }
-    /// Constructor
-    ObjTypeInfo(u32_t max, const Type* t) : type(t), flags(0), maxOffsetLimit(max)
-    {
+    ObjTypeInfo(const Type* t, u32_t max);
 
-    }
     /// Destructor
     virtual ~ObjTypeInfo()
     {
-
     }
-
-    /// Analyse types of heap and static objects
-    void analyzeHeapObjType(const Type* type);
-
-    /// Analyse types of heap and static objects
-    void analyzeStaticObjType(const Type* type);
-
+    
     /// Get LLVM type
     inline const Type* getType() const
     {

package/SVF-linux/include/SVF-FE/SymbolTableBuilder.h

@@ -79,7 +79,14 @@ public:
     /// Initialize TypeInfo based on LLVM Value
     void initTypeInfo(ObjTypeInfo* typeinfo, const Value* value);
     /// Analyse types of all flattened fields of this object
-    void analyzeGlobalStackObjType(ObjTypeInfo* typeinfo, const Value* val);
+    void analyzeObjType(ObjTypeInfo* typeinfo, const Value* val);
+    /// Analyse types of heap and static objects
+    void analyzeHeapObjType(ObjTypeInfo* typeinfo, const Value* val);
+    /// Analyse types of heap and static objects
+    void analyzeStaticObjType(ObjTypeInfo* typeinfo, const Value* val);
+    /// Return the bitcast instruction which is val's only use site, otherwise return nullptr
+    const Value* getUniqueUseViaCastInst(const Value* val);
+
     /// Return size of this object based on LLVM value
     u32_t getObjSize(const Value* val);
 };

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

@@ -292,20 +292,7 @@ public:
     //@}
 
     /// Due to constaint expression, curInst is used to distinguish different instructions (e.g., memorycpy) when creating GepValVar.
-    inline NodeID getGepValVar(const Value* curInst, NodeID base, const LocationSet& ls) const
-    {
-        GepValueVarMap::const_iterator iter = GepValObjMap.find(curInst);
-        if(iter==GepValObjMap.end()){
-            return UINT_MAX;
-        }
-        else{
-            NodeLocationSetMap::const_iterator lit = iter->second.find(std::make_pair(base, ls));
-            if(lit==iter->second.end())
-                return UINT_MAX;
-            else
-                return lit->second;
-        }
-    }
+    NodeID getGepValVar(const Value* curInst, NodeID base, const LocationSet& ls) const;
 
     /// Add/get indirect callsites
     //@{
@@ -411,27 +398,8 @@ public:
         assert(obj && "not an object node?");
         return SymbolTableInfo::isConstantObj(id) || obj->isConstDataOrConstGlobal();
     }
-    inline bool isNonPointerObj(NodeID id) const
-    {
-        SVFVar* node = getGNode(id);
-        if (FIObjVar* fiNode = SVFUtil::dyn_cast<FIObjVar>(node))
-        {
-            return (fiNode->getMemObj()->hasPtrObj() == false);
-        }
-        else if (GepObjVar* gepNode = SVFUtil::dyn_cast<GepObjVar>(node))
-        {
-            return (gepNode->getMemObj()->isNonPtrFieldObj(gepNode->getLocationSet()));
-        }
-        else if (SVFUtil::isa<DummyObjVar>(node))
-        {
-            return false;
-        }
-        else
-        {
-            assert(false && "expecting a object node");
-            return false;
-        }
-    }
+    /// Whether an object can point to any other object or any of its fields is a pointer type.
+    bool isNonPointerObj(NodeID id) const;
     //@}
 
     /// Base and Offset methods for Value and Object node
@@ -462,7 +430,7 @@ public:
     {
         return addDummyValNode(NodeIDAllocator::get()->allocateValueId());
     }
-    inline NodeID addDummyObjNode(const Type* type = nullptr)
+    inline NodeID addDummyObjNode(const Type* type)
     {
         return addDummyObjNode(NodeIDAllocator::get()->allocateObjectId(), type);
     }

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

@@ -81,8 +81,7 @@ protected:
     const Value* value; ///< value of this SVFIR node
     SVFStmt::KindToSVFStmtMapTy InEdgeKindToSetMap;
     SVFStmt::KindToSVFStmtMapTy OutEdgeKindToSetMap;
-    bool isTLPointer;	/// top-level pointer
-    bool isATPointer;	/// address-taken pointer
+    bool isPtr;	/// whether it is a pointer (top-level or address-taken)
 
 public:
     /// Constructor
@@ -117,17 +116,7 @@ public:
     /// Whether it is a pointer
     virtual inline bool isPointer() const
     {
-        return isTopLevelPtr() || isAddressTakenPtr();
-    }
-    /// Whether it is a top-level pointer
-    inline bool isTopLevelPtr() const
-    {
-        return isTLPointer;
-    }
-    /// Whether it is an address-taken pointer
-    inline bool isAddressTakenPtr() const
-    {
-        return isATPointer;
+        return isPtr;
     }
     /// Whether it is constant data, i.e., "0", "1.001", "str"
     /// or llvm's metadata, i.e., metadata !4087

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

@@ -389,7 +389,7 @@ protected:
     virtual void collectSimpleTypeInfo(const Type* T);
 
     /// Create an objectInfo based on LLVM type (value is null, and type could be null, representing a dummy object)
-    ObjTypeInfo* createObjTypeInfo(const Type *type = nullptr);
+    ObjTypeInfo* createObjTypeInfo(const Type *type);
 
     /// Every type T is mapped to StInfo
     /// which contains size (fsize) , offset(foffset)
@@ -592,7 +592,7 @@ public:
  */
 class ObjTypeInfo
 {
-
+friend class SymbolTableBuilder;
 public:
     typedef enum
     {
@@ -619,30 +619,18 @@ private:
     /// maximum number of field object can be created
     /// minimum number is 0 (field insensitive analysis)
     u32_t maxOffsetLimit;
+
+    void resetTypeForHeapStaticObj(const Type* type);
 public:
 
     /// Constructors
-    ObjTypeInfo(const Value*, const Type* t, u32_t max) :
-        type(t), flags(0), maxOffsetLimit(max)
-    {
-    }
-    /// Constructor
-    ObjTypeInfo(u32_t max, const Type* t) : type(t), flags(0), maxOffsetLimit(max)
-    {
+    ObjTypeInfo(const Type* t, u32_t max);
 
-    }
     /// Destructor
     virtual ~ObjTypeInfo()
     {
-
     }
-
-    /// Analyse types of heap and static objects
-    void analyzeHeapObjType(const Type* type);
-
-    /// Analyse types of heap and static objects
-    void analyzeStaticObjType(const Type* type);
-
+    
     /// Get LLVM type
     inline const Type* getType() const
     {

package/SVF-osx/include/SVF-FE/SymbolTableBuilder.h

@@ -79,7 +79,14 @@ public:
     /// Initialize TypeInfo based on LLVM Value
     void initTypeInfo(ObjTypeInfo* typeinfo, const Value* value);
     /// Analyse types of all flattened fields of this object
-    void analyzeGlobalStackObjType(ObjTypeInfo* typeinfo, const Value* val);
+    void analyzeObjType(ObjTypeInfo* typeinfo, const Value* val);
+    /// Analyse types of heap and static objects
+    void analyzeHeapObjType(ObjTypeInfo* typeinfo, const Value* val);
+    /// Analyse types of heap and static objects
+    void analyzeStaticObjType(ObjTypeInfo* typeinfo, const Value* val);
+    /// Return the bitcast instruction which is val's only use site, otherwise return nullptr
+    const Value* getUniqueUseViaCastInst(const Value* val);
+
     /// Return size of this object based on LLVM value
     u32_t getObjSize(const Value* val);
 };

package/package.json

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