svf-tools 1.0.404 → 1.0.405

package/SVF-doxygen/html/html/structstd_1_1hash_3_01SVF_1_1LocationSet_01_4.html

@@ -109,8 +109,8 @@ struct std::hash&lt; SVF::LocationSet &gt;</h3>
 </div><div class="memdoc">
 
 <p class="definition">Definition at line <a class="el" href="LocationSet_8h_source.html#l00139">139</a> of file <a class="el" href="LocationSet_8h_source.html">LocationSet.h</a>.</p>
-<div class="fragment"><div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;                                                      {</div><div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;        <a class="code" href="structSVF_1_1Hash.html">SVF::Hash&lt;std::pair&lt;SVF::NodeID, SVF::NodeID&gt;</a>&gt; h;</div><div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;        std::hash&lt;SVF::LocationSet::OffsetValueVec&gt; v;</div><div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;        <span class="keywordflow">return</span> h(std::make_pair(ls.<a class="code" href="classSVF_1_1LocationSet.html#ab987c41ffdae931d941f89d03ed09146">accumulateConstantFieldIdx</a>(), v(ls.<a class="code" href="classSVF_1_1LocationSet.html#a5a5ca0b81da0b34ab426bc6a28ed346c">getOffsetValueVec</a>())));</div><div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;    }</div><div class="ttc" id="classSVF_1_1LocationSet_html_ab987c41ffdae931d941f89d03ed09146"><div class="ttname"><a href="classSVF_1_1LocationSet.html#ab987c41ffdae931d941f89d03ed09146">SVF::LocationSet::accumulateConstantFieldIdx</a></div><div class="ttdeci">s64_t accumulateConstantFieldIdx() const</div><div class="ttdoc">Get methods. </div><div class="ttdef"><b>Definition:</b> <a href="LocationSet_8h_source.html#l00090">LocationSet.h:90</a></div></div>
-<div class="ttc" id="structSVF_1_1Hash_html"><div class="ttname"><a href="structSVF_1_1Hash.html">SVF::Hash</a></div><div class="ttdoc">provide extra hash function for std::pair handling </div><div class="ttdef"><b>Definition:</b> <a href="SVFBasicTypes_8h_source.html#l00052">SVFBasicTypes.h:52</a></div></div>
+<div class="fragment"><div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;                                                      {</div><div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160;        <a class="code" href="structSVF_1_1Hash.html">SVF::Hash&lt;std::pair&lt;SVF::NodeID, SVF::NodeID&gt;</a>&gt; h;</div><div class="line"><a name="l00141"></a><span class="lineno">  141</span>&#160;        std::hash&lt;SVF::LocationSet::OffsetValueVec&gt; v;</div><div class="line"><a name="l00142"></a><span class="lineno">  142</span>&#160;        <span class="keywordflow">return</span> h(std::make_pair(ls.<a class="code" href="classSVF_1_1LocationSet.html#a63c5c8e03b35e0d0cea94137d309c853">accumulateConstantFieldIdx</a>(), v(ls.<a class="code" href="classSVF_1_1LocationSet.html#a5a5ca0b81da0b34ab426bc6a28ed346c">getOffsetValueVec</a>())));</div><div class="line"><a name="l00143"></a><span class="lineno">  143</span>&#160;    }</div><div class="ttc" id="structSVF_1_1Hash_html"><div class="ttname"><a href="structSVF_1_1Hash.html">SVF::Hash</a></div><div class="ttdoc">provide extra hash function for std::pair handling </div><div class="ttdef"><b>Definition:</b> <a href="SVFBasicTypes_8h_source.html#l00052">SVFBasicTypes.h:52</a></div></div>
+<div class="ttc" id="classSVF_1_1LocationSet_html_a63c5c8e03b35e0d0cea94137d309c853"><div class="ttname"><a href="classSVF_1_1LocationSet.html#a63c5c8e03b35e0d0cea94137d309c853">SVF::LocationSet::accumulateConstantFieldIdx</a></div><div class="ttdeci">s32_t accumulateConstantFieldIdx() const</div><div class="ttdoc">Get methods. </div><div class="ttdef"><b>Definition:</b> <a href="LocationSet_8h_source.html#l00090">LocationSet.h:90</a></div></div>
 <div class="ttc" id="classSVF_1_1LocationSet_html_a5a5ca0b81da0b34ab426bc6a28ed346c"><div class="ttname"><a href="classSVF_1_1LocationSet.html#a5a5ca0b81da0b34ab426bc6a28ed346c">SVF::LocationSet::getOffsetValueVec</a></div><div class="ttdeci">const OffsetValueVec &amp; getOffsetValueVec() const</div><div class="ttdef"><b>Definition:</b> <a href="LocationSet_8h_source.html#l00098">LocationSet.h:98</a></div></div>
 </div><!-- fragment -->
 </div>

package/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/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/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/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/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/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/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/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/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/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/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/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/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/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/lib/Graphs/ICFG.cpp

@@ -352,7 +352,7 @@ ICFGEdge* ICFG::addIntraEdge(ICFGNode* srcNode, ICFGNode* dstNode)
 /*!
  * Add conditional intraprocedural edges between two nodes
  */
-ICFGEdge* ICFG::addConditionalIntraEdge(ICFGNode* srcNode, ICFGNode* dstNode, const Value* condition, s64_t branchCondVal){
+ICFGEdge* ICFG::addConditionalIntraEdge(ICFGNode* srcNode, ICFGNode* dstNode, const Value* condition, s32_t branchCondVal){
 
     checkIntraEdgeParents(srcNode, dstNode);
     if(ICFGEdge* edge = hasIntraICFGEdge(srcNode,dstNode, ICFGEdge::IntraCF))

package/lib/MTA/MHP.cpp

@@ -1045,7 +1045,7 @@ static bool accessSameArrayIndex(const GetElementPtrInst* ptr1, const GetElement
     {
         if(ConstantInt* ci = SVFUtil::dyn_cast<ConstantInt>(gi.getOperand()))
         {
-            s64_t idx = ci->getSExtValue();
+            s32_t idx = ci->getSExtValue();
             ptr1vec.push_back(idx);
         }
         else
@@ -1058,7 +1058,7 @@ static bool accessSameArrayIndex(const GetElementPtrInst* ptr1, const GetElement
     {
         if(ConstantInt* ci = SVFUtil::dyn_cast<ConstantInt>(gi.getOperand()))
         {
-            s64_t idx = ci->getSExtValue();
+            s32_t idx = ci->getSExtValue();
             ptr2vec.push_back(idx);
         }
         else

package/lib/MemoryModel/LocationSet.cpp

@@ -108,14 +108,14 @@ u32_t LocationSet::getElementNum(const Type* type) const{
 ///     value1: i64 0  type1: [3 x i8]*
 ///     value2: i64 2  type2: [3 x i8]
 ///     accumulateConstantOffset = 2
-s64_t LocationSet::accumulateConstantOffset() const{
+s32_t LocationSet::accumulateConstantOffset() const{
     
     assert(isConstantOffset() && "not a constant offset");
 
     if(offsetValues.empty())
         return accumulateConstantFieldIdx();
 
-    s64_t totalConstOffset = 0;
+    s32_t totalConstOffset = 0;
     for(int i = offsetValues.size() - 1; i >= 0; i--){
         const Value* value = offsetValues[i].first;
         const Type* type = offsetValues[i].second;
@@ -129,7 +129,7 @@ s64_t LocationSet::accumulateConstantOffset() const{
         if(const PointerType* pty = SVFUtil::dyn_cast<PointerType>(type))
             totalConstOffset += op->getSExtValue() * getElementNum(pty->getElementType());
         else{
-            s64_t offset = op->getSExtValue();
+            s32_t offset = op->getSExtValue();
             u32_t flattenOffset = SymbolTableInfo::SymbolInfo()->getFlattenedElemIdx(type, offset); 
             totalConstOffset += flattenOffset;
         }

package/lib/MemoryModel/PAGBuilderFromFile.cpp

@@ -103,7 +103,7 @@ SVFIR* PAGBuilderFromFile::build()
             {
                 NodeID nodeSrc;
                 NodeID nodeDst;
-                s64_t offsetOrCSId;
+                s32_t offsetOrCSId;
                 string edge;
                 istringstream ss(line);
                 ss >> nodeSrc;
@@ -144,7 +144,7 @@ SVFIR* PAGBuilderFromFile::build()
  * Add SVFIR edge according to a file format
  */
 void PAGBuilderFromFile::addEdge(NodeID srcID, NodeID dstID,
-                                 s64_t offsetOrCSId, std::string edge)
+                                 s32_t offsetOrCSId, std::string edge)
 {
 
     //check whether these two nodes available

package/lib/MemoryModel/SVFIR.cpp

@@ -559,7 +559,7 @@ NodeID SVFIR::getGepValVar(const Value* curInst, NodeID base, const LocationSet&
  * Get a base SVFVar given a pointer
  * Return the source node of its connected normal gep edge
  * Otherwise return the node id itself
- * s64_t offset : gep offset
+ * s32_t offset : gep offset
  */
 LocationSet SVFIR::getLocationSetFromBaseNode(NodeID nodeId)
 {

package/lib/MemoryModel/SymbolTableInfo.cpp

@@ -200,7 +200,7 @@ void SymbolTableInfo::collectStructInfo(const StructType *sty)
                 sty->element_end(); it != ie; ++it)
     {
         const Type *et = *it;
-        /// offset with int_32 (s64_t) is large enough and will not cause overflow
+        /// offset with int_32 (s32_t) is large enough and will not cause overflow
         stinfo->addFldWithType(nf, et, strideOffset);
 
         if (SVFUtil::isa<StructType>(et) || SVFUtil::isa<ArrayType>(et))
@@ -269,7 +269,7 @@ LocationSet SymbolTableInfo::getModulusOffset(const MemObj* obj, const LocationS
     /// of current struct. Make the offset positive so we can still get a node within current
     /// struct to represent this obj.
 
-    s64_t offset = ls.accumulateConstantFieldIdx();
+    s32_t offset = ls.accumulateConstantFieldIdx();
     if(offset < 0)
     {
         writeWrnMsg("try to create a gep node with negative offset.");
@@ -405,7 +405,7 @@ u32_t SymbolTableInfo::getNumOfFlattenElements(const Type *T)
 }
 
 /// Flatterned offset information of a struct or an array including its array fields 
-u32_t SymbolTableInfo::getFlattenedElemIdx(const Type *T, s64_t origId)
+u32_t SymbolTableInfo::getFlattenedElemIdx(const Type *T, u32_t origId)
 {
     if(Options::ModelArrays){
         std::vector<u32_t>& so = getStructInfoIter(T)->second->getFlattenedElemIdxVec();

package/lib/SVF-FE/CPPUtil.cpp

@@ -55,7 +55,7 @@ const string structName = "struct.";
 
 static bool isOperOverload(const string name)
 {
-    s64_t leftnum = 0, rightnum = 0;
+    u32_t leftnum = 0, rightnum = 0;
     string subname = name;
     size_t leftpos, rightpos;
     leftpos = subname.find("<");
@@ -88,7 +88,7 @@ static string getBeforeParenthesis(const string &name)
     size_t lastRightParen = name.rfind(")");
     assert(lastRightParen > 0);
 
-    s64_t paren_num = 1, pos;
+    s32_t paren_num = 1, pos;
     for (pos = lastRightParen - 1; pos >= 0; pos--)
     {
         if (name[pos] == ')')
@@ -107,7 +107,7 @@ string cppUtil::getBeforeBrackets(const string &name)
     {
         return name;
     }
-    s64_t bracket_num = 1, pos;
+    s32_t bracket_num = 1, pos;
     for (pos = name.size() - 2; pos >= 0; pos--)
     {
         if (name[pos] == '>')
@@ -228,7 +228,7 @@ bool cppUtil::isLoadVtblInst(const LoadInst *loadInst)
     const Value *loadSrc = loadInst->getPointerOperand();
     const Type *valTy = loadSrc->getType();
     const Type *elemTy = valTy;
-    for (s64_t i = 0; i < 3; ++i)
+    for (u32_t i = 0; i < 3; ++i)
     {
         if (const PointerType *ptrTy = SVFUtil::dyn_cast<PointerType>(elemTy))
             elemTy = ptrTy->getElementType();

package/lib/SVF-FE/ICFGBuilder.cpp

@@ -123,7 +123,7 @@ void ICFGBuilder::processFunBody(WorkList& worklist)
                     /// branch condition value
                     const ConstantInt* condVal = const_cast<SwitchInst*>(si)->findCaseDest(const_cast<BasicBlock*>(succ->getParent()));
                     /// default case is set to -1;
-                    s64_t val = condVal ? condVal->getSExtValue() : -1;
+                    s32_t val = condVal ? condVal->getSExtValue() : -1;
                     icfg->addConditionalIntraEdge(srcNode, dstNode, si->getCondition(),val);
                 }
                 else

package/lib/SVF-FE/LLVMUtil.cpp

@@ -371,7 +371,7 @@ void SVFUtil::processArguments(int argc, char **argv, int &arg_num, char **arg_v
                                std::vector<std::string> &moduleNameVec)
 {
     bool first_ir_file = true;
-    for (s64_t i = 0; i < argc; ++i)
+    for (u32_t i = 0; i < argc; ++i)
     {
         std::string argument(argv[i]);
         if (SVFUtil::isIRFile(argument))

package/lib/SVF-FE/SVFIRBuilder.cpp

@@ -219,7 +219,7 @@ void SVFIRBuilder::initialiseNodes()
     e.g. field_idx = getelementptr i8, %struct_type %p, i64 1
 
 */
-u32_t SVFIRBuilder::inferFieldIdxFromByteOffset(const llvm::GEPOperator* gepOp, DataLayout *dl, LocationSet& ls, s64_t idx){
+u32_t SVFIRBuilder::inferFieldIdxFromByteOffset(const llvm::GEPOperator* gepOp, DataLayout *dl, LocationSet& ls, s32_t idx){
     return 0;
 }
 
@@ -238,7 +238,7 @@ bool SVFIRBuilder::computeGepOffset(const User *V, LocationSet& ls)
     llvm::APInt byteOffset(dataLayout->getIndexSizeInBits(gepOp->getPointerAddressSpace()),0,true);
     if(gepOp && dataLayout && gepOp->accumulateConstantOffset(*dataLayout,byteOffset))
     {
-        s64_t bo = byteOffset.getSExtValue();
+        s32_t bo = byteOffset.getSExtValue();
     }
 
     for (bridge_gep_iterator gi = bridge_gep_begin(*V), ge = bridge_gep_end(*V);
@@ -256,7 +256,7 @@ bool SVFIRBuilder::computeGepOffset(const User *V, LocationSet& ls)
         if(SVFUtil::isa<ArrayType>(gepTy)){
             if(!op) 
                 continue;
-            s64_t idx = op->getSExtValue();
+            s32_t idx = op->getSExtValue();
             u32_t offset = SymbolTableInfo::SymbolInfo()->getFlattenedElemIdx(gepTy, idx);
             ls.setFldIdx(ls.accumulateConstantFieldIdx() + offset);  
         }
@@ -264,7 +264,7 @@ bool SVFIRBuilder::computeGepOffset(const User *V, LocationSet& ls)
         {
             assert(op && "non-const offset accessing a struct");
             //The actual index
-            s64_t idx = op->getSExtValue();
+            s32_t idx = op->getSExtValue();
             u32_t offset = SymbolTableInfo::SymbolInfo()->getFlattenedElemIdx(ST, idx);
             ls.setFldIdx(ls.accumulateConstantFieldIdx() + offset);
         }
@@ -277,7 +277,7 @@ bool SVFIRBuilder::computeGepOffset(const User *V, LocationSet& ls)
                 return false;              
             
             // The actual index
-            //s64_t idx = op->getSExtValue();
+            //s32_t idx = op->getSExtValue();
 
             // For pointer arithmetic we ignore the byte offset
             // consider using inferFieldIdxFromByteOffset(geopOp,dataLayout,ls,idx)?
@@ -871,7 +871,7 @@ void SVFIRBuilder::visitSwitchInst(SwitchInst &inst){
         const Instruction* succInst = &inst.getSuccessor(i)->front();
         const ConstantInt* condVal = inst.findCaseDest(inst.getSuccessor(i));
         /// default case is set to -1;
-        s64_t val = condVal ? condVal->getSExtValue() : -1;
+        s32_t val = condVal ? condVal->getSExtValue() : -1;
         const ICFGNode* icfgNode = pag->getICFG()->getICFGNode(succInst);
         successors.push_back(std::make_pair(icfgNode,val));
     }
@@ -977,7 +977,7 @@ const Value* SVFIRBuilder::getBaseValueForExtArg(const Value* V){
     const Value * value = stripAllCasts(V);
     assert(value && "null ptr?");
     if(const GetElementPtrInst* gep = SVFUtil::dyn_cast<GetElementPtrInst>(value)){
-        s64_t totalidx = 0;
+        s32_t totalidx = 0;
         for (bridge_gep_iterator gi = bridge_gep_begin(gep), ge = bridge_gep_end(gep); gi != ge; ++gi){
             if(const ConstantInt *op = SVFUtil::dyn_cast<ConstantInt>(gi.getOperand()))
                 totalidx += op->getSExtValue();
@@ -1322,7 +1322,7 @@ void SVFIRBuilder::handleExtCall(CallSite cs, const SVFFunction *callee)
                 // We have vArg3 points to the entry of _Rb_tree_node_base { color; parent; left; right; }.
                 // Now we calculate the offset from base to vArg3
                 NodeID vnArg3 = pag->getValueNode(vArg3);
-                s64_t offset = pag->getLocationSetFromBaseNode(vnArg3).accumulateConstantFieldIdx();
+                s32_t offset = pag->getLocationSetFromBaseNode(vnArg3).accumulateConstantFieldIdx();
 
                 // We get all flattened fields of base
                 vector<LocationSet> fields;
@@ -1349,7 +1349,7 @@ void SVFIRBuilder::handleExtCall(CallSite cs, const SVFFunction *callee)
 
                 Value *vArg = cs.getArgument(0);
                 NodeID vnArg = pag->getValueNode(vArg);
-                s64_t offset = pag->getLocationSetFromBaseNode(vnArg).accumulateConstantFieldIdx();
+                s32_t offset = pag->getLocationSetFromBaseNode(vnArg).accumulateConstantFieldIdx();
 
                 // We get all fields
                 vector<LocationSet> fields;

package/lib/SVF-FE/SymbolTableBuilder.cpp

@@ -609,7 +609,7 @@ const Value* SymbolTableBuilder::getUniqueUseViaCastInst(const Value* val){
  */
 void SymbolTableBuilder::initTypeInfo(ObjTypeInfo* typeinfo, const Value* val){
     
-    s64_t objSize = 1;
+    u32_t objSize = 1;
     // Global variable
     if (SVFUtil::isa<Function>(val))
     {

package/lib/Util/Conditions.cpp

@@ -182,7 +182,7 @@ void CondManager::printModel()
     z3::model m = sol.get_model();
     for (u32_t i = 0; i < m.size(); i++)
     {
-        z3::func_decl v = m[static_cast<s64_t>(i)];
+        z3::func_decl v = m[i];
         SVFUtil::outs() << v.name() << " = " << m.get_const_interp(v) << "\n";
     }
 }

package/lib/Util/TypeBasedHeapCloning.cpp

@@ -152,7 +152,7 @@ const NodeBS TypeBasedHeapCloning::getGepObjClones(NodeID base, unsigned offset)
 
     // totalOffset is the offset from the real base (i.e. base of base),
     // offset is the offset into base, whether it is a field itself or not.
-    s64_t totalOffset = offset;
+    s32_t totalOffset = offset;
     if (const GepObjVar *baseGep = SVFUtil::dyn_cast<GepObjVar>(baseNode))
     {
         totalOffset += baseGep->getConstantFieldIdx();

package/lib/WPA/AndersenSFR.cpp

@@ -96,7 +96,7 @@ bool AndersenSFR::processGepPts(PointsTo& pts, const GepCGEdge* edge)
             for (NodeID ptd : srcInits)
                 sortSrcInits.insert(ptd);
 
-            s64_t offset = SVFUtil::dyn_cast<NormalGepCGEdge>(edge)->getConstantFieldIdx();
+            s32_t offset = SVFUtil::dyn_cast<NormalGepCGEdge>(edge)->getConstantFieldIdx();
             fieldExpand(sortSrcInits, offset, dst->strides, tmpDstPts);
         }
 
@@ -116,7 +116,7 @@ bool AndersenSFR::processGepPts(PointsTo& pts, const GepCGEdge* edge)
 /*!
  *
  */
-void AndersenSFR::fieldExpand(NodeSet& initials, s64_t offset, NodeBS& strides, PointsTo& expandPts)
+void AndersenSFR::fieldExpand(NodeSet& initials, s32_t offset, NodeBS& strides, PointsTo& expandPts)
 {
     numOfFieldExpand++;
 
@@ -132,7 +132,7 @@ void AndersenSFR::fieldExpand(NodeSet& initials, s64_t offset, NodeBS& strides,
             PAGNode* initPN = pag->getGNode(init);
             const MemObj* obj = pag->getBaseObj(init);
             const u32_t maxLimit = obj->getMaxFieldOffsetLimit();
-            s64_t initOffset;
+            s32_t initOffset;
             if (GepObjVar *gepNode = SVFUtil::dyn_cast<GepObjVar>(initPN))
                 initOffset = gepNode->getConstantFieldIdx();
             else if (SVFUtil::isa<FIObjVar>(initPN) || SVFUtil::isa<DummyObjVar>(initPN))
@@ -140,7 +140,7 @@ void AndersenSFR::fieldExpand(NodeSet& initials, s64_t offset, NodeBS& strides,
             else
                 assert(false && "Not an object node!!");
 
-            Set<s64_t> offsets;
+            Set<s32_t> offsets;
             offsets.insert(offset);
 
             // calculate offsets
@@ -151,7 +151,7 @@ void AndersenSFR::fieldExpand(NodeSet& initials, s64_t offset, NodeBS& strides,
                 for (auto _f : offsets)
                     for (auto _s : strides)
                     {
-                        s64_t _f1 = _f + _s;
+                        s32_t _f1 = _f + _s;
                         loopFlag = (offsets.find(_f1) == offsets.end()) && (initOffset + _f1 < maxLimit);
                         if (loopFlag)
                             offsets.insert(_f1);
@@ -159,7 +159,7 @@ void AndersenSFR::fieldExpand(NodeSet& initials, s64_t offset, NodeBS& strides,
             }
 
             // get gep objs
-            for (s64_t _f : offsets)
+            for (s32_t _f : offsets)
             {
                 NodeID gepId = consCG->getGepObjVar(init, LocationSet(_f));
                 initials.erase(gepId);  // gep id in initials should be removed to avoid redundant derivation