svf-lib 1.0.2195 → 1.0.2197

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

@@ -76,7 +76,7 @@ public:
 private:
     static LLVMModuleSet* llvmModuleSet;
     static bool preProcessed;
-    SymbolTableInfo* symInfo;
+    SVFIR* svfir;
     SVFModule* svfModule; ///< Borrowed from singleton SVFModule::svfModule
     ICFG* icfg;
     std::unique_ptr<LLVMContext> owned_ctx;

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

@@ -31,7 +31,7 @@
 #define SymbolTableBuilder_H_
 
 #include "SVF-LLVM/LLVMModule.h"
-#include "SVFIR/SymbolTableInfo.h"
+#include "SVFIR/ObjTypeInfo.h"
 
 /*
 * This class is to build SymbolTableInfo, MemObjs and ObjTypeInfo
@@ -45,11 +45,11 @@ class SymbolTableBuilder
 {
     friend class SVFIRBuilder;
 private:
-    SymbolTableInfo* symInfo;
+    SVFIR* svfir;
 
 public:
     /// Constructor
-    SymbolTableBuilder(SymbolTableInfo* si): symInfo(si)
+    SymbolTableBuilder(SVFIR* ir): svfir(ir)
     {
     }
 

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

@@ -0,0 +1,225 @@
+//===- ObjTypeInfo.h -- Object type information------------------------//
+//
+//                     SVF: Static Value-Flow Analysis
+//
+// Copyright (C) <2013->  <Yulei Sui>
+//
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//===----------------------------------------------------------------------===//
+
+/*
+ * ObjTypeInfo.h
+ *
+ *  Created on: Nov 11, 2013
+ *      Author: Yulei Sui
+ */
+
+#ifndef INCLUDE_SVFIR_OBJTYPEINFO_H_
+#define INCLUDE_SVFIR_OBJTYPEINFO_H_
+
+
+#include "Util/SVFUtil.h"
+#include "MemoryModel/AccessPath.h"
+#include "SVFIR/SVFModule.h"
+namespace SVF
+{
+
+/*!
+ * Type Info of an abstract memory object
+ */
+class ObjTypeInfo
+{
+    friend class SVFIRWriter;
+    friend class SVFIRReader;
+    friend class SymbolTableBuilder;
+
+public:
+    typedef enum
+    {
+        FUNCTION_OBJ = 0x1,  // object is a function
+        GLOBVAR_OBJ = 0x2,  // object is a global variable
+        STATIC_OBJ = 0x4,  // object is a static variable allocated before main
+        STACK_OBJ = 0x8,  // object is a stack variable
+        HEAP_OBJ = 0x10,  // object is a heap variable
+        VAR_STRUCT_OBJ = 0x20,  // object contains struct
+        VAR_ARRAY_OBJ = 0x40,  // object contains array
+        CONST_STRUCT_OBJ = 0x80,  // constant struct
+        CONST_ARRAY_OBJ = 0x100,  // constant array
+        CONST_GLOBAL_OBJ = 0x200,  // global constant object
+        CONST_DATA = 0x400,  // constant object str e.g. 5, 10, 1.0
+    } MEMTYPE;
+
+private:
+    /// SVF type
+    const SVFType* type;
+    /// Type flags
+    u32_t flags;
+    /// Max offset for flexible field sensitive analysis
+    /// maximum number of field object can be created
+    /// minimum number is 0 (field insensitive analysis)
+    u32_t maxOffsetLimit;
+    /// Size of the object or number of elements
+    u32_t elemNum;
+
+    /// Byte size of object
+    u32_t byteSize;
+
+    inline void resetTypeForHeapStaticObj(const SVFType* t)
+    {
+        assert((isStaticObj() || isHeap()) && "can only reset the inferred type for heap and static objects!");
+        type = t;
+    }
+public:
+
+    /// Constructors
+    ObjTypeInfo(const SVFType* t, u32_t max) : type(t), flags(0), maxOffsetLimit(max), elemNum(max)
+    {
+        assert(t && "no type information for this object?");
+    }
+
+    /// Destructor
+    virtual ~ObjTypeInfo()
+    {
+    }
+
+    /// Get LLVM type
+    inline const SVFType* getType() const
+    {
+        return type;
+    }
+
+    /// Get max field offset limit
+    inline u32_t getMaxFieldOffsetLimit()
+    {
+        return maxOffsetLimit;
+    }
+
+    /// Get max field offset limit
+    inline void setMaxFieldOffsetLimit(u32_t limit)
+    {
+        maxOffsetLimit = limit;
+    }
+
+    /// Set the number of elements of this object
+    inline void setNumOfElements(u32_t num)
+    {
+        elemNum = num;
+        setMaxFieldOffsetLimit(num);
+    }
+
+    /// Get the number of elements of this object
+    inline u32_t getNumOfElements() const
+    {
+        return elemNum;
+    }
+
+    /// Get the byte size of this object
+    inline u32_t getByteSizeOfObj() const
+    {
+        assert(isConstantByteSize() && "This Obj's byte size is not constant.");
+        return byteSize;
+    }
+
+    /// Set the byte size of this object
+    inline void setByteSizeOfObj(u32_t size)
+    {
+        byteSize = size;
+    }
+
+    /// Check if byte size is a const value
+    inline bool isConstantByteSize() const
+    {
+        return byteSize != 0;
+    }
+
+    /// Flag for this object type
+    //@{
+    inline void setFlag(MEMTYPE mask)
+    {
+        flags |= mask;
+    }
+    inline bool hasFlag(MEMTYPE mask)
+    {
+        return (flags & mask) == mask;
+    }
+    //@}
+
+    /// Object attributes
+    //@{
+    inline bool isFunction()
+    {
+        return hasFlag(FUNCTION_OBJ);
+    }
+    inline bool isGlobalObj()
+    {
+        return hasFlag(GLOBVAR_OBJ);
+    }
+    inline bool isStaticObj()
+    {
+        return hasFlag(STATIC_OBJ);
+    }
+    inline bool isStack()
+    {
+        return hasFlag(STACK_OBJ);
+    }
+    inline bool isHeap()
+    {
+        return hasFlag(HEAP_OBJ);
+    }
+    //@}
+
+    /// Object attributes (noted that an object can be a nested compound types)
+    /// e.g. both isStruct and isArray can return true
+    //@{
+    inline bool isVarStruct()
+    {
+        return hasFlag(VAR_STRUCT_OBJ);
+    }
+    inline bool isConstantStruct()
+    {
+        return hasFlag(CONST_STRUCT_OBJ);
+    }
+    inline bool isStruct()
+    {
+        return hasFlag(VAR_STRUCT_OBJ) || hasFlag(CONST_STRUCT_OBJ);
+    }
+    inline bool isVarArray()
+    {
+        return hasFlag(VAR_ARRAY_OBJ);
+    }
+    inline bool isConstantArray()
+    {
+        return  hasFlag(CONST_ARRAY_OBJ);
+    }
+    inline bool isArray()
+    {
+        return hasFlag(VAR_ARRAY_OBJ) || hasFlag(CONST_ARRAY_OBJ);
+    }
+    inline bool isConstDataOrConstGlobal()
+    {
+        return hasFlag(CONST_GLOBAL_OBJ) || hasFlag(CONST_DATA);
+    }
+    inline bool isConstDataOrAggData()
+    {
+        return hasFlag(CONST_DATA);
+    }
+    //@}
+};
+
+
+} // End namespace SVF
+
+#endif /* INCLUDE_SVFIR_OBJTYPEINFO_H_ */

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

