svf-tools 1.0.372 → 1.0.376

package/include/MemoryModel/SVFIR.h

@@ -292,20 +292,7 @@ public:
     //@}
 
     /// Due to constaint expression, curInst is used to distinguish different instructions (e.g., memorycpy) when creating GepValVar.
-    inline NodeID getGepValVar(const Value* curInst, NodeID base, const LocationSet& ls) const
-    {
-        GepValueVarMap::const_iterator iter = GepValObjMap.find(curInst);
-        if(iter==GepValObjMap.end()){
-            return UINT_MAX;
-        }
-        else{
-            NodeLocationSetMap::const_iterator lit = iter->second.find(std::make_pair(base, ls));
-            if(lit==iter->second.end())
-                return UINT_MAX;
-            else
-                return lit->second;
-        }
-    }
+    NodeID getGepValVar(const Value* curInst, NodeID base, const LocationSet& ls) const;
 
     /// Add/get indirect callsites
     //@{
@@ -411,27 +398,8 @@ public:
         assert(obj && "not an object node?");
         return SymbolTableInfo::isConstantObj(id) || obj->isConstDataOrConstGlobal();
     }
-    inline bool isNonPointerObj(NodeID id) const
-    {
-        SVFVar* node = getGNode(id);
-        if (FIObjVar* fiNode = SVFUtil::dyn_cast<FIObjVar>(node))
-        {
-            return (fiNode->getMemObj()->hasPtrObj() == false);
-        }
-        else if (GepObjVar* gepNode = SVFUtil::dyn_cast<GepObjVar>(node))
-        {
-            return (gepNode->getMemObj()->isNonPtrFieldObj(gepNode->getLocationSet()));
-        }
-        else if (SVFUtil::isa<DummyObjVar>(node))
-        {
-            return false;
-        }
-        else
-        {
-            assert(false && "expecting a object node");
-            return false;
-        }
-    }
+    /// Whether an object can point to any other object or any of its fields is a pointer type.
+    bool isNonPointerObj(NodeID id) const;
     //@}
 
     /// Base and Offset methods for Value and Object node
@@ -462,7 +430,7 @@ public:
     {
         return addDummyValNode(NodeIDAllocator::get()->allocateValueId());
     }
-    inline NodeID addDummyObjNode(const Type* type = nullptr)
+    inline NodeID addDummyObjNode(const Type* type)
     {
         return addDummyObjNode(NodeIDAllocator::get()->allocateObjectId(), type);
     }
@@ -553,7 +521,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/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/include/MemoryModel/SVFVariables.h

@@ -81,8 +81,7 @@ protected:
     const Value* value; ///< value of this SVFIR node
     SVFStmt::KindToSVFStmtMapTy InEdgeKindToSetMap;
     SVFStmt::KindToSVFStmtMapTy OutEdgeKindToSetMap;
-    bool isTLPointer;	/// top-level pointer
-    bool isATPointer;	/// address-taken pointer
+    bool isPtr;	/// whether it is a pointer (top-level or address-taken)
 
 public:
     /// Constructor
@@ -117,17 +116,7 @@ public:
     /// Whether it is a pointer
     virtual inline bool isPointer() const
     {
-        return isTopLevelPtr() || isAddressTakenPtr();
-    }
-    /// Whether it is a top-level pointer
-    inline bool isTopLevelPtr() const
-    {
-        return isTLPointer;
-    }
-    /// Whether it is an address-taken pointer
-    inline bool isAddressTakenPtr() const
-    {
-        return isATPointer;
+        return isPtr;
     }
     /// Whether it is constant data, i.e., "0", "1.001", "str"
     /// or llvm's metadata, i.e., metadata !4087
@@ -395,7 +384,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 +407,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 +431,6 @@ public:
         return gepValType;
     }
 
-    u32_t getFieldIdx() const
-    {
-        return fieldIdx;
-    }
-
     virtual const std::string toString() const;
 };
 

package/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);
 
@@ -393,7 +389,7 @@ protected:
     virtual void collectSimpleTypeInfo(const Type* T);
 
     /// Create an objectInfo based on LLVM type (value is null, and type could be null, representing a dummy object)
-    ObjTypeInfo* createObjTypeInfo(const Type *type = nullptr);
+    ObjTypeInfo* createObjTypeInfo(const Type *type);
 
     /// Every type T is mapped to StInfo
     /// which contains size (fsize) , offset(foffset)
