svf-lib 1.0.906 → 1.0.907

package/SVF-osx/include/Graphs/CHG.h

@@ -238,18 +238,18 @@ public:
     void view();
     void printCH();
 
-    inline s64_t getVirtualFunctionID(const SVFFunction* vfn) const
+    inline u32_t getVirtualFunctionID(const SVFFunction* vfn) const
     {
-        Map<const SVFFunction*, s64_t>::const_iterator it =
+        Map<const SVFFunction*, u32_t>::const_iterator it =
             virtualFunctionToIDMap.find(vfn);
         if (it != virtualFunctionToIDMap.end())
             return it->second;
         else
             return -1;
     }
-    inline const SVFFunction* getVirtualFunctionBasedonID(s64_t id) const
+    inline const SVFFunction* getVirtualFunctionBasedonID(u32_t id) const
     {
-        Map<const SVFFunction*, s64_t>::const_iterator it, eit;
+        Map<const SVFFunction*, u32_t>::const_iterator it, eit;
         for (it = virtualFunctionToIDMap.begin(), eit =
                     virtualFunctionToIDMap.end(); it != eit; ++it)
         {
@@ -309,7 +309,7 @@ public:
 private:
     SVFModule* svfMod;
     u32_t classNum;
-    s64_t vfID;
+    u32_t vfID;
     double buildingCHGTime;
     Map<std::string, CHNode *> classNameToNodeMap;
     NameToCHNodesMap classNameToDescendantsMap;
@@ -318,7 +318,7 @@ private:
     NameToCHNodesMap templateNameToInstancesMap;
     CallSiteToCHNodesMap csToClassesMap;
 
-    Map<const SVFFunction*, s64_t> virtualFunctionToIDMap;
+    Map<const SVFFunction*, u32_t> virtualFunctionToIDMap;
     CallSiteToVTableSetMap csToCHAVtblsMap;
     CallSiteToVFunSetMap csToCHAVFnsMap;
 };

package/SVF-osx/include/Graphs/ConsGEdge.h

@@ -304,7 +304,7 @@ public:
     }
 
     /// Get location set of the gep edge
-    inline s64_t getConstantFieldIdx() const
+    inline s32_t getConstantFieldIdx() const
     {
         return ls.accumulateConstantFieldIdx();
     }

package/SVF-osx/include/Graphs/ICFG.h

@@ -128,7 +128,7 @@ protected:
     /// Add control-flow edges for top level pointers
     //@{
     ICFGEdge* addIntraEdge(ICFGNode* srcNode, ICFGNode* dstNode);
-    ICFGEdge* addConditionalIntraEdge(ICFGNode* srcNode, ICFGNode* dstNode, const Value* condition, s64_t branchCondVal);
+    ICFGEdge* addConditionalIntraEdge(ICFGNode* srcNode, ICFGNode* dstNode, const Value* condition, s32_t branchCondVal);
     ICFGEdge* addCallEdge(ICFGNode* srcNode, ICFGNode* dstNode, const Instruction* cs);
     ICFGEdge* addRetEdge(ICFGNode* srcNode, ICFGNode* dstNode, const Instruction* cs);
     //@}

package/SVF-osx/include/Graphs/ICFGEdge.h

@@ -138,12 +138,12 @@ public:
         return conditionVar;
     }
 