@@ -431,27 +431,17 @@ public:
 
     /// Get black hole and constant id
     //@{
-    inline bool isBlkPtr(NodeID id) const
-    {
-        return (SymbolTableInfo::isBlkPtr(id));
-    }
-    inline bool isNullPtr(NodeID id) const
-    {
-        return (SymbolTableInfo::isNullPtr(id));
-    }
+
     inline bool isBlkObjOrConstantObj(NodeID id) const
     {
         return (isBlkObj(id) || isConstantObj(id));
     }
-    inline bool isBlkObj(NodeID id) const
-    {
-        return SymbolTableInfo::isBlkObj(id);
-    }
+
     inline bool isConstantObj(NodeID id) const
     {
         const BaseObjVar* obj = getBaseObject(id);
         assert(obj && "not an object node?");
-        return SymbolTableInfo::isConstantObj(id) ||
+        return isConstantSym(id) ||
                obj->isConstDataOrConstGlobal();
     }
     //@}
@@ -715,25 +705,25 @@ private:
     }
     inline NodeID addDummyObjNode(NodeID i, const SVFType* type)
     {
-        if (symInfo->idToObjTypeInfoMap().find(i) == symInfo->idToObjTypeInfoMap().end())
+        if (idToObjTypeInfoMap().find(i) == idToObjTypeInfoMap().end())
         {
-            ObjTypeInfo* ti = symInfo->createObjTypeInfo(type);
-            symInfo->idToObjTypeInfoMap()[i] = ti;
+            ObjTypeInfo* ti = createObjTypeInfo(type);
+            idToObjTypeInfoMap()[i] = ti;
             return addObjNode(new DummyObjVar(i, ti, nullptr, type));
         }
         else
         {
-            return addObjNode(new DummyObjVar(i, symInfo->getObjTypeInfo(i), nullptr, type));
+            return addObjNode(new DummyObjVar(i, getObjTypeInfo(i), nullptr, type));
         }
     }
 
     inline NodeID addBlackholeObjNode()
     {
-        return addObjNode(new DummyObjVar(getBlackHoleNode(), symInfo->getObjTypeInfo(getBlackHoleNode()), nullptr));
+        return addObjNode(new DummyObjVar(getBlackHoleNode(), getObjTypeInfo(getBlackHoleNode()), nullptr));
     }
     inline NodeID addConstantObjNode()
     {
-        return addObjNode(new DummyObjVar(getConstantNode(), symInfo->getObjTypeInfo(getConstantNode()), nullptr));
+        return addObjNode(new DummyObjVar(getConstantNode(), getObjTypeInfo(getConstantNode()), nullptr));
     }
     inline NodeID addBlackholePtrNode()
     {

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

@@ -31,7 +31,7 @@
 #define INCLUDE_SVFIR_SVFVARIABLE_H_
 
 #include "Graphs/GenericGraph.h"
-#include "SVFIR/SymbolTableInfo.h"
+#include "SVFIR/ObjTypeInfo.h"
 #include "SVFIR/SVFStatements.h"
 
 namespace SVF
@@ -648,10 +648,7 @@ public:
     }
 
     /// Whether it is a black hole object
-    bool isBlackHoleObj() const
-    {
-        return SymbolTableInfo::isBlkObj(getId());
-    }
+    bool isBlackHoleObj() const;
 
     /// Get the byte size of this object
     u32_t getByteSizeOfObj() const
@@ -802,10 +799,8 @@ public:
     }
 
     /// Return the type of this gep object
-    inline virtual const SVFType* getType() const
-    {
-        return SymbolTableInfo::SymbolInfo()->getFlatternedElemType(type, apOffset);
-    }
+    inline virtual const SVFType* getType() const;
+
 
     /// Return name of a LLVM value
     inline const std::string getValueName() const

package/package.json

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