@@ -596,7 +592,7 @@ public:
  */
 class ObjTypeInfo
 {
-
+friend class SymbolTableBuilder;
 public:
     typedef enum
     {
@@ -623,30 +619,18 @@ private:
     /// maximum number of field object can be created
     /// minimum number is 0 (field insensitive analysis)
     u32_t maxOffsetLimit;
+
+    void resetTypeForHeapStaticObj(const Type* type);
 public:
 
     /// Constructors
-    ObjTypeInfo(const Value*, const Type* t, u32_t max) :
-        type(t), flags(0), maxOffsetLimit(max)
-    {
-    }
-    /// Constructor
-    ObjTypeInfo(u32_t max, const Type* t) : type(t), flags(0), maxOffsetLimit(max)
-    {
+    ObjTypeInfo(const Type* t, u32_t max);
 
-    }
     /// Destructor
     virtual ~ObjTypeInfo()
     {
-
     }
-
-    /// Analyse types of heap and static objects
-    void analyzeHeapObjType(const Type* type);
-
-    /// Analyse types of heap and static objects
-    void analyzeStaticObjType(const Type* type);
-
+    
     /// Get LLVM type
     inline const Type* getType() const
     {

package/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/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/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);
     // @}
 
@@ -79,7 +79,14 @@ public:
     /// Initialize TypeInfo based on LLVM Value
     void initTypeInfo(ObjTypeInfo* typeinfo, const Value* value);
     /// Analyse types of all flattened fields of this object
-    void analyzeGlobalStackObjType(ObjTypeInfo* typeinfo, const Value* val);
+    void analyzeObjType(ObjTypeInfo* typeinfo, const Value* val);
+    /// Analyse types of heap and static objects
+    void analyzeHeapObjType(ObjTypeInfo* typeinfo, const Value* val);
+    /// Analyse types of heap and static objects
+    void analyzeStaticObjType(ObjTypeInfo* typeinfo, const Value* val);
+    /// Return the bitcast instruction which is val's only use site, otherwise return nullptr
+    const Value* getUniqueUseViaCastInst(const Value* val);
+
     /// Return size of this object based on LLVM value
     u32_t getObjSize(const Value* val);
 };

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

@@ -502,53 +502,7 @@ struct DOTGraphTraits<ICFG*> : public DOTGraphTraits<SVFIR*>
     /// Return the label of an ICFG node
     static std::string getSimpleNodeLabel(NodeType *node, ICFG*)
     {
-        std::string str;
-        raw_string_ostream rawstr(str);
-        rawstr << "NodeID: " << node->getId() << "\n";
-        if (IntraICFGNode* bNode = SVFUtil::dyn_cast<IntraICFGNode>(node))
-        {
-            rawstr << "IntraICFGNode ID: " << bNode->getId() << " \t";
-            SVFIR::SVFStmtList&  edges = SVFIR::getPAG()->getSVFStmtList(bNode);
-            if (edges.empty()) {
-                rawstr << value2String(bNode->getInst()) << " \t";
-            } else {
-                for (SVFIR::SVFStmtList::iterator it = edges.begin(), eit = edges.end(); it != eit; ++it)
-                {
-                    const PAGEdge* edge = *it;
-                    rawstr << edge->toString();
-                }
-            }
-            rawstr << " {fun: " << bNode->getFun()->getName() << "}";
-        }
-        else if (FunEntryICFGNode* entry = SVFUtil::dyn_cast<FunEntryICFGNode>(node))
-        {
-            rawstr << entry->toString();
-        }
-        else if (FunExitICFGNode* exit = SVFUtil::dyn_cast<FunExitICFGNode>(node))
-        {
-            rawstr << exit->toString();
-        }
-        else if (CallICFGNode* call = SVFUtil::dyn_cast<CallICFGNode>(node))
-        {
-            rawstr << call->toString();
-        }
-        else if (RetICFGNode* ret = SVFUtil::dyn_cast<RetICFGNode>(node))
-        {
-            rawstr << ret->toString();
-        }
-        else if (GlobalICFGNode* glob  = SVFUtil::dyn_cast<GlobalICFGNode>(node) )
-        {
-            SVFIR::SVFStmtList&  edges = SVFIR::getPAG()->getSVFStmtList(glob);
-            for (SVFIR::SVFStmtList::iterator it = edges.begin(), eit = edges.end(); it != eit; ++it)
-            {
-                const PAGEdge* edge = *it;
-                rawstr << edge->toString();
-            }
-        }
-        else
-            assert(false && "what else kinds of nodes do we have??");
-
-        return rawstr.str();
+        return node->toString();
     }
 
     static std::string getNodeAttributes(NodeType *node, ICFG*)

package/lib/MemoryModel/LocationSet.cpp

@@ -118,13 +118,17 @@ s64_t LocationSet::accumulateConstantOffset() const{
         const Type* type = offsetValues[i].second;
         const ConstantInt *op = SVFUtil::dyn_cast<ConstantInt>(value);
         assert(op && "not a constant offset?");
+        if(type==nullptr){
+            totalConstOffset += op->getSExtValue();
+            continue;
+        }
+
         if(const PointerType* pty = SVFUtil::dyn_cast<PointerType>(type))
             totalConstOffset += op->getSExtValue() * getElementNum(pty->getElementType());
         else{
             s64_t offset = op->getSExtValue();
-            const std::vector<u32_t>& so = SymbolTableInfo::SymbolInfo()->getFlattenedElemIdxVec(type); 
-            assert((u32_t)offset <= so.size() && "out of bounds or offset is a negative value?");
-            totalConstOffset += so[op->getSExtValue()];
+            u32_t flattenOffset = SymbolTableInfo::SymbolInfo()->getFlattenedElemIdx(type, offset); 
+            totalConstOffset += flattenOffset;
         }
     }
     return totalConstOffset;

package/lib/MemoryModel/PointerAnalysisImpl.cpp

@@ -265,7 +265,7 @@ bool BVDataPTAImpl::readFromFile(const string& filename)
         size_t offset;
         ss >> id >> base >> offset;
 
-        NodeID n = pag->getGepObjVar(pag->getObject(base), LocationSet(offset));
+        NodeID n = pag->getGepObjVar(base, LocationSet(offset));
         assert(id == n && "Error adding GepObjNode into SVFIR!");
 
         getline(F, line);