svf-lib 1.0.845 → 1.0.849

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

@@ -90,12 +90,6 @@ public:
     {
     }
 
-    /// Initialization from FlattenedFieldInfo
-    LocationSet(const FlattenedFieldInfo& fi)
-        : fldIdx(fi.getFlattenFldIdx())
-    {
-    }
-
     ~LocationSet() {}
 
     /// Overload operators

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

@@ -553,7 +553,7 @@ private:
     }
 
     /// Add a temp field value node, this method can only invoked by getGepValVar
-    NodeID addGepValNode(const Value* curInst,const Value* val, const LocationSet& ls, NodeID i, const Type *type, u32_t fieldidx);
+    NodeID addGepValNode(const Value* curInst,const Value* val, const LocationSet& ls, NodeID i, const Type *type);
     /// Add a field obj node, this method can only invoked by getGepObjVar
     NodeID addGepObjNode(const MemObj* obj, const LocationSet& ls);
     /// Add a field-insensitive node, this method can only invoked by getFIGepObjNode

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

@@ -434,7 +434,6 @@ public:
 
     inline const LocationSet& getLocationSet() const
     {
-        assert(isVariantFieldGep()==false && "Can't retrieve the LocationSet if using a variable field index (pointer arithmetic) for struct field access ");
         return ls;
     }
     inline const LocationSet::OffsetValueVec& getOffsetValueVec() const
@@ -453,6 +452,7 @@ public:
     /// Field index of the gep statement if it access the field of a struct
     inline s64_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();
     }
     /// Gep statement with a variant field index (pointer arithmetic) for struct field access 

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

@@ -395,7 +395,6 @@ class GepValVar: public ValVar
 private:
     LocationSet ls;	// LocationSet
     const Type *gepValType;
-    u32_t fieldIdx;
 
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -419,8 +418,8 @@ public:
     //@}
 
     /// Constructor
-    GepValVar(const Value* val, NodeID i, const LocationSet& l, const Type *ty, u32_t idx) :
-        ValVar(val, i, GepValNode), ls(l), gepValType(ty), fieldIdx(idx)
+    GepValVar(const Value* val, NodeID i, const LocationSet& l, const Type *ty) :
+        ValVar(val, i, GepValNode), ls(l), gepValType(ty)
     {
     }
 
@@ -443,11 +442,6 @@ public:
         return gepValType;
     }
 
-    u32_t getFieldIdx() const
-    {
-        return fieldIdx;
-    }
-
     virtual const std::string toString() const;
 };
 

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

@@ -354,13 +354,9 @@ public:
 
     ///Get a reference to the components of struct_info.
     /// Number of flattenned elements of an array or struct
-    const u32_t getNumOfFlattenElements(const Type *T);
-    /// Number of flattenned fields of a struct
-    const u32_t getNumOfFlattenFields(const StructType *T);
+    u32_t getNumOfFlattenElements(const Type *T);
     /// Flatterned element idx of an array or struct by considering stride
-    const std::vector<u32_t>& getFlattenedElemIdxVec(const Type *T);
-    /// Flatterned field index information of a struct ignoring any array field
-    const std::vector<u32_t>& getFlattenedFieldIdxVec(const StructType *T);
+    u32_t getFlattenedElemIdx(const Type *T, s64_t origId);
 
     const std::vector<FlattenedFieldInfo>& getFlattenedFieldInfoVec(const Type *T);
 

package/SVF-linux/include/SVF-FE/LLVMUtil.h

@@ -510,7 +510,7 @@ inline const BasicBlock* getFunExitBB(const Function* fun)
 const Value * stripConstantCasts(const Value *val);
 
 /// Strip off the all casts
-Value *stripAllCasts(Value *val) ;
+const Value *stripAllCasts(const Value *val) ;
 
 /// Get the type of the heap allocation
 const Type *getTypeOfHeapAlloc(const llvm::Instruction *inst) ;

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

