svf-lib 1.0.725 → 1.0.729

package/SVF-linux/include/Util/NodeIDAllocator.h

@@ -68,7 +68,7 @@ public:
     NodeID allocateValueId(void);
 
     /// Notify the allocator that all symbols have had IDs allocated.
-    void endSymbolAllocation(void);
+    NodeID endSymbolAllocation(void);
 
     /// Returns the total number of memory objects.
     NodeID getNumObjects(void) const { return numObjects; }

package/SVF-linux/include/Util/SVFUtil.h

@@ -241,6 +241,17 @@ inline const SVFFunction* getFunction(StringRef name)
     return nullptr;
 }
 
+/// find the unique defined global across multiple modules
+inline const Value* getGlobalRep(const Value* val) 
+{
+    if(const GlobalVariable* gvar = SVFUtil::dyn_cast<GlobalVariable>(val))
+    {
+        if (LLVMModuleSet::getLLVMModuleSet()->hasGlobalRep(gvar))
+            val = LLVMModuleSet::getLLVMModuleSet()->getGlobalRep(gvar);
+    }
+    return val;
+}
+
 /// Get the definition of a function across multiple modules
 inline const SVFFunction* getDefFunForMultipleModule(const Function* fun)
 {

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

@@ -40,7 +40,6 @@
 namespace SVF
 {
 
-class PTAType;
 class SVFModule;
 
 /*!
@@ -464,94 +463,6 @@ protected:
 };
 
 
-
-/**
- * Wave propagation with diff points-to set with type filter.
- */
-class AndersenWaveDiffWithType : public AndersenWaveDiff
-{
-
-private:
-
-    typedef Map<NodeID, Set<const GepCGEdge*>> TypeMismatchedObjToEdgeTy;
-
-    TypeMismatchedObjToEdgeTy typeMismatchedObjToEdges;
-
-    void recordTypeMismatchedGep(NodeID obj, const GepCGEdge* gepEdge)
-    {
-        TypeMismatchedObjToEdgeTy::iterator it = typeMismatchedObjToEdges.find(obj);
-        if (it != typeMismatchedObjToEdges.end())
-        {
-            Set<const GepCGEdge*> &edges = it->second;
-            edges.insert(gepEdge);
-        }
-        else
-        {
-            Set<const GepCGEdge*> edges;
-            edges.insert(gepEdge);
-            typeMismatchedObjToEdges[obj] = edges;
-        }
-    }
-
-    static AndersenWaveDiffWithType* diffWaveWithType; // static instance
-
-    /// Handle diff points-to set.
-    //@{
-    virtual inline void computeDiffPts(NodeID id)
-    {
-        NodeID rep = sccRepNode(id);
-        getDiffPTDataTy()->computeDiffPts(rep, getDiffPTDataTy()->getPts(rep));
-    }
-    virtual inline const PointsTo& getDiffPts(NodeID id)
-    {
-        NodeID rep = sccRepNode(id);
-        return getDiffPTDataTy()->getDiffPts(rep);
-    }
-    //@}
-
-public:
-    AndersenWaveDiffWithType(PAG* _pag, PTATY type = AndersenWaveDiffWithType_WPA): AndersenWaveDiff(_pag,type)
-    {
-        assert(getTypeSystem()!=nullptr && "a type system is required for this pointer analysis");
-    }
-
-    /// Create an singleton instance directly instead of invoking llvm pass manager
-    static AndersenWaveDiffWithType* createAndersenWaveDiffWithType(PAG* p)
-    {
-        if(diffWaveWithType==nullptr)
-        {
-            diffWaveWithType = new AndersenWaveDiffWithType(p);
-            diffWaveWithType->analyze();
-            return diffWaveWithType;
-        }
-        return diffWaveWithType;
-    }
-    static void releaseAndersenWaveDiffWithType()
-    {
-        if (diffWaveWithType)
-            delete diffWaveWithType;
-        diffWaveWithType = nullptr;
-    }
-
-protected:
-    /// SCC detection
-    virtual NodeStack& SCCDetect();
-    /// merge types of nodes in a cycle
-    void mergeTypeOfNodes(const NodeBS &nodes);
-    /// process "bitcast" CopyCGEdge
-    virtual void processCast(const ConstraintEdge *edge);
-    /// update type of objects when process "bitcast" CopyCGEdge
-    void updateObjType(const Type *type, const PointsTo &objs);
-    /// process mismatched gep edges
-    void processTypeMismatchedGep(NodeID obj, const Type *type);
-    /// match types for Gep Edges
-    virtual bool matchType(NodeID ptrid, NodeID objid, const NormalGepCGEdge *normalGepEdge);
-    /// add type for newly created GepObjNode
-    virtual void addTypeForGepObjNode(NodeID id, const NormalGepCGEdge* normalGepEdge);
-};
-
-
-
 /*
  * Lazy Cycle Detection Based Andersen Analysis
  */

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

@@ -172,18 +172,12 @@ public:
     {
 
     }
-    /// Initialize the object type
-    void init(const Value* value);
 
-    /// Get the size of this object,
-    /// derived classes can override this to get more precise object size
-    virtual u32_t getObjSize(const Value* val);
-
-    /// Analyse types of gobal and stack objects
-    void analyzeGlobalStackObjType(const Value* val);
+    /// Analyse types of heap and static objects
+    void analyzeHeapObjType(const Type* type);
 
     /// Analyse types of heap and static objects
-    void analyzeHeapStaticObjType(const Value* val);
+    void analyzeStaticObjType(const Type* type);
 
     /// Get LLVM type
     inline const Type* getType() const
@@ -295,25 +289,15 @@ private:
 public:
 
     /// Constructor
-    MemObj(const Value *val, SymID id);
-
-    /// Constructor for black hole and constant obj
-    MemObj(SymID id, const Type* type = nullptr);
+    MemObj(SymID id, ObjTypeInfo* ti, const Value *val = nullptr);
 
     /// Destructor
     ~MemObj()
     {
         destroy();
     }
-
-    /// Initialize the object
-    void init(const Value *val);
-
-    /// Initialize black hole and constant object
-    void init(const Type* type);
-
     /// Get obj type
-    const llvm::Type* getType() const;
+    const Type* getType() const;
 
     /// Get max field offset limit
     inline Size_t getMaxFieldOffsetLimit() const

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

@@ -0,0 +1,102 @@
+//===- LocMemModel.h -- Memory model builder-----------------------//
+//
+//                     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/>.
+//
+//===----------------------------------------------------------------------===//
+
+/*
+ * MemModelBuilder.h
+ *
+ *  Created on: Apr 28, 2014
+ *      Author: Yulei
+ */
+
+#ifndef MEMMODELBUILDER_H_
+#define MEMMODELBUILDER_H_
+
+#include "MemoryModel/MemModel.h"
+#include "SVF-FE/LLVMModule.h"
+#include "SVF-FE/SymbolTableInfo.h"
+
+/*
+* This class is to build SymbolTableInfo, MemObjs and ObjTypeInfo
+*/
+namespace SVF
+{
+
+class MemModelBuilder 
+{
+
+private:
+    SymbolTableInfo* symInfo;
+
+public:
+    /// Constructor
+    MemModelBuilder(SymbolTableInfo* si): symInfo(si){
+
+    }
+
+    /// Start building memory model
+    void buildMemModel(SVFModule* svfModule);
+
+    /// collect the syms
+    //@{
+    void collectSym(const Value *val);
+
+    void collectVal(const Value *val);
+
+    void collectObj(const Value *val);
+
+    void collectRet(const Function *val);
+
+    void collectVararg(const Function *val);
+    //@}
+
+    /// Handle constant expression
+    // @{
+    void handleGlobalCE(const GlobalVariable *G);
+    void handleGlobalInitializerCE(const Constant *C, u32_t offset);
+    void handleCE(const Value *val);
+    // @}
+
+
+    //     /// Collect the struct info
+    // virtual void collectStructInfo(const StructType *T);
+    // /// Collect the array info
+    // virtual void collectArrayInfo(const ArrayType* T);
+    // /// Collect simple type (non-aggregate) info
+    // virtual void collectSimpleTypeInfo(const Type* T);
+
+    /// Create an objectInfo based on LLVM value
+    ObjTypeInfo* createObjTypeInfo(const Value *val);
+    /// 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);
+
+    /// 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);
+    /// Return size of this object based on LLVM value
+    u32_t getObjSize(const Value* val);
+
+};
+
+}
+
+#endif /* MEMMODELBUILDER_H_ */

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

@@ -42,6 +42,8 @@ namespace SVF
 class SymbolTableInfo
 {
 
+friend class MemModelBuilder;
+
 public:
     /// various maps defined
     //{@
@@ -142,6 +144,11 @@ public:
     {
         return mod;
     }
+        /// Module
+    inline void setModule(SVFModule* m)
+    {
+        mod = m;
+    }
 
     /// Get target machine data layout
     inline static DataLayout* getDataLayout(Module* mod)
@@ -157,22 +164,6 @@ public:
     u32_t getTypeSizeInBytes(const StructType *sty, u32_t field_index);
     //@}
 
-    /// Start building memory model
-    void buildMemModel(SVFModule* svfModule);
-
-    /// collect the syms
-    //@{
-    void collectSym(const Value *val);
-
-    void collectVal(const Value *val);
-
-    void collectObj(const Value *val);
-
-    void collectRet(const Function *val);
-
-    void collectVararg(const Function *val);
-    //@}
-
     /// special value
     // @{
     static bool isNullPtrSym(const Value *val);
@@ -206,7 +197,7 @@ public:
     {
         assert(isBlkObjOrConstantObj(symId));
         assert(objMap.find(symId)==objMap.end());
-        objMap[symId] = new MemObj(symId);;
+        objMap[symId] = new MemObj(symId, createObjTypeInfo());;
     }
 
     inline MemObj* getBlkObj() const
@@ -242,19 +233,12 @@ public:
     inline const MemObj* createDummyObj(SymID symId, const Type* type)
     {
         assert(objMap.find(symId)==objMap.end() && "this dummy obj has been created before");
-        MemObj* memObj = new MemObj(symId, type);
+        MemObj* memObj = new MemObj(symId, createObjTypeInfo(type));
         objMap[symId] = memObj;
         return memObj;
     }
     // @}
 
-    /// Handle constant expression
-    // @{
-    void handleGlobalCE(const GlobalVariable *G);
-    void handleGlobalInitializerCE(const Constant *C, u32_t offset);
-    void handleCE(const Value *val);
-    // @}
-
     /// Get different kinds of syms
     //@{
     SymID getValSym(const Value *val)
@@ -433,6 +417,9 @@ protected:
     /// Collect simple type (non-aggregate) info
     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);
+
     /// Every type T is mapped to StInfo
     /// which contains size (fsize) , offset(foffset)
     /// fsize[i] is the number of fields in the largest such struct, else fsize[i] = 1.
@@ -447,60 +434,6 @@ protected:
 };
 
 
-
-
-/*!
- * Bytes/bits-level modeling of memory locations to handle weakly type languages.
- * (declared with one type but accessed as another)
- * Abstract memory objects are created according to the static allocated size.
- */
-class LocSymTableInfo : public SymbolTableInfo
-{
-
-public:
-    /// Constructor
-    LocSymTableInfo()
-    {
-    }
-    /// Destructor
-    virtual ~LocSymTableInfo()
-    {
-    }
-    /// Compute gep offset
-    virtual bool computeGepOffset(const User *V, LocationSet& ls);
-    /// Given an offset from a Gep Instruction, return it modulus offset by considering memory layout
-    virtual LocationSet getModulusOffset(const MemObj* obj, const LocationSet& ls);
-
-    /// Verify struct size construction
-    void verifyStructSize(StInfo *stInfo, u32_t structSize);
-
-protected:
-    /// Collect the struct info
-    virtual void collectStructInfo(const StructType *T);
-    /// Collect the array info
-    virtual void collectArrayInfo(const ArrayType *T);
-};
-
-
-class LocObjTypeInfo : public ObjTypeInfo
-{
-
-public:
-    /// Constructor
-    LocObjTypeInfo(const Value* val, Type* t, Size_t max) : ObjTypeInfo(val,t,max)
-    {
-
-    }
-    /// Destructor
-    virtual ~LocObjTypeInfo()
-    {
-
-    }
-    /// Get the size of this object
-    u32_t getObjSize(const Value* val);
-
-};
-
 } // End namespace SVF
 
 #endif /* INCLUDE_SVF_FE_SYMBOLTABLEINFO_H_ */

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

@@ -68,7 +68,7 @@ public:
     NodeID allocateValueId(void);
 
     /// Notify the allocator that all symbols have had IDs allocated.
-    void endSymbolAllocation(void);
+    NodeID endSymbolAllocation(void);
 
     /// Returns the total number of memory objects.
     NodeID getNumObjects(void) const { return numObjects; }

package/package.json

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