svf-lib 1.0.2199 → 1.0.2201

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

@@ -71,9 +71,6 @@ public:
 
     /// various maps defined
     //{@
-    /// llvm value to sym id map
-    /// local (%) and global (@) identifiers are pointer types which have a value node id.
-    typedef OrderedMap<const SVFValue*, NodeID> ValueToIDMapTy;
     /// sym id to obj type info map
     typedef OrderedMap<NodeID, ObjTypeInfo*> IDToTypeInfoMapTy;
 
@@ -84,8 +81,6 @@ public:
     //@}
 
 private:
-    ValueToIDMapTy valSymMap;  ///< map a value to its sym id
-    ValueToIDMapTy objSymMap;  ///< map a obj reference to its sym id
     FunToIDMapTy returnSymMap; ///< return map
     FunToIDMapTy varargSymMap; ///< vararg map
     IDToTypeInfoMapTy objTypeInfoMap;       ///< map a memory sym id to its obj
@@ -114,6 +109,8 @@ protected:
     bool fromFile; ///< Whether the SVFIR is built according to user specified data from a txt file
     NodeID nodeNumAfterPAGBuild; ///< initial node number after building SVFIR, excluding later added nodes, e.g., gepobj nodes
     u32_t totalPTAPAGEdge;
+    u32_t valVarNum;
+    u32_t objVarNum;
 
     /// Add a node into the graph
     inline NodeID addNode(SVFVar* node)
@@ -139,7 +136,7 @@ protected:
 
 public:
     IRGraph(bool buildFromFile)
-        : totalSymNum(0), fromFile(buildFromFile), nodeNumAfterPAGBuild(0), totalPTAPAGEdge(0),
+        : totalSymNum(0), fromFile(buildFromFile), nodeNumAfterPAGBuild(0), totalPTAPAGEdge(0), valVarNum(0), objVarNum(0),
           maxStruct(nullptr), maxStSize(0)
     {
     }
@@ -210,16 +207,6 @@ public:
 
     /// Get different kinds of syms maps
     //@{