@@ -109,44 +109,9 @@ public:
         return pag->getVarargNode(func);
     }
     //@}
-
-    /// Handle globals including (global variable and functions)
-    //@{
-    void visitGlobal(SVFModule* svfModule);
-    void InitialGlobal(const GlobalVariable *gvar, Constant *C,
-                       u32_t offset);
-    NodeID getGlobalVarField(const GlobalVariable *gvar, u32_t offset);
-    //@}
-
-    /// Process constant expression
-    void processCE(const Value *val);
-
-    /// Infer field index from byteoffset.
-    u32_t inferFieldIdxFromByteOffset(const llvm::GEPOperator* gepOp, DataLayout *dl, LocationSet& ls, s64_t idx);
-
-    /// Compute offset of a gep instruction or gep constant expression
-    bool computeGepOffset(const User *V, LocationSet& ls);
-
-    /// Get the base type and max offset
-    const Type *getBaseTypeAndFlattenedFields(const Value *V, std::vector<LocationSet> &fields);
-
-    /// Replace fields with flatten fields of T if the number of its fields is larger than msz.
-    u32_t getFields(std::vector<LocationSet>& fields, const Type* T, u32_t msz);
-
-    /// Handle direct call
-    void handleDirectCall(CallSite cs, const SVFFunction *F);
-
-    /// Handle indirect call
-    void handleIndCall(CallSite cs);
-
     /// Update SVFIR given a call graph (creating new CallPE and RetPE for resolved indirect calls)
     void updateCallGraph(PTACallGraph* callgraph);
 
-    /// Handle external call
-    //@{
-    virtual void handleExtCall(CallSite cs, const SVFFunction *F);
-    void addComplexConsForExt(Value *D, Value *S,u32_t sz = 0);
-    //@}
 
     /// Our visit overrides.
     //@{
@@ -241,6 +206,39 @@ public:
     }
     //}@
 
+protected:
+    /// Handle globals including (global variable and functions)
+    //@{
+    void visitGlobal(SVFModule* svfModule);
+    void InitialGlobal(const GlobalVariable *gvar, Constant *C,
+                       u32_t offset);
+    NodeID getGlobalVarField(const GlobalVariable *gvar, u32_t offset);
+    //@}
+
+    /// Process constant expression
+    void processCE(const Value *val);
+
+    /// Infer field index from byteoffset.
+    u32_t inferFieldIdxFromByteOffset(const llvm::GEPOperator* gepOp, DataLayout *dl, LocationSet& ls, s64_t idx);
+
+    /// Compute offset of a gep instruction or gep constant expression
+    bool computeGepOffset(const User *V, LocationSet& ls);
+
+    /// Get the base type and max offset
+    const Type *getBaseTypeAndFlattenedFields(const Value *V, std::vector<LocationSet> &fields, const Value* sz);
+
+    /// Handle direct call
+    void handleDirectCall(CallSite cs, const SVFFunction *F);
+
+    /// Handle indirect call
+    void handleIndCall(CallSite cs);
+
+    /// Handle external call
+    //@{
+    virtual void handleExtCall(CallSite cs, const SVFFunction *F);
+    void addComplexConsForExt(Value *D, Value *S, const Value* sz);
+    //@}
+
     /// Set current basic block in order to keep track of control flow information
     inline void setCurrentLocation(const Value* val, const BasicBlock* bb)
     {
@@ -278,143 +276,128 @@ public:
         return nullPtr;
     }
 
-public:
-
-    NodeID getGepValVar(const Value* val, const LocationSet& ls, const Type *baseType, u32_t fieldidx);
+    NodeID getGepValVar(const Value* val, const LocationSet& ls, const Type *baseType);
 
     void setCurrentBBAndValueForPAGEdge(PAGEdge* edge);
 