-    const s64_t getSuccessorCondValue() const{
+    const s32_t getSuccessorCondValue() const{
         assert(getCondition() && "this is not a conditional branch edge");
         return branchCondVal;
     }
 
-    void setBranchCondition(const Value* c, s64_t bVal){
+    void setBranchCondition(const Value* c, s32_t bVal){
         conditionVar = c;
         branchCondVal = bVal;
     }
@@ -156,7 +156,7 @@ private:
     /// e.g., Inst1: br %cmp label 0, label 1,  Inst2 is label 0 and Inst 3 is label 1;
     /// for edge between Inst1 and Inst 2, the first element is %cmp and second element is 0
     const Value* conditionVar;
-    s64_t branchCondVal;
+    s32_t branchCondVal;
 };
 
 /*!

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

@@ -57,7 +57,7 @@ public:
     typedef std::vector<std::pair<const Value*, const Type*> > OffsetValueVec;
 
     /// Constructor
-    LocationSet(s64_t o = 0) : fldIdx(o)
+    LocationSet(s32_t o = 0) : fldIdx(o)
     {}
 
     /// Copy Constructor
@@ -87,11 +87,11 @@ public:
 
     /// Get methods
     //@{
-    inline s64_t accumulateConstantFieldIdx() const
+    inline s32_t accumulateConstantFieldIdx() const
     {
         return fldIdx;
     }
-    inline void setFldIdx(s64_t idx)
+    inline void setFldIdx(s32_t idx)
     {
         fldIdx = idx;
     }
@@ -102,7 +102,7 @@ public:
     //@}
 
     /// Return accumulated constant offset given OffsetValueVec
-    s64_t accumulateConstantOffset() const;
+    s32_t accumulateConstantOffset() const;
 
     /// Return element number of a type. 
     u32_t getElementNum(const Type* type) const;
@@ -129,7 +129,7 @@ private:
     /// Compute all possible locations according to offset and number-stride pairs.
     NodeBS computeAllLocations() const;
 
-    s64_t fldIdx;	///< Accumulated Constant Offsets
+    s32_t fldIdx;	///< Accumulated Constant Offsets
     OffsetValueVec offsetValues;	///< a vector of actual offset in the form of Values
 };
 

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

@@ -71,7 +71,7 @@ public:
     SVFIR* build();
 
     // Add edges
-    void addEdge(NodeID nodeSrc, NodeID nodeDst, s64_t offset,
+    void addEdge(NodeID nodeSrc, NodeID nodeDst, s32_t offset,
                  std::string edge);
 };
 

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

@@ -63,7 +63,7 @@ public:
     typedef Map<const SVFFunction*,SVFStmtSet> FunToPAGEdgeSetMap;
     typedef Map<const ICFGNode*,SVFStmtList> ICFGNode2SVFStmtsMap;
     typedef Map<NodeID, NodeID> NodeToNodeMap;
-    typedef std::pair<NodeID, s64_t> NodeOffset;
+    typedef std::pair<NodeID, s32_t> NodeOffset;
     typedef std::pair<NodeID, LocationSet> NodeLocationSet;
     typedef Map<NodeOffset,NodeID> NodeOffsetMap;
     typedef Map<NodeLocationSet,NodeID> NodeLocationSetMap;

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

@@ -445,12 +445,12 @@ public:
         return getLocationSet().isConstantOffset();
     }
     /// Return accumulated constant offset (when accessing array or struct) if this offset is a constant.
-    inline s64_t accumulateConstantOffset() const
+    inline s32_t accumulateConstantOffset() const
     {
         return getLocationSet().accumulateConstantOffset();
     }
     /// Field index of the gep statement if it access the field of a struct
-    inline s64_t getConstantFieldIdx() const
+    inline s32_t getConstantFieldIdx() const
     {
         assert(isVariantFieldGep()==false && "Can't retrieve the LocationSet if using a variable field index (pointer arithmetic) for struct field access ");
         return getLocationSet().accumulateConstantFieldIdx();
@@ -921,7 +921,7 @@ public:
 class BranchStmt: public SVFStmt
 {
 public:
-    typedef std::vector<std::pair<const ICFGNode*, s64_t> > SuccAndCondPairVec;
+    typedef std::vector<std::pair<const ICFGNode*, s32_t> > SuccAndCondPairVec;
 private:
     BranchStmt();                      ///< place holder
     BranchStmt(const BranchStmt &);  ///< place holder
@@ -987,7 +987,7 @@ public:
     const ICFGNode* getSuccessor (u32_t i) const{
         return successors.at(i).first;
     }
-    s64_t getSuccessorCondValue (u32_t i) const{ 
+    s32_t getSuccessorCondValue (u32_t i) const{ 
         return successors.at(i).second;
     }
     //@}

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

@@ -413,7 +413,7 @@ public:
     }
 
     /// offset of the base value variable
-    inline s64_t getConstantFieldIdx() const
+    inline s32_t getConstantFieldIdx() const
     {
         return ls.accumulateConstantFieldIdx();
     }
@@ -483,7 +483,7 @@ public:
     }
 
     /// offset of the mem object
-    inline s64_t getConstantFieldIdx() const
+    inline s32_t getConstantFieldIdx() const
     {
         return ls.accumulateConstantFieldIdx();
     }

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

@@ -350,7 +350,7 @@ public:
     /// Number of flattenned elements of an array or struct
     u32_t getNumOfFlattenElements(const Type *T);
     /// Flatterned element idx of an array or struct by considering stride
-    u32_t getFlattenedElemIdx(const Type *T, s64_t origId);
+    u32_t getFlattenedElemIdx(const Type *T, u32_t origId);
 
     ///  struct A { int id; int salary; }; struct B { char name[20]; struct A a;}   B b;
     ///  OriginalElemType of b with field_idx 1 : Struct A

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

@@ -74,7 +74,7 @@ public:
     //@{
     void initialiseNodes();
     void addEdge(NodeID src, NodeID dst, SVFStmt::PEDGEK kind,
-                 s64_t offset = 0, Instruction* cs = nullptr);
+                 s32_t offset = 0, Instruction* cs = nullptr);
     // @}
 
     /// Sanity check for SVFIR
@@ -220,7 +220,7 @@ protected:
     void processCE(const Value *val);
 
     /// Infer field index from byteoffset.
-    u32_t inferFieldIdxFromByteOffset(const llvm::GEPOperator* gepOp, DataLayout *dl, LocationSet& ls, s64_t idx);
+    u32_t inferFieldIdxFromByteOffset(const llvm::GEPOperator* gepOp, DataLayout *dl, LocationSet& ls, s32_t idx);
 
     /// Compute offset of a gep instruction or gep constant expression
     bool computeGepOffset(const User *V, LocationSet& ls);

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

@@ -85,7 +85,7 @@ private:
         {
             std::string label = it->getName().str();
             std::string toErase = "gepnode-";
-            SVF::s64_t pos = label.find(toErase);
+            SVF::s32_t pos = label.find(toErase);
             if (pos == std::string::npos)
             {
                 continue;
@@ -96,7 +96,7 @@ private:
             auto mdNode = it->getOperand(0);
 
             SVF::NodeID baseNodeId = std::stoi(llvm::cast<llvm::MDString>(mdNode->getOperand(0))->getString().str());
-            SVF::s64_t locationSetOffset = std::stoi(llvm::cast<llvm::MDString>(mdNode->getOperand(1))->getString().str());
+            SVF::s32_t locationSetOffset = std::stoi(llvm::cast<llvm::MDString>(mdNode->getOperand(1))->getString().str());
 
             LocationSet locationSet = LocationSet(locationSetOffset);
             SVF::NodeID gepnodeId = pag->getGepObjVar(baseNodeId, locationSet);

package/SVF-osx/include/WPA/AndersenSFR.h

@@ -149,7 +149,7 @@ public:
 protected:
     void initialize();
     void PWCDetect();
-    void fieldExpand(NodeSet& initials, s64_t offset, NodeBS& strides, PointsTo& expandPts);
+    void fieldExpand(NodeSet& initials, s32_t offset, NodeBS& strides, PointsTo& expandPts);
     bool processGepPts(PointsTo& pts, const GepCGEdge* edge);
     bool mergeSrcToTgt(NodeID nodeId, NodeID newRepId);
 

package/SVF-osx/include/WPA/CSC.h

@@ -69,7 +69,7 @@ public:
         : _consG(g), _scc(c), _I(0) {}
 
     void find(NodeStack& candidates);
-    void visit(NodeID nodeId, s64_t _w);
+    void visit(NodeID nodeId, s32_t _w);
     void clear();
 
     bool isVisited(NodeID nId)

package/package.json

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