-    inline ValueToIDMapTy& valSyms()
-    {
-        return valSymMap;
-    }
-
-    inline ValueToIDMapTy& objSyms()
-    {
-        return objSymMap;
-    }
-
     inline IDToTypeInfoMapTy& idToObjTypeInfoMap()
     {
         return objTypeInfoMap;
@@ -242,16 +229,6 @@ public:
 
     //@}
 
-    /// Get SVFIR Node according to LLVM value
-    ///getNode - Return the node corresponding to the specified pointer.
-    NodeID getValueNode(const SVFValue* V);
-
-    bool hasValueNode(const SVFValue* V);
-
-    /// getObject - Return the obj node id refer to the memory object for the
-    /// specified global, heap or alloca instruction according to llvm value.
-    NodeID getObjectNode(const SVFValue* V);
-
     inline ObjTypeInfo* getObjTypeInfo(NodeID id) const
     {
         IDToTypeInfoMapTy::const_iterator iter = objTypeInfoMap.find(id);
@@ -282,14 +259,9 @@ public:
         return nullPtrSymID();
     }
 
-    inline u32_t getValueNodeNum() const
-    {
-        return valSymMap.size();
-    }
-    inline u32_t getObjectNodeNum() const
-    {
-        return objTypeInfoMap.size();
-    }
+    u32_t getValueNodeNum();
+
+    u32_t getObjectNodeNum();
 
     /// Constant reader that won't change the state of the symbol table
     //@{

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

@@ -39,13 +39,13 @@
 namespace SVF
 {
 
-class SymbolTableInfo;
 class ObjTypeInference;
 
 class LLVMModuleSet
 {
     friend class SVFIRBuilder;
     friend class ICFGBuilder;
+    friend class SymbolTableBuilder;
 
 public:
 
@@ -73,6 +73,10 @@ public:
     typedef Map<const Function*, FunEntryICFGNode *> FunToFunEntryNodeMapTy;
     typedef Map<const Function*, FunExitICFGNode *> FunToFunExitNodeMapTy;
 
+    /// llvm value to sym id map
+    /// local (%) and global (@) identifiers are pointer types which have a value node id.
+    typedef OrderedMap<const SVFValue*, NodeID> ValueToIDMapTy;
+
 private:
     static LLVMModuleSet* llvmModuleSet;
     static bool preProcessed;
@@ -112,6 +116,9 @@ private:
 
     Map<const Function*, DominatorTree> FunToDominatorTree;
 
+    ValueToIDMapTy valSymMap;  ///< map a value to its sym id
+    ValueToIDMapTy objSymMap;  ///< map a obj reference to its sym id
+
     /// Constructor
     LLVMModuleSet();
 
@@ -170,6 +177,41 @@ public:
     // Dump modules to files
     void dumpModulesToFile(const std::string& suffix);
 
+public:
+
+    inline u32_t getValueNodeNum() const
+    {
+        return valSymMap.size();
+    }
+
+    inline u32_t getObjNodeNum() const
+    {
+        return objSymMap.size();
+    }
+
+    inline ValueToIDMapTy& valSyms()
+    {
+        return valSymMap;
+    }
+
+    inline ValueToIDMapTy& objSyms()
+    {
+        return objSymMap;
+    }
+
+    /// Get SVFIR Node according to LLVM value
+    ///getNode - Return the node corresponding to the specified pointer.
+    NodeID getValueNode(const SVFValue* V);
+
+    bool hasValueNode(const SVFValue* V);
+
+    /// getObject - Return the obj node id refer to the memory object for the
+    /// specified global, heap or alloca instruction according to llvm value.
+    NodeID getObjectNode(const SVFValue* V);
+
+    void dumpSymTable();
+
+public:
     inline void addFunctionMap(const Function* func, SVFFunction* svfFunc)
     {
         LLVMFunc2SVFFunc[func] = svfFunc;

package/SVF-linux/Release-build/include/SVF-LLVM/SVFIRBuilder.h

@@ -91,14 +91,14 @@ public:
 
         // strip off the constant cast and return the value node
         SVFValue* svfVal = llvmModuleSet()->getSVFValue(V);
-        return pag->getValueNode(svfVal);
+        return llvmModuleSet()->getValueNode(svfVal);
     }
 
     /// GetObject - Return the object node (stack/global/heap/function) according to a LLVM Value
     inline NodeID getObjectNode(const Value* V)
     {
         SVFValue* svfVal = llvmModuleSet()->getSVFValue(V);
-        return pag->getObjectNode(svfVal);
+        return llvmModuleSet()->getObjectNode(svfVal);
     }
 
     /// getReturnNode - Return the node representing the unique return value of a function.

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

@@ -84,6 +84,10 @@ protected:
     void handleCE(const Value* val);
     // @}
 
+    inline LLVMModuleSet* llvmModuleSet()
+    {
+        return LLVMModuleSet::getLLVMModuleSet();
+    }
 
     ObjTypeInference* getTypeInference();
 
@@ -118,9 +122,9 @@ protected:
     ///Get a reference to StructInfo.
     StInfo* getOrAddSVFTypeInfo(const Type* T);
 
-    ObjTypeInfo* createBlkObjTypeInfo(SymID symId);
+    ObjTypeInfo* createBlkObjTypeInfo(NodeID symId);
 
-    ObjTypeInfo* createConstantObjTypeInfo(SymID symId);
+    ObjTypeInfo* createConstantObjTypeInfo(NodeID symId);
 };
 
 } // End namespace SVF

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

@@ -39,7 +39,6 @@ class CallGraph;
 /*!
  * SVF Intermediate representation, representing variables and statements as a Program Assignment Graph (PAG)
  * Variables as nodes and statements as edges.
- * SymID and NodeID are equal here (same numbering).
  */
 class SVFIR : public IRGraph
 {
@@ -63,6 +62,7 @@ public:
     typedef Map<const CallICFGNode*,SVFVarList> CSToArgsListMap;
     typedef Map<const RetICFGNode*,const SVFVar*> CSToRetMap;
     typedef Map<const SVFFunction*,const SVFVar*> FunToRetMap;
+    typedef Map<const CallGraphNode*,const FunObjVar *> FunToFunObjVarMap;
     typedef Map<const SVFFunction*,SVFStmtSet> FunToPAGEdgeSetMap;
     typedef Map<const ICFGNode*,SVFStmtList> ICFGNode2SVFStmtsMap;
     typedef Map<NodeID, NodeID> NodeToNodeMap;
@@ -90,6 +90,7 @@ private:
     CSToArgsListMap callSiteArgsListMap;	///< Map a callsite to a list of all its actual parameters
     CSToRetMap callSiteRetMap;	///< Map a callsite to its callsite returns PAGNodes
     FunToRetMap funRetMap;	///< Map a function to its unique function return PAGNodes
+    FunToFunObjVarMap funToFunObjvarMap;    ///< Map a function to its unique function object PAGNodes
     CallSiteToFunPtrMap indCallSiteToFunPtrMap; ///< Map an indirect callsite to its function pointer
     FunPtrToCallSitesMap funPtrToCallSitesMap;	///< Map a function pointer to the callsites where it is used
     /// Valid pointers for pointer analysis resolution connected by SVFIR edges (constraints)
@@ -330,6 +331,12 @@ public:
     }
     //@}
 
+    inline const FunObjVar* getFunObjVar(const CallGraphNode*  node) const
+    {
+        FunToFunObjVarMap::const_iterator it = funToFunObjvarMap.find(node);
+        assert(it != funToFunObjvarMap.end() && "this function doesn't have funobjvar");
+        return it->second;
+    }
     /// Node and edge statistics
     //@{
     inline u32_t getFieldValNodeNum() const
@@ -622,6 +629,7 @@ private:
     {
         memToFieldsMap[id].set(id);
         FunObjVar* funObj = new FunObjVar(id, ti, callGraphNode, type, node);
+        funToFunObjvarMap[callGraphNode] = funObj;
         return addObjNode(funObj);
     }
 

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

@@ -598,7 +598,7 @@ public:
     virtual const std::string toString() const;
 
     /// Get the memory object id
-    inline SymID getId() const
+    inline NodeID getId() const
     {
         return id;
     }

package/SVF-linux/Release-build/include/Util/GeneralType.h

@@ -54,7 +54,6 @@ typedef signed short s16_t;
 
 typedef u32_t NodeID;
 typedef u32_t EdgeID;
-typedef unsigned SymID;
 typedef unsigned CallSiteID;
 typedef unsigned ThreadID;
 typedef s64_t APOffset;

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

@@ -167,7 +167,6 @@ typedef OrderedSet<PointsTo, equalPointsTo> PointsToList;
 void dumpPointsToList(const PointsToList& ptl);
 
 /// Return true if it is an llvm intrinsic instruction
-bool isIntrinsicInst(const SVFInstruction* inst);
 bool isIntrinsicInst(const ICFGNode* inst);
 //@}
 

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

@@ -553,10 +553,10 @@ private:
         return addValNode(node);
     }
 