-    inline PAGEdge* addBlackHoleAddrEdge(NodeID node)
+    inline void addBlackHoleAddrEdge(NodeID node)
     {
-        PAGEdge *edge = pag->addBlackHoleAddrStmt(node);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(PAGEdge *edge = pag->addBlackHoleAddrStmt(node))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
 
     /// Add Address edge
     inline AddrStmt* addAddrEdge(NodeID src, NodeID dst)
     {
-        AddrStmt *edge = pag->addAddrStmt(src, dst);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(AddrStmt *edge = pag->addAddrStmt(src, dst)){
+            setCurrentBBAndValueForPAGEdge(edge);
+            return edge;
+        }
+        return nullptr;
     }
     /// Add Copy edge
     inline CopyStmt* addCopyEdge(NodeID src, NodeID dst)
     {
-        CopyStmt *edge = pag->addCopyStmt(src, dst);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(CopyStmt *edge = pag->addCopyStmt(src, dst)){
+            setCurrentBBAndValueForPAGEdge(edge);
+            return edge;
+        }
+        return nullptr;
     }
     /// Add Copy edge
-    inline PhiStmt* addPhiStmt(NodeID res, NodeID opnd, const ICFGNode* pred)
+    inline void addPhiStmt(NodeID res, NodeID opnd, const ICFGNode* pred)
     {
-        PhiStmt *edge = pag->addPhiStmt(res,opnd,pred);
         /// If we already added this phi node, then skip this adding
-        if(edge)
+        if(PhiStmt *edge = pag->addPhiStmt(res,opnd,pred))
             setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
     }
     /// Add SelectStmt
-    inline SelectStmt* addSelectStmt(NodeID res, NodeID op1, NodeID op2, NodeID cond)
+    inline void addSelectStmt(NodeID res, NodeID op1, NodeID op2, NodeID cond)
     {
-        SelectStmt *edge = pag->addSelectStmt(res,op1,op2,cond);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(SelectStmt *edge = pag->addSelectStmt(res,op1,op2,cond))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Copy edge
-    inline CmpStmt* addCmpEdge(NodeID op1, NodeID op2, NodeID dst, u32_t predict)
+    inline void addCmpEdge(NodeID op1, NodeID op2, NodeID dst, u32_t predict)
     {
-        CmpStmt *edge = pag->addCmpStmt(op1, op2, dst, predict);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(CmpStmt *edge = pag->addCmpStmt(op1, op2, dst, predict))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Copy edge
-    inline BinaryOPStmt* addBinaryOPEdge(NodeID op1, NodeID op2, NodeID dst, u32_t opcode)
+    inline void addBinaryOPEdge(NodeID op1, NodeID op2, NodeID dst, u32_t opcode)
     {
-        BinaryOPStmt *edge = pag->addBinaryOPStmt(op1, op2, dst, opcode);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(BinaryOPStmt *edge = pag->addBinaryOPStmt(op1, op2, dst, opcode))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Unary edge
-    inline UnaryOPStmt* addUnaryOPEdge(NodeID src, NodeID dst, u32_t opcode)
+    inline void addUnaryOPEdge(NodeID src, NodeID dst, u32_t opcode)
     {
-        UnaryOPStmt *edge = pag->addUnaryOPStmt(src, dst, opcode);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(UnaryOPStmt *edge = pag->addUnaryOPStmt(src, dst, opcode))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Branch statement 
-    inline BranchStmt* addBranchStmt(NodeID br, NodeID cond, const BranchStmt::SuccAndCondPairVec& succs){
-        BranchStmt *edge = pag->addBranchStmt(br, cond, succs);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+    inline void addBranchStmt(NodeID br, NodeID cond, const BranchStmt::SuccAndCondPairVec& succs){
+        if(BranchStmt *edge = pag->addBranchStmt(br, cond, succs))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Load edge
-    inline LoadStmt* addLoadEdge(NodeID src, NodeID dst)
+    inline void addLoadEdge(NodeID src, NodeID dst)
     {
-        LoadStmt *edge = pag->addLoadStmt(src, dst);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(LoadStmt *edge = pag->addLoadStmt(src, dst))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Store edge
-    inline StoreStmt* addStoreEdge(NodeID src, NodeID dst)
+    inline void addStoreEdge(NodeID src, NodeID dst)
     {
         IntraICFGNode* node;
         if(const Instruction* inst = SVFUtil::dyn_cast<Instruction>(curVal))
             node = pag->getICFG()->getIntraICFGNode(inst);
         else
             node = nullptr;
-        StoreStmt *edge = pag->addStoreStmt(src, dst, node);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(StoreStmt *edge = pag->addStoreStmt(src, dst, node))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Call edge
-    inline CallPE* addCallEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunEntryICFGNode* entry)
+    inline void addCallEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunEntryICFGNode* entry)
     {
-        CallPE *edge = pag->addCallPE(src, dst, cs, entry);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(CallPE *edge = pag->addCallPE(src, dst, cs, entry))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Return edge
-    inline RetPE* addRetEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunExitICFGNode* exit)
+    inline void addRetEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunExitICFGNode* exit)
     {
-        RetPE *edge = pag->addRetPE(src, dst, cs, exit);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(RetPE *edge = pag->addRetPE(src, dst, cs, exit))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Gep edge
-    inline GepStmt* addGepEdge(NodeID src, NodeID dst, const LocationSet& ls, bool constGep)
+    inline void addGepEdge(NodeID src, NodeID dst, const LocationSet& ls, bool constGep)
     {
-        GepStmt *edge = pag->addGepStmt(src, dst, ls, constGep);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(GepStmt *edge = pag->addGepStmt(src, dst, ls, constGep))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Offset(Gep) edge
-    inline GepStmt* addNormalGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
+    inline void addNormalGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
     {
-        GepStmt *edge = pag->addNormalGepStmt(src, dst, ls);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(GepStmt *edge = pag->addNormalGepStmt(src, dst, ls))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Variant(Gep) edge
-    inline GepStmt* addVariantGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
+    inline void addVariantGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
     {
-        GepStmt *edge = pag->addVariantGepStmt(src, dst, ls);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(GepStmt *edge = pag->addVariantGepStmt(src, dst, ls))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Thread fork edge for parameter passing
-    inline TDForkPE* addThreadForkEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunEntryICFGNode* entry)
+    inline void addThreadForkEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunEntryICFGNode* entry)
     {
-        TDForkPE *edge = pag->addThreadForkPE(src, dst, cs, entry);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(TDForkPE *edge = pag->addThreadForkPE(src, dst, cs, entry))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Thread join edge for parameter passing
-    inline TDJoinPE* addThreadJoinEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunExitICFGNode* exit)
+    inline void addThreadJoinEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunExitICFGNode* exit)
     {
-        TDJoinPE *edge = pag->addThreadJoinPE(src, dst, cs, exit);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(TDJoinPE *edge = pag->addThreadJoinPE(src, dst, cs, exit))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     //@}
 

package/SVF-linux/include/SVF-FE/SymbolTableBuilder.h

@@ -69,7 +69,7 @@ public:
     /// Handle constant expression
     // @{
     void handleGlobalCE(const GlobalVariable *G);
-    void handleGlobalInitializerCE(const Constant *C, u32_t offset);
+    void handleGlobalInitializerCE(const Constant *C);
     void handleCE(const Value *val);
     // @}
 

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

@@ -211,6 +211,7 @@ public:
     // SymbolTableInfo.cpp
     static const llvm::cl::opt<bool> LocMemModel;
     static const llvm::cl::opt<bool> ModelConsts;
+    static const llvm::cl::opt<bool> ModelArrays;
     static const llvm::cl::opt<bool> SymTabPrint;
 
     // Conditions.cpp

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

@@ -90,12 +90,6 @@ public:
     {
     }
 
-    /// Initialization from FlattenedFieldInfo
-    LocationSet(const FlattenedFieldInfo& fi)
-        : fldIdx(fi.getFlattenFldIdx())
-    {
-    }
-
     ~LocationSet() {}
 
     /// Overload operators

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

@@ -553,7 +553,7 @@ private:
     }
 
     /// Add a temp field value node, this method can only invoked by getGepValVar
-    NodeID addGepValNode(const Value* curInst,const Value* val, const LocationSet& ls, NodeID i, const Type *type, u32_t fieldidx);
+    NodeID addGepValNode(const Value* curInst,const Value* val, const LocationSet& ls, NodeID i, const Type *type);
     /// Add a field obj node, this method can only invoked by getGepObjVar
     NodeID addGepObjNode(const MemObj* obj, const LocationSet& ls);
     /// Add a field-insensitive node, this method can only invoked by getFIGepObjNode

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

@@ -434,7 +434,6 @@ public:
 
     inline const LocationSet& getLocationSet() const
     {
-        assert(isVariantFieldGep()==false && "Can't retrieve the LocationSet if using a variable field index (pointer arithmetic) for struct field access ");
         return ls;
     }
     inline const LocationSet::OffsetValueVec& getOffsetValueVec() const
@@ -453,6 +452,7 @@ public:
     /// Field index of the gep statement if it access the field of a struct
     inline s64_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();
     }
     /// Gep statement with a variant field index (pointer arithmetic) for struct field access 

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

@@ -395,7 +395,6 @@ class GepValVar: public ValVar
 private:
     LocationSet ls;	// LocationSet
     const Type *gepValType;
-    u32_t fieldIdx;
 
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -419,8 +418,8 @@ public:
     //@}
 
     /// Constructor
-    GepValVar(const Value* val, NodeID i, const LocationSet& l, const Type *ty, u32_t idx) :
-        ValVar(val, i, GepValNode), ls(l), gepValType(ty), fieldIdx(idx)
+    GepValVar(const Value* val, NodeID i, const LocationSet& l, const Type *ty) :
+        ValVar(val, i, GepValNode), ls(l), gepValType(ty)
     {
     }
 
@@ -443,11 +442,6 @@ public:
         return gepValType;
     }
 
-    u32_t getFieldIdx() const
-    {
-        return fieldIdx;
-    }
-
     virtual const std::string toString() const;
 };
 

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

@@ -354,13 +354,9 @@ public:
 
     ///Get a reference to the components of struct_info.
     /// Number of flattenned elements of an array or struct
-    const u32_t getNumOfFlattenElements(const Type *T);
-    /// Number of flattenned fields of a struct
-    const u32_t getNumOfFlattenFields(const StructType *T);
+    u32_t getNumOfFlattenElements(const Type *T);
     /// Flatterned element idx of an array or struct by considering stride
-    const std::vector<u32_t>& getFlattenedElemIdxVec(const Type *T);
-    /// Flatterned field index information of a struct ignoring any array field
-    const std::vector<u32_t>& getFlattenedFieldIdxVec(const StructType *T);
+    u32_t getFlattenedElemIdx(const Type *T, s64_t origId);
 
     const std::vector<FlattenedFieldInfo>& getFlattenedFieldInfoVec(const Type *T);
 

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

@@ -510,7 +510,7 @@ inline const BasicBlock* getFunExitBB(const Function* fun)
 const Value * stripConstantCasts(const Value *val);
 
 /// Strip off the all casts
-Value *stripAllCasts(Value *val) ;
+const Value *stripAllCasts(const Value *val) ;
 
 /// Get the type of the heap allocation
 const Type *getTypeOfHeapAlloc(const llvm::Instruction *inst) ;

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

@@ -109,44 +109,9 @@ public:
         return pag->getVarargNode(func);
     }
     //@}
-
-    /// Handle globals including (global variable and functions)
-    //@{
-    void visitGlobal(SVFModule* svfModule);
-    void InitialGlobal(const GlobalVariable *gvar, Constant *C,
-                       u32_t offset);
-    NodeID getGlobalVarField(const GlobalVariable *gvar, u32_t offset);
-    //@}
-
-    /// Process constant expression
-    void processCE(const Value *val);
-
-    /// Infer field index from byteoffset.
-    u32_t inferFieldIdxFromByteOffset(const llvm::GEPOperator* gepOp, DataLayout *dl, LocationSet& ls, s64_t idx);
-
-    /// Compute offset of a gep instruction or gep constant expression
-    bool computeGepOffset(const User *V, LocationSet& ls);
-
-    /// Get the base type and max offset
-    const Type *getBaseTypeAndFlattenedFields(const Value *V, std::vector<LocationSet> &fields);
-
-    /// Replace fields with flatten fields of T if the number of its fields is larger than msz.
-    u32_t getFields(std::vector<LocationSet>& fields, const Type* T, u32_t msz);
-
-    /// Handle direct call
-    void handleDirectCall(CallSite cs, const SVFFunction *F);
-
-    /// Handle indirect call
-    void handleIndCall(CallSite cs);
-
     /// Update SVFIR given a call graph (creating new CallPE and RetPE for resolved indirect calls)
     void updateCallGraph(PTACallGraph* callgraph);
 
-    /// Handle external call
-    //@{
-    virtual void handleExtCall(CallSite cs, const SVFFunction *F);
-    void addComplexConsForExt(Value *D, Value *S,u32_t sz = 0);
-    //@}
 
     /// Our visit overrides.
     //@{
@@ -241,6 +206,39 @@ public:
     }
     //}@
 
+protected:
+    /// Handle globals including (global variable and functions)
+    //@{
+    void visitGlobal(SVFModule* svfModule);
+    void InitialGlobal(const GlobalVariable *gvar, Constant *C,
+                       u32_t offset);
+    NodeID getGlobalVarField(const GlobalVariable *gvar, u32_t offset);
+    //@}
+
+    /// Process constant expression
+    void processCE(const Value *val);
+
+    /// Infer field index from byteoffset.
+    u32_t inferFieldIdxFromByteOffset(const llvm::GEPOperator* gepOp, DataLayout *dl, LocationSet& ls, s64_t idx);
+
+    /// Compute offset of a gep instruction or gep constant expression
+    bool computeGepOffset(const User *V, LocationSet& ls);
+
+    /// Get the base type and max offset
+    const Type *getBaseTypeAndFlattenedFields(const Value *V, std::vector<LocationSet> &fields, const Value* sz);
+
+    /// Handle direct call
+    void handleDirectCall(CallSite cs, const SVFFunction *F);
+
+    /// Handle indirect call
+    void handleIndCall(CallSite cs);
+
+    /// Handle external call
+    //@{
+    virtual void handleExtCall(CallSite cs, const SVFFunction *F);
+    void addComplexConsForExt(Value *D, Value *S, const Value* sz);
+    //@}
+
     /// Set current basic block in order to keep track of control flow information
     inline void setCurrentLocation(const Value* val, const BasicBlock* bb)
     {
@@ -278,143 +276,128 @@ public:
         return nullPtr;
     }
 
-public:
-
-    NodeID getGepValVar(const Value* val, const LocationSet& ls, const Type *baseType, u32_t fieldidx);
+    NodeID getGepValVar(const Value* val, const LocationSet& ls, const Type *baseType);
 
     void setCurrentBBAndValueForPAGEdge(PAGEdge* edge);
 
-    inline PAGEdge* addBlackHoleAddrEdge(NodeID node)
+    inline void addBlackHoleAddrEdge(NodeID node)
     {
-        PAGEdge *edge = pag->addBlackHoleAddrStmt(node);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(PAGEdge *edge = pag->addBlackHoleAddrStmt(node))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
 
     /// Add Address edge
     inline AddrStmt* addAddrEdge(NodeID src, NodeID dst)
     {
-        AddrStmt *edge = pag->addAddrStmt(src, dst);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(AddrStmt *edge = pag->addAddrStmt(src, dst)){
+            setCurrentBBAndValueForPAGEdge(edge);
+            return edge;
+        }
+        return nullptr;
     }
     /// Add Copy edge
     inline CopyStmt* addCopyEdge(NodeID src, NodeID dst)
     {
-        CopyStmt *edge = pag->addCopyStmt(src, dst);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(CopyStmt *edge = pag->addCopyStmt(src, dst)){
+            setCurrentBBAndValueForPAGEdge(edge);
+            return edge;
+        }
+        return nullptr;
     }
     /// Add Copy edge
-    inline PhiStmt* addPhiStmt(NodeID res, NodeID opnd, const ICFGNode* pred)
+    inline void addPhiStmt(NodeID res, NodeID opnd, const ICFGNode* pred)
     {
-        PhiStmt *edge = pag->addPhiStmt(res,opnd,pred);
         /// If we already added this phi node, then skip this adding
-        if(edge)
+        if(PhiStmt *edge = pag->addPhiStmt(res,opnd,pred))
             setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
     }
     /// Add SelectStmt
-    inline SelectStmt* addSelectStmt(NodeID res, NodeID op1, NodeID op2, NodeID cond)
+    inline void addSelectStmt(NodeID res, NodeID op1, NodeID op2, NodeID cond)
     {
-        SelectStmt *edge = pag->addSelectStmt(res,op1,op2,cond);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(SelectStmt *edge = pag->addSelectStmt(res,op1,op2,cond))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Copy edge
-    inline CmpStmt* addCmpEdge(NodeID op1, NodeID op2, NodeID dst, u32_t predict)
+    inline void addCmpEdge(NodeID op1, NodeID op2, NodeID dst, u32_t predict)
     {
-        CmpStmt *edge = pag->addCmpStmt(op1, op2, dst, predict);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(CmpStmt *edge = pag->addCmpStmt(op1, op2, dst, predict))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Copy edge
-    inline BinaryOPStmt* addBinaryOPEdge(NodeID op1, NodeID op2, NodeID dst, u32_t opcode)
+    inline void addBinaryOPEdge(NodeID op1, NodeID op2, NodeID dst, u32_t opcode)
     {
-        BinaryOPStmt *edge = pag->addBinaryOPStmt(op1, op2, dst, opcode);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(BinaryOPStmt *edge = pag->addBinaryOPStmt(op1, op2, dst, opcode))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Unary edge
-    inline UnaryOPStmt* addUnaryOPEdge(NodeID src, NodeID dst, u32_t opcode)
+    inline void addUnaryOPEdge(NodeID src, NodeID dst, u32_t opcode)
     {
-        UnaryOPStmt *edge = pag->addUnaryOPStmt(src, dst, opcode);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(UnaryOPStmt *edge = pag->addUnaryOPStmt(src, dst, opcode))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Branch statement 
-    inline BranchStmt* addBranchStmt(NodeID br, NodeID cond, const BranchStmt::SuccAndCondPairVec& succs){
-        BranchStmt *edge = pag->addBranchStmt(br, cond, succs);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+    inline void addBranchStmt(NodeID br, NodeID cond, const BranchStmt::SuccAndCondPairVec& succs){
+        if(BranchStmt *edge = pag->addBranchStmt(br, cond, succs))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Load edge
-    inline LoadStmt* addLoadEdge(NodeID src, NodeID dst)
+    inline void addLoadEdge(NodeID src, NodeID dst)
     {
-        LoadStmt *edge = pag->addLoadStmt(src, dst);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(LoadStmt *edge = pag->addLoadStmt(src, dst))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Store edge
-    inline StoreStmt* addStoreEdge(NodeID src, NodeID dst)
+    inline void addStoreEdge(NodeID src, NodeID dst)
     {
         IntraICFGNode* node;
         if(const Instruction* inst = SVFUtil::dyn_cast<Instruction>(curVal))
             node = pag->getICFG()->getIntraICFGNode(inst);
         else
             node = nullptr;
-        StoreStmt *edge = pag->addStoreStmt(src, dst, node);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(StoreStmt *edge = pag->addStoreStmt(src, dst, node))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Call edge
-    inline CallPE* addCallEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunEntryICFGNode* entry)
+    inline void addCallEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunEntryICFGNode* entry)
     {
-        CallPE *edge = pag->addCallPE(src, dst, cs, entry);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(CallPE *edge = pag->addCallPE(src, dst, cs, entry))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Return edge
-    inline RetPE* addRetEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunExitICFGNode* exit)
+    inline void addRetEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunExitICFGNode* exit)
     {
-        RetPE *edge = pag->addRetPE(src, dst, cs, exit);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(RetPE *edge = pag->addRetPE(src, dst, cs, exit))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Gep edge
-    inline GepStmt* addGepEdge(NodeID src, NodeID dst, const LocationSet& ls, bool constGep)
+    inline void addGepEdge(NodeID src, NodeID dst, const LocationSet& ls, bool constGep)
     {
-        GepStmt *edge = pag->addGepStmt(src, dst, ls, constGep);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(GepStmt *edge = pag->addGepStmt(src, dst, ls, constGep))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Offset(Gep) edge
-    inline GepStmt* addNormalGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
+    inline void addNormalGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
     {
-        GepStmt *edge = pag->addNormalGepStmt(src, dst, ls);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(GepStmt *edge = pag->addNormalGepStmt(src, dst, ls))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Variant(Gep) edge
-    inline GepStmt* addVariantGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
+    inline void addVariantGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
     {
-        GepStmt *edge = pag->addVariantGepStmt(src, dst, ls);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(GepStmt *edge = pag->addVariantGepStmt(src, dst, ls))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Thread fork edge for parameter passing
-    inline TDForkPE* addThreadForkEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunEntryICFGNode* entry)
+    inline void addThreadForkEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunEntryICFGNode* entry)
     {
-        TDForkPE *edge = pag->addThreadForkPE(src, dst, cs, entry);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(TDForkPE *edge = pag->addThreadForkPE(src, dst, cs, entry))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     /// Add Thread join edge for parameter passing
-    inline TDJoinPE* addThreadJoinEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunExitICFGNode* exit)
+    inline void addThreadJoinEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunExitICFGNode* exit)
     {
-        TDJoinPE *edge = pag->addThreadJoinPE(src, dst, cs, exit);
-        setCurrentBBAndValueForPAGEdge(edge);
-        return edge;
+        if(TDJoinPE *edge = pag->addThreadJoinPE(src, dst, cs, exit))
+            setCurrentBBAndValueForPAGEdge(edge);
     }
     //@}
 

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

@@ -69,7 +69,7 @@ public:
     /// Handle constant expression
     // @{
     void handleGlobalCE(const GlobalVariable *G);
-    void handleGlobalInitializerCE(const Constant *C, u32_t offset);
+    void handleGlobalInitializerCE(const Constant *C);
     void handleCE(const Value *val);
     // @}
 

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

@@ -211,6 +211,7 @@ public:
     // SymbolTableInfo.cpp
     static const llvm::cl::opt<bool> LocMemModel;
     static const llvm::cl::opt<bool> ModelConsts;
+    static const llvm::cl::opt<bool> ModelArrays;
     static const llvm::cl::opt<bool> SymTabPrint;
 
     // Conditions.cpp

package/package.json

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