-    NodeID addArgValNode(NodeID i, u32_t argNo, const ICFGNode* icfgNode, const CallGraphNode* callGraphNode, const SVFType* type, bool isUncalled = false)
+    NodeID addArgValNode(NodeID i, u32_t argNo, const ICFGNode* icfgNode, const CallGraphNode* callGraphNode, const SVFType* type)
     {
         ArgValVar* node =
-            new ArgValVar(i, argNo, icfgNode, callGraphNode, type, isUncalled);
+            new ArgValVar(i, argNo, icfgNode, callGraphNode, type);
         return addValNode(node);
     }
 

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

@@ -292,6 +292,8 @@ public:
     //@}
 };
 
+class ArgValVar;
+
 class SVFFunction : public SVFValue
 {
     friend class LLVMModuleSet;
@@ -316,7 +318,7 @@ private:
     const SVFFunctionType* funcType; /// FunctionType, which is different from the type (PointerType) of this SVFFunction
     SVFLoopAndDomInfo* loopAndDom;  /// the loop and dominate information
     const SVFFunction* realDefFun;  /// the definition of a function across multiple modules
-    std::vector<const SVFArgument*> allArgs;    /// all formal arguments of this function
+    std::vector<const ArgValVar*> allArgs;    /// all formal arguments of this function
     SVFBasicBlock *exitBlock;             /// a 'single' basic block having no successors and containing return instruction in a function
     const CallGraphNode *callGraphNode;          /// call graph node for this function
     BasicBlockGraph* bbGraph; /// the basic block graph of this function
@@ -327,7 +329,7 @@ protected:
         callGraphNode = cgn;
     }
 
-    inline void addArgument(SVFArgument* arg)
+    inline void addArgument(const ArgValVar* arg)
     {
         allArgs.push_back(arg);
     }
@@ -417,7 +419,7 @@ public:
     }
 
     u32_t arg_size() const;
-    const SVFArgument* getArg(u32_t idx) const;
+    const ArgValVar* getArg(u32_t idx) const;
     bool isVarArg() const;
 
     inline bool hasBasicBlock() const

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

@@ -368,7 +368,6 @@ class ArgValVar: public ValVar
 private:
     const CallGraphNode* cgNode;
     u32_t argNo;
-    bool uncalled;
 
 protected:
     /// Constructor to create function argument (for SVFIRReader/deserialization)
@@ -401,7 +400,7 @@ public:
 
     /// Constructor
     ArgValVar(NodeID i, u32_t argNo, const ICFGNode* icn, const CallGraphNode* callGraphNode,
-              const SVFType* svfType, bool isUncalled = false);
+              const SVFType* svfType);
 
     /// Return name of a LLVM value
     inline const std::string getValueName() const
@@ -422,7 +421,7 @@ public:
 
     inline bool isArgOfUncalledFunction() const
     {
-        return uncalled;
+        return getFunction()->isUncalledFunction();
     }
 
     virtual bool isPointer() const;

package/package.json

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