svf-tools 1.0.1030 → 1.0.1031

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1030",
+  "version": "1.0.1031",
   "description": "* <b>[TypeClone](https://github.com/SVF-tools/SVF/wiki/TypeClone) published in our [ECOOP paper](https://yuleisui.github.io/publications/ecoop20.pdf) is now available in SVF </b> * <b>SVF now uses a single script for its build. Just type [`source ./build.sh`](https://github.com/SVF-tools/SVF/blob/master/build.sh) in your terminal, that's it!</b> * <b>SVF now supports LLVM-10.0.0! </b> * <b>We thank [bsauce](https://github.com/bsauce) for writing a user manual of SVF ([link1](https://www.jianshu.com/p/068a08ec749c) and [link2](https://www.jianshu.com/p/777c30d4240e)) in Chinese </b> * <b>SVF now supports LLVM-9.0.0 (Thank [Byoungyoung Lee](https://github.com/SVF-tools/SVF/issues/142) for his help!). </b> * <b>SVF now supports a set of [field-sensitive pointer analyses](https://yuleisui.github.io/publications/sas2019a.pdf). </b> * <b>[Use SVF as an external lib](https://github.com/SVF-tools/SVF/wiki/Using-SVF-as-a-lib-in-your-own-tool) for your own project (Contributed by [Hongxu Chen](https://github.com/HongxuChen)). </b> * <b>SVF now supports LLVM-7.0.0. </b> * <b>SVF now supports Docker. [Try SVF in Docker](https://github.com/SVF-tools/SVF/wiki/Try-SVF-in-Docker)! </b> * <b>SVF now supports [LLVM-6.0.0](https://github.com/svf-tools/SVF/pull/38) (Contributed by [Jack Anthony](https://github.com/jackanth)). </b> * <b>SVF now supports [LLVM-4.0.0](https://github.com/svf-tools/SVF/pull/23) (Contributed by Jared Carlson. Thank [Jared](https://github.com/jcarlson23) and [Will](https://github.com/dtzWill) for their in-depth [discussions](https://github.com/svf-tools/SVF/pull/18) about updating SVF!) </b> * <b>SVF now supports analysis for C++ programs.</b> <br />",
   "main": "index.js",
   "scripts": {

package/svf/include/Graphs/CHG.h

@@ -42,8 +42,9 @@ namespace SVF
 
 class SVFModule;
 class CHNode;
+class GlobalObjVar;
 
-typedef Set<const SVFGlobalValue*> VTableSet;
+typedef Set<const GlobalObjVar*> VTableSet;
 typedef Set<const SVFFunction*> VFunSet;
 
 /// Common base for class hierarchy graph. Only implements what PointerAnalysis needs.
@@ -127,7 +128,7 @@ public:
     ~CHNode()
     {
     }
-    std::string getName() const
+    virtual const std::string& getName() const
     {
         return className;
     }
@@ -181,12 +182,12 @@ public:
     }
     void getVirtualFunctions(u32_t idx, FuncVector &virtualFunctions) const;
 
-    const SVFGlobalValue *getVTable() const
+    const GlobalObjVar *getVTable() const
     {
         return vtable;
     }
 
-    void setVTable(const SVFGlobalValue *vtbl)
+    void setVTable(const GlobalObjVar *vtbl)
     {
         vtable = vtbl;
     }
@@ -210,7 +211,7 @@ public:
     //@}
 
 private:
-    const SVFGlobalValue* vtable;
+    const GlobalObjVar* vtable;
     std::string className;
     size_t flags;
     /*

package/svf/include/Graphs/GenericGraph.h

@@ -160,12 +160,13 @@ public:
         RetNode,                 // ├──Represents a return value node
         VarargNode,              // ├──Represents a variadic argument node
         GlobalValNode,           // ├──Represents a global variable node
+        ConstantAggValNode,      // ├──Represents a constant aggregate value node
         ConstantDataValNode,     // ├──Represents a constant data variable
         BlackHoleNode,           // ├──Represents a black hole node
         ConstantFPValNode,       // ├──Represents a constant float-point value node
         ConstantIntValNode,      // ├── Represents a constant integer value node
         ConstantNullptrValNode,  // ├── Represents a constant nullptr value node
-        DummyValNode,            // ├──Dummy node for uninitialized values
+        DummyValNode,            // ├──Represents a dummy node for uninitialized values
         // │   └── ObjVar: Classes of object variable nodes
         ObjNode,                 // ├──Represents an object variable
         GepObjNode,              // ├──Represents a GEP object variable
@@ -175,6 +176,7 @@ public:
         HeapObjNode,             // ├──Types of heap object
         StackObjNode,            // ├──Types of stack object
         GlobalObjNode,           // ├──Types of global object
+        ConstantAggObjNode,      // ├──Types of constant aggregate object
         ConstantDataObjNode,     // ├──Types of constant data object
         ConstantFPObjNode,       // ├──Types of constant float-point object
         ConstantIntObjNode,      // ├──Types of constant integer object
@@ -250,6 +252,21 @@ public:
         return type;
     }
 
+    inline virtual void setName(const std::string& nameInfo)
+    {
+        name = nameInfo;
+    }
+
+    inline virtual void setName(std::string&& nameInfo)
+    {
+        name = std::move(nameInfo);
+    }
+
+    virtual const std::string& getName() const
+    {
+        return name;
+    }
+
     inline virtual void setSourceLoc(const std::string& sourceCodeInfo)
     {
         sourceLoc = sourceCodeInfo;
@@ -268,6 +285,7 @@ protected:
     GNodeK nodeKind;	///< Node kind
     const SVFType* type; ///< SVF type
 
+    std::string name;
     std::string sourceLoc;  ///< Source code information of this value
 
     /// Helper functions to check node kinds
@@ -290,7 +308,7 @@ protected:
 
     static inline bool isSVFVarKind(GNodeK n)
     {
-        static_assert(DummyObjNode - ValNode == 24,
+        static_assert(DummyObjNode - ValNode == 26,
                       "The number of SVFVarKinds has changed, make sure the "
                       "range is correct");
 
@@ -299,7 +317,7 @@ protected:
 
     static inline bool isValVarKinds(GNodeK n)
     {
-        static_assert(DummyValNode - ValNode == 12,
+        static_assert(DummyValNode - ValNode == 13,
                       "The number of ValVarKinds has changed, make sure the "
                       "range is correct");
         return n <= DummyValNode && n >= ValNode;
@@ -316,7 +334,7 @@ protected:
 
     static inline bool isObjVarKinds(GNodeK n)
     {
-        static_assert(DummyObjNode - ObjNode == 11,
+        static_assert(DummyObjNode - ObjNode == 12,
                       "The number of ObjVarKinds has changed, make sure the "
                       "range is correct");
         return n <= DummyObjNode && n >= ObjNode;
@@ -324,7 +342,7 @@ protected:
 
     static inline bool isBaseObjVarKinds(GNodeK n)
     {
-        static_assert(DummyObjNode - BaseObjNode == 9,
+        static_assert(DummyObjNode - BaseObjNode == 10,
                       "The number of BaseObjVarKinds has changed, make sure the "
                       "range is correct");
         return n <= DummyObjNode && n >= BaseObjNode;

package/svf/include/MemoryModel/PointerAnalysis.h

@@ -104,7 +104,7 @@ public:
     typedef Set<const SVFFunction*> FunctionSet;
     typedef OrderedMap<const CallICFGNode*, FunctionSet> CallEdgeMap;
     typedef SCCDetection<PTACallGraph*> CallGraphSCC;
-    typedef Set<const SVFGlobalValue*> VTableSet;
+    typedef Set<const GlobalObjVar*> VTableSet;
     typedef Set<const SVFFunction*> VFunSet;
     //@}
 

package/svf/include/MemoryModel/PointerAnalysisImpl.h

@@ -570,7 +570,7 @@ public:
                 }
                 else if (!SVFUtil::isa<DummyValVar>(node))
                 {
-                    SVFUtil::outs() << "##<" << node->getValue()->getName() << "> ";
+                    SVFUtil::outs() << "##<" << node->toString() << "> ";
                     //SVFUtil::outs() << "Source Loc: " << SVFUtil::getSourceLoc(node->getValue());
                 }
 

package/svf/include/SVFIR/SVFIR.h

@@ -407,8 +407,7 @@ public:
     {
         const SVFVar* node = getGNode(id);
         if(const GepValVar* gepVar = SVFUtil::dyn_cast<GepValVar>(node))
-            return SVFUtil::dyn_cast<ValVar>(
-                       getGNode(gepVar->getBaseNode()));
+            return gepVar->getBaseNode();
         else
             return SVFUtil::dyn_cast<ValVar>(node);
     }
@@ -590,6 +589,12 @@ private:
         return addNode(node);
     }
 
+    inline NodeID addConstantAggValNode(const SVFValue* curInst, const NodeID i, const ICFGNode* icfgNode)
+    {
+        SVFVar* node = new ConstantAggValVar(curInst, i, icfgNode);
+        return addNode(node);
+    }
+
     inline NodeID addConstantDataValNode(const SVFValue* curInst, const NodeID i, const ICFGNode* icfgNode)
     {
         SVFVar* node = new ConstantDataValVar(curInst, i, icfgNode);
@@ -661,7 +666,13 @@ private:
         GlobalObjVar* gObj = new GlobalObjVar(curInst, i, ti);
         return addObjNode(curInst, gObj);
     }
-
+    inline NodeID addConstantAggObjNode(const SVFValue* curInst,
+                                        const NodeID i, ObjTypeInfo* ti)
+    {
+        memToFieldsMap[i].set(i);
+        ConstantAggObjVar* conObj = new ConstantAggObjVar(curInst, i, ti);
+        return addObjNode(curInst, conObj);
+    }
     inline NodeID addConstantDataObjNode(const SVFValue* curInst, const NodeID i, ObjTypeInfo* ti)
     {
         memToFieldsMap[i].set(i);

package/svf/include/SVFIR/SVFValue.h

@@ -244,10 +244,7 @@ public:
     {
         return name;
     }
-    inline void setName(const std::string& n)
-    {
-        name = n;
-    }
+
     inline void setName(std::string&& n)
     {
         name = std::move(n);

package/svf/include/SVFIR/SVFVariables.h

@@ -46,6 +46,7 @@ class SVFVar : public GenericPAGNodeTy
 {
     friend class SVFIRWriter;
     friend class SVFIRReader;
+    friend class SVFIRBuilder;
     friend class IRGraph;
     friend class SVFIR;
     friend class VFG;
@@ -68,11 +69,13 @@ protected:
     SVFStmt::KindToSVFStmtMapTy InEdgeKindToSetMap;
     SVFStmt::KindToSVFStmtMapTy OutEdgeKindToSetMap;
     bool isPtr;	/// whether it is a pointer (top-level or address-taken)
+
     const SVFFunction* func; /// function containing this variable
 
     /// Constructor to create an empty object (for deserialization)
     SVFVar(NodeID i, PNODEK k) : GenericPAGNodeTy(i, k), value{} {}
 
+
 public:
     /// Constructor
     SVFVar(const SVFValue* val, NodeID i, PNODEK k);
@@ -109,7 +112,10 @@ public:
     }
     /// Whether it is constant data, i.e., "0", "1.001", "str"
     /// or llvm's metadata, i.e., metadata !4087
-    bool isConstDataOrAggDataButNotNullPtr() const;
+    virtual bool isConstDataOrAggDataButNotNullPtr() const
+    {
+        return false;
+    }
 
     /// Whether this is an isolated node on the SVFIR graph
     virtual bool isIsolatedNode() const;
@@ -216,6 +222,24 @@ public:
         return isSVFVarKind(node->getNodeKind());
     }
 
+    inline virtual bool ptrInUncalledFunction() const
+    {
+        if (const SVFFunction* fun = getFunction())
+        {
+            return fun->isUncalledFunction();
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    virtual bool isConstDataOrAggData() const
+    {
+        return false;
+    }
+
+
 private:
     ///  add methods of the components
     //@{
@@ -465,7 +489,7 @@ class GepValVar: public ValVar
 
 private:
     AccessPath ap;	// AccessPath
-    NodeID base;	// base node id
+    ValVar* base;	// base node
     const SVFType* gepValType;
 
     /// Constructor to create empty GeValVar (for SVFIRReader/deserialization)
@@ -490,14 +514,15 @@ public:
     {
         return node->getNodeKind() == SVFVar::GepValNode;
     }
+    static inline bool classof(const SVFBaseNode* node)
+    {
+        return node->getNodeKind() == SVFVar::GepValNode;
+    }
     //@}
 
     /// Constructor
-    GepValVar(NodeID baseID, const SVFValue* val, NodeID i, const AccessPath& ap,
-              const SVFType* ty)
-        : ValVar(val, i, GepValNode), ap(ap), base(baseID), gepValType(ty)
-    {
-    }
+    GepValVar(ValVar* baseNode, const SVFValue* val, NodeID i, const AccessPath& ap,
+              const SVFType* ty);
 
     /// offset of the base value variable
     inline APOffset getConstantFieldIdx() const
@@ -506,7 +531,7 @@ public:
     }
 
     /// Return the base object from which this GEP node came from.
-    inline NodeID getBaseNode(void) const
+    inline ValVar* getBaseNode(void) const
     {
         return base;
     }
@@ -526,6 +551,20 @@ public:
     }
 
     virtual const std::string toString() const;
+
+    virtual bool isConstDataOrAggDataButNotNullPtr() const
+    {
+        return base->isConstDataOrAggDataButNotNullPtr();
+    }
+    virtual inline bool ptrInUncalledFunction() const
+    {
+        return base->ptrInUncalledFunction();
+    }
+
+    virtual inline bool isConstDataOrAggData() const
+    {
+        return base->isConstDataOrAggData();
+    }
 };
 
 /*
@@ -716,7 +755,7 @@ public:
     {
         return typeInfo->isConstDataOrConstGlobal();
     }
-    bool isConstDataOrAggData() const
+    virtual inline bool isConstDataOrAggData() const
     {
         return typeInfo->isConstDataOrAggData();
     }
@@ -781,7 +820,6 @@ public:
               const APOffset& apOffset, PNODEK ty = GepObjNode)
         : ObjVar(baseObj->hasValue()? baseObj->getValue(): nullptr, i, ty), apOffset(apOffset), base(baseObj)
     {
-
     }
 
     /// offset of the mem object
@@ -816,6 +854,21 @@ public:
     }
 
     virtual const std::string toString() const;
+
+    virtual inline bool ptrInUncalledFunction() const
+    {
+        return base->ptrInUncalledFunction();
+    }
+
+    virtual inline bool isConstDataOrAggData() const
+    {
+        return base->isConstDataOrAggData();
+    }
+
+    virtual bool isConstDataOrAggDataButNotNullPtr() const
+    {
+        return base->isConstDataOrAggDataButNotNullPtr();
+    }
 };
 
 
@@ -1093,6 +1146,58 @@ public:
     virtual const std::string toString() const;
 };
 
+class ConstantAggValVar: public ValVar
+{
+    friend class SVFIRWriter;
+    friend class SVFIRReader;
+
+public:
+    ///  Methods for support type inquiry through isa, cast, and dyn_cast:
+    //@{
+    static inline bool classof(const ConstantAggValVar*)
+    {
+        return true;
+    }
+    static inline bool classof(const ValVar* node)
+    {
+        return node->getNodeKind() == ConstantAggValNode;
+    }
+    static inline bool classof(const SVFVar* node)
+    {
+        return node->getNodeKind() == ConstantAggValNode;
+    }
+    static inline bool classof(const GenericPAGNodeTy* node)
+    {
+        return node->getNodeKind() == ConstantAggValNode;
+    }
+    static inline bool classof(const SVFBaseNode* node)
+    {
+        return node->getNodeKind() == ConstantAggValNode;
+    }
+    //@}
+
+    /// Constructor
+    ConstantAggValVar(const SVFValue* val, NodeID i, const ICFGNode* icn,
+                      PNODEK ty = ConstantAggValNode)
+        : ValVar(val, i,  ty,  icn)
+    {
+
+    }
+
+    virtual bool isConstDataOrAggData() const
+    {
+        return true;
+    }
+
+    virtual bool isConstDataOrAggDataButNotNullPtr() const
+    {
+        return true;
+    }
+
+    virtual const std::string toString() const;
+};
+
+
 class ConstantDataValVar: public ValVar
 {
     friend class SVFIRWriter;
@@ -1131,6 +1236,16 @@ public:
 
     }
 
+    virtual bool isConstDataOrAggData() const
+    {
+        return true;
+    }
+
+    virtual bool isConstDataOrAggDataButNotNullPtr() const
+    {
+        return true;
+    }
+
     virtual const std::string toString() const;
 };
 
@@ -1175,6 +1290,11 @@ public:
 
     }
 
+    virtual bool isConstDataOrAggDataButNotNullPtr() const
+    {
+        return false;
+    }
+
     virtual const std::string toString() const
     {
         return "BlackHoleVar";
@@ -1333,6 +1453,11 @@ public:
 
     }
 
+    virtual bool isConstDataOrAggDataButNotNullPtr() const
+    {
+        return false;
+    }
+
     virtual const std::string toString() const;
 };
 
@@ -1385,6 +1510,62 @@ public:
     virtual const std::string toString() const;
 };
 
+class ConstantAggObjVar: public BaseObjVar
+{
+    friend class SVFIRWriter;
+    friend class SVFIRReader;
+
+public:
+    ///  Methods for support type inquiry through isa, cast, and dyn_cast:
+    //@{
+    static inline bool classof(const ConstantAggObjVar*)
+    {
+        return true;
+    }
+    static inline bool classof(const BaseObjVar* node)
+    {
+        return node->getNodeKind() == ConstantAggObjNode;
+    }
+
+    static inline bool classof(const ObjVar* node)
+    {
+        return node->getNodeKind() == ConstantAggObjNode;
+    }
+    static inline bool classof(const SVFVar* node)
+    {
+        return node->getNodeKind() == ConstantAggObjNode;
+    }
+    static inline bool classof(const GenericPAGNodeTy* node)
+    {
+        return node->getNodeKind() == ConstantAggObjNode;
+    }
+    static inline bool classof(const SVFBaseNode* node)
+    {
+        return node->getNodeKind() == ConstantAggObjNode;
+    }
+    //@}
+
+    /// Constructor
+    ConstantAggObjVar(const SVFValue* val, NodeID i, ObjTypeInfo* ti,
+                      PNODEK ty = ConstantAggObjNode)
+        : BaseObjVar(val, i,  ti, ty)
+    {
+
+    }
+
+    virtual bool isConstDataOrAggData() const
+    {
+        return true;
+    }
+
+    virtual bool isConstDataOrAggDataButNotNullPtr() const
+    {
+        return true;
+    }
+
+    virtual const std::string toString() const;
+};
+
 class ConstantDataObjVar: public BaseObjVar
 {
     friend class SVFIRWriter;
@@ -1429,6 +1610,16 @@ public:
     {
     }
 
+    virtual bool isConstDataOrAggData() const
+    {
+        return true;
+    }
+
+    virtual bool isConstDataOrAggDataButNotNullPtr() const
+    {
+        return true;
+    }
+
     virtual const std::string toString() const;
 };
 
@@ -1616,6 +1807,10 @@ public:
     {
     }
 
+    virtual bool isConstDataOrAggDataButNotNullPtr() const
+    {
+        return false;
+    }
 
     virtual const std::string toString() const;
 };

package/svf/lib/DDA/ContextDDA.cpp

@@ -340,7 +340,7 @@ bool ContextDDA::isHeapCondMemObj(const CxtVar& var, const StoreSVFGNode*)
     assert(baseVar && "base object is null??");
     if (SVFUtil::isa<HeapObjVar, DummyObjVar>(baseVar))
     {
-        if (!obj->getValue())
+        if (!isa<DummyObjVar>(baseVar))
         {
             PAGNode *pnode = _pag->getGNode(getPtrNodeID(var));
             GepObjVar* gepobj = SVFUtil::dyn_cast<GepObjVar>(pnode);

package/svf/lib/DDA/DDAClient.cpp

@@ -213,17 +213,12 @@ void AliasDDAClient::performStat(PointerAnalysis* pta)
         {
             const PAGNode* node1 = *lit;
             const PAGNode* node2 = *sit;
-            if(node1->hasValue() && node2->hasValue())
-            {
-                AliasResult result = pta->alias(node1->getId(),node2->getId());
-
-                outs() << "\n=================================================\n";
-                outs() << "Alias Query for (" << node1->getValue()->toString() << ",";
-                outs() << node2->getValue()->toString() << ") \n";
-                outs() << "[NodeID:" << node1->getId() <<  ", NodeID:" << node2->getId() << " " << result << "]\n";
-                outs() << "=================================================\n";
-
-            }
+            AliasResult result = pta->alias(node1->getId(), node2->getId());
+            outs() << "\n=================================================\n";
+            outs() << "Alias Query for (" << node1->valueOnlyToString() << ",";
+            outs() << node2->valueOnlyToString() << ") \n";
+            outs() << "[NodeID:" << node1->getId() << ", NodeID:" << node2->getId() << " " << result << "]\n";
+            outs() << "=================================================\n";
         }
     }
 }

package/svf/lib/Graphs/CHG.cpp

@@ -127,7 +127,7 @@ void CHGraph::getVFnsFromVtbls(const CallICFGNode* callsite, const VTableSet &vt
     size_t idx = callsite->getFunIdxInVtable();
     /// get the function name of the virtual callsite
     string funName = callsite->getFunNameOfVirtualCall();
-    for (const SVFGlobalValue *vt : vtbls)
+    for (const GlobalObjVar *vt : vtbls)
     {
         const CHNode *child = getNode(vt->getName());
         if (child == nullptr)

package/svf/lib/Graphs/ConsG.cpp

@@ -775,7 +775,7 @@ struct DOTGraphTraits<ConstraintGraph*> : public DOTGraphTraits<SVFIR*>
             if (SVFUtil::isa<ValVar>(node))
             {
                 if (nameDisplay)
-                    rawstr << node->getId() << ":" << node->getValueName();
+                    rawstr << node->getId() << ":" << node->getName();
                 else
                     rawstr << node->getId();
             }

package/svf/lib/Graphs/VFG.cpp

@@ -125,10 +125,7 @@ const std::string CmpVFGNode::toString() const
             it != eit; it++)
         rawstr << it->second->getId() << ", ";
     rawstr << ")]\n";
-    if(res->hasValue())
-    {
-        rawstr << " " << res->getValue()->toString();
-    }
+    rawstr << " " << res->valueOnlyToString();
     return rawstr.str();
 }
 
@@ -149,10 +146,7 @@ const std::string BinaryOPVFGNode::toString() const
             it != eit; it++)
         rawstr << it->second->getId() << ", ";
     rawstr << ")]\t";
-    if(res->hasValue())
-    {
-        rawstr << " " << res->getValue()->toString();
-    }
+    rawstr << " " << res->valueOnlyToString();
     return rawstr.str();
 }
 
@@ -173,10 +167,7 @@ const std::string UnaryOPVFGNode::toString() const
             it != eit; it++)
         rawstr << it->second->getId() << ", ";
     rawstr << ")]\t";
-    if(res->hasValue())
-    {
-        rawstr << " " << res->getValue()->toString();
-    }
+    rawstr << " " << res->valueOnlyToString();
     return rawstr.str();
 }
 
@@ -227,10 +218,7 @@ const std::string PHIVFGNode::toString() const
             it != eit; it++)
         rawstr << it->second->getId() << ", ";
     rawstr << ")]\t";
-    if(res->hasValue())
-    {
-        rawstr << " " << res->getValue()->toString();
-    }
+    rawstr << " " << res->valueOnlyToString();
     return rawstr.str();
 }
 
@@ -245,10 +233,7 @@ const std::string IntraPHIVFGNode::toString() const
             it != eit; it++)
         rawstr << it->second->getId() << ", ";
     rawstr << ")]\t";
-    if(res->hasValue())
-    {
-        rawstr << " " << res->getValue()->toString();
-    }
+    rawstr << " " << res->valueOnlyToString();
     return rawstr.str();
 }
 
@@ -353,9 +338,9 @@ const std::string InterPHIVFGNode::toString() const
     std::string str;
     std::stringstream rawstr(str);
     if(isFormalParmPHI())
-        rawstr << "FormalParmPHI ID: " << getId() << " PAGNode ID: " << res->getId() << "\n" << res->getValue()->toString();
+        rawstr << "FormalParmPHI ID: " << getId() << " PAGNode ID: " << res->getId() << "\n" << res->valueOnlyToString();
     else
-        rawstr << "ActualRetPHI ID: " << getId() << " PAGNode ID: " << res->getId() << "\n" << res->getValue()->toString();
+        rawstr << "ActualRetPHI ID: " << getId() << " PAGNode ID: " << res->getId() << "\n" << res->valueOnlyToString();
     return rawstr.str();
 }
 
@@ -1090,12 +1075,12 @@ const SVFVar* BinaryOPVFGNode::getValue() const
 
 const SVFVar* PHIVFGNode::getValue() const
 {
-    return getRes()->hasValue() ? getRes(): nullptr;
+    return getRes();
 }
 
 const SVFVar* ArgumentVFGNode::getValue() const
 {
-    return param->hasValue() ? param : nullptr;
+    return param;
 }
 
 /*!

package/svf/lib/MemoryModel/PointerAnalysis.cpp

@@ -239,11 +239,11 @@ void PointerAnalysis::dumpAllTypes()
         if (SVFUtil::isa<DummyObjVar, DummyValVar>(node))
             continue;
 
-        outs() << "##<" << node->getValue()->getName() << "> ";
-        outs() << "Source Loc: " << node->getValue()->getSourceLoc();
+        outs() << "##<" << node->getName() << "> ";
+        outs() << "Source Loc: " << node->getSourceLoc();
         outs() << "\nNodeID " << node->getId() << "\n";
 
-        const SVFType* type = node->getValue()->getType();
+        const SVFType* type = node->getType();
         pag->getSymbolInfo()->printFlattenFields(type);
     }
 }
@@ -262,11 +262,8 @@ void PointerAnalysis::dumpPts(NodeID ptr, const PointsTo& pts)
     }
     else if (!SVFUtil::isa<DummyValVar>(node) && !SVFModule::pagReadFromTXT())
     {
-        if (node->hasValue())
-        {
-            outs() << "##<" << node->getValue()->getName() << "> ";
-            outs() << "Source Loc: " << node->getValue()->getSourceLoc();
-        }
+        outs() << "##<" << node->getName() << "> ";
+        outs() << "Source Loc: " << node->getSourceLoc();
     }
     outs() << "\nPtr " << node->getId() << " ";
 
@@ -301,12 +298,9 @@ void PointerAnalysis::dumpPts(NodeID ptr, const PointsTo& pts)
         {
             if (!SVFModule::pagReadFromTXT())
             {
-                if (node->hasValue())
-                {
-                    outs() << "<" << pagNode->getValue()->getName() << "> ";
-                    outs() << "Source Loc: "
-                           << pagNode->getValue()->getSourceLoc() << "] \n";
-                }
+                outs() << "<" << pagNode->getName() << "> ";
+                outs() << "Source Loc: "
+                       << pagNode->getSourceLoc() << "] \n";
             }
         }
     }
@@ -439,22 +433,28 @@ void PointerAnalysis::getVFnsFromPts(const CallICFGNode* cs, const PointsTo &tar
 
     if (chgraph->csHasVtblsBasedonCHA(cs))
     {
-        Set<const SVFGlobalValue*> vtbls;
+        Set<const GlobalObjVar*> vtbls;
         const VTableSet &chaVtbls = chgraph->getCSVtblsBasedonCHA(cs);
         for (PointsTo::iterator it = target.begin(), eit = target.end(); it != eit; ++it)
         {
             const PAGNode *ptdnode = pag->getGNode(*it);
-            if (ptdnode->hasValue())
+            const GlobalObjVar* pVar = nullptr;
+            if (isa<ObjVar>(ptdnode) && isa<GlobalObjVar>(pag->getBaseObject(ptdnode->getId())))
             {
-                if ((isa<ObjVar>(ptdnode) && isa<GlobalObjVar>(pag->getBaseObject(ptdnode->getId())))
-                        || (isa<ValVar>(ptdnode) && isa<GlobalValVar>(pag->getBaseValVar(ptdnode->getId()))))
-                {
-                    const SVFGlobalValue* globalValue = SVFUtil::dyn_cast<SVFGlobalValue>(ptdnode->getValue());
-                    if (chaVtbls.find(globalValue) != chaVtbls.end())
-                        vtbls.insert(globalValue);
-                }
+                pVar = cast<GlobalObjVar>(pag->getBaseObject(ptdnode->getId()));
 
             }
+            else if (isa<ValVar>(ptdnode) &&
+                     isa<GlobalValVar>(
+                         pag->getBaseValVar(ptdnode->getId())))
+            {
+                pVar = cast<GlobalObjVar>(
+                           SVFUtil::getObjVarOfValVar(cast<GlobalValVar>(
+                                   pag->getBaseValVar(ptdnode->getId()))));
+            }
+
+            if (pVar && chaVtbls.find(pVar) != chaVtbls.end())
+                vtbls.insert(pVar);
         }
         chgraph->getVFnsFromVtbls(cs, vtbls, vfns);
     }

package/svf/lib/SABER/SaberSVFGBuilder.cpp

@@ -133,7 +133,7 @@ PointsTo& SaberSVFGBuilder::CollectPtsChain(BVDataPTAImpl* pta, NodeID id, NodeT
         // base object
         if (!Options::CollectExtRetGlobals())
         {
-            if(pta->isFIObjNode(baseId) && pag->getGNode(baseId)->hasValue())
+            if(pta->isFIObjNode(baseId))
             {
                 ValVar* valVar = SVFUtil::dyn_cast<ValVar>(pag->getGNode(baseId));
                 if(valVar && valVar->getICFGNode() && SVFUtil::isExtCall(valVar->getICFGNode()))

package/svf/lib/SVFIR/SVFFileSystem.cpp

@@ -181,12 +181,14 @@ cJSON* SVFIRWriter::virtToJson(const SVFVar* var)
         CASE(HeapObjNode, HeapObjVar);
         CASE(StackObjNode, StackObjVar);
         CASE(ConstantDataValNode, ConstantDataValVar);
+        CASE(ConstantAggValNode, ConstantAggValVar);
         CASE(GlobalValNode, GlobalValVar);
         CASE(BlackHoleNode, BlackHoleVar);
         CASE(ConstantFPValNode, ConstantFPValVar);
         CASE(ConstantIntValNode, ConstantIntValVar);
         CASE(ConstantNullptrValNode, ConstantNullPtrValVar);
         CASE(ConstantDataObjNode, ConstantDataObjVar);
+        CASE(ConstantAggObjNode, ConstantAggObjVar);
         CASE(GlobalObjNode, GlobalObjVar);
         CASE(ConstantFPObjNode, ConstantFPObjVar);
         CASE(ConstantIntObjNode, ConstantIntObjVar);

package/svf/lib/SVFIR/SVFIR.cpp

@@ -391,7 +391,7 @@ NodeID SVFIR::addGepValNode(const SVFValue* curInst,const SVFValue* gepVal, cons
     assert(0==GepValObjMap[curInst].count(std::make_pair(base, ap))
            && "this node should not be created before");
     GepValObjMap[curInst][std::make_pair(base, ap)] = i;
-    GepValVar *node = new GepValVar(base, gepVal, i, ap, type);
+    GepValVar *node = new GepValVar(cast<ValVar>(getGNode(base)), gepVal, i, ap, type);
     return addValNode(gepVal, node);
 }
 
@@ -645,13 +645,11 @@ bool SVFIR::isValidPointer(NodeID nodeId) const
 {
     SVFVar* node = pag->getGNode(nodeId);
 
-    if (node->hasValue() && node->isPointer())
-    {
+    if(node->isPointer())
         if (const ValVar* pVar = pag->getBaseValVar(nodeId))
             if (const ArgValVar* arg = SVFUtil::dyn_cast<ArgValVar>(pVar))
                 if (!(arg->getParent()->isDeclaration()))
                     return true;
-    }
 
     if ((node->getInEdges().empty() && node->getOutEdges().empty()))
         return false;
@@ -664,13 +662,9 @@ bool SVFIR::isValidTopLevelPtr(const SVFVar* node)
     {
         if (isValidPointer(node->getId()))
         {
-            // TODO: after svf value is removed, we use type to determine top level ptr
-            if (SVFUtil::isa<RetPN, VarArgPN, FunValVar, HeapObjVar, StackObjVar>(node))
-            {
-                return true;
-            }
-            else if(node->hasValue())
-                return !SVFUtil::isArgOfUncalledFunction(node);
+            const ValVar* baseVar = pag->getBaseValVar(node->getId());
+            if(!SVFUtil::isa<DummyValVar, BlackHoleVar>(baseVar))
+                return !SVFUtil::isArgOfUncalledFunction(baseVar);
         }
     }
     return false;

package/svf/lib/SVFIR/SVFVariables.cpp

@@ -48,6 +48,7 @@ SVFVar::SVFVar(const SVFValue* val, NodeID i, PNODEK k) :
     case ValNode:
     case ArgNode:
     case ConstantDataValNode:
+    case ConstantAggValNode:
     case GlobalValNode:
     case BlackHoleNode:
     case ConstantFPValNode:
@@ -69,6 +70,7 @@ SVFVar::SVFVar(const SVFValue* val, NodeID i, PNODEK k) :
     case ObjNode:
     case GepObjNode:
     case BaseObjNode:
+    case ConstantAggObjNode:
     case ConstantDataObjNode:
     case GlobalObjNode:
     case ConstantFPObjNode:
@@ -178,6 +180,13 @@ const std::string ArgValVar::toString() const
     return rawstr.str();
 }
 
+GepValVar::GepValVar(ValVar* baseNode, const SVFValue* val, NodeID i,
+                     const AccessPath& ap, const SVFType* ty)
+    : ValVar(val, i, GepValNode), ap(ap), base(baseNode), gepValType(ty)
+{
+
+}
+
 const std::string GepValVar::toString() const
 {
     std::string str;
@@ -191,6 +200,8 @@ const std::string GepValVar::toString() const
     return rawstr.str();
 }
 
+
+
 RetPN::RetPN(NodeID i, const CallGraphNode* node) : ValVar(i, RetNode), callGraphNode(node)
 {
     isPtr = node->getFunction()->getReturnType()->isPointerTy();
@@ -280,6 +291,18 @@ const std::string FunValVar::toString() const
     return rawstr.str();
 }
 
+const std::string ConstantAggValVar::toString() const
+{
+    std::string str;
+    std::stringstream rawstr(str);
+    rawstr << "ConstantAggValNode ID: " << getId();
+    if (Options::ShowSVFIRValue())
+    {
+        rawstr << "\n";
+        rawstr << valueOnlyToString();
+    }
+    return rawstr.str();
+}
 const std::string ConstantDataValVar::toString() const
 {
     std::string str;
@@ -357,7 +380,18 @@ const std::string GlobalObjVar::toString() const
     }
     return rawstr.str();
 }
-
+const std::string ConstantAggObjVar::toString() const
+{
+    std::string str;
+    std::stringstream rawstr(str);
+    rawstr << "ConstantAggObjVar ID: " << getId();
+    if (Options::ShowSVFIRValue())
+    {
+        rawstr << "\n";
+        rawstr << valueOnlyToString();
+    }
+    return rawstr.str();
+}
 const std::string ConstantDataObjVar::toString() const
 {
     std::string str;
@@ -482,12 +516,3 @@ const std::string DummyObjVar::toString() const
     return rawstr.str();
 }
 
-/// Whether it is constant data, i.e., "0", "1.001", "str"
-/// or llvm's metadata, i.e., metadata !4087
-bool SVFVar::isConstDataOrAggDataButNotNullPtr() const
-{
-    if (hasValue())
-        return value->isConstDataOrAggData() && (!SVFUtil::isa<SVFConstantNullPtr>(value)) && (!SVFUtil::isa<SVFBlackHoleValue>(value));
-    else
-        return false;
-}

package/svf/lib/WPA/AndersenStat.cpp

@@ -237,11 +237,11 @@ void AndersenStat::statNullPtr()
                 if (!SVFUtil::isa<DummyValVar>(pagNode) && !SVFUtil::isa<DummyObjVar>(pagNode) )
                 {
                     // if a pointer is in dead function, we do not care
-                    if(pagNode->getValue()->ptrInUncalledFunction() == false)
+                    if(pagNode->ptrInUncalledFunction() == false)
                     {
                         _NumOfNullPtr++;
                         rawstr << "##Null Pointer : (NodeID " << pagNode->getId()
-                               << ") PtrName:" << pagNode->getValue()->getName();
+                               << ") PtrName:" << pagNode->getName();
                         writeWrnMsg(rawstr.str());
                         //pagNode->getValue()->dump();
                     }

package/svf/lib/WPA/FlowSensitiveStat.cpp

@@ -296,11 +296,11 @@ void FlowSensitiveStat::statNullPtr()
                 if (!SVFUtil::isa<DummyValVar>(pagNode) && !SVFUtil::isa<DummyObjVar>(pagNode))
                 {
                     // if a pointer is in dead function, we do not care
-                    if(pagNode->getValue()->ptrInUncalledFunction() == false)
+                    if(pagNode->ptrInUncalledFunction() == false)
                     {
                         _NumOfNullPtr++;
                         rawstr << "##Null Pointer : (NodeID " << pagNode->getId()
-                               << ") PtrName:" << pagNode->getValue()->getName();
+                               << ") PtrName:" << pagNode->getName();
                         writeWrnMsg(rawstr.str());
                     }
                 }

package/svf/lib/WPA/WPAPass.cpp

@@ -146,9 +146,9 @@ void WPAPass::PrintAliasPairs(PointerAnalysis* pta)
             const SVFFunction* fun2 = node2->getFunction();
             AliasResult result = pta->alias(node1->getId(), node2->getId());
             SVFUtil::outs()	<< (result == AliasResult::NoAlias ? "NoAlias" : "MayAlias")
-                            << " var" << node1->getId() << "[" << node1->getValueName()
+                            << " var" << node1->getId() << "[" << node1->getName()
                             << "@" << (fun1==nullptr?"":fun1->getName()) << "] --"
-                            << " var" << node2->getId() << "[" << node2->getValueName()
+                            << " var" << node2->getId() << "[" << node2->getName()
                             << "@" << (fun2==nullptr?"":fun2->getName()) << "]\n";
         }
     }

package/svf-llvm/include/SVF-LLVM/DCHG.h

@@ -98,7 +98,7 @@ public:
         return diType;
     }
 
-    std::string getName() const
+    virtual const std::string& getName() const
     {
         return typeName;
     }
@@ -161,12 +161,12 @@ public:
         return typedefs;
     }
 
-    void setVTable(const SVFGlobalValue *vtbl)
+    void setVTable(const GlobalObjVar *vtbl)
     {
         vtable = vtbl;
     }
 
-    const SVFGlobalValue *getVTable() const
+    const GlobalObjVar *getVTable() const
     {
         return vtable;
     }
@@ -193,7 +193,7 @@ private:
     const DIType *diType;
     /// Typedefs which map to this type.
     Set<const DIDerivedType *> typedefs;
-    const SVFGlobalValue* vtable;
+    const GlobalObjVar* vtable;
     std::string typeName;
     size_t flags;
     /// The virtual functions which this class actually defines/overrides.
@@ -365,7 +365,7 @@ protected:
     /// Maps DITypes to their nodes.
     Map<const DIType*, DCHNode*> diTypeToNodeMap;
     /// Maps VTables to the DIType associated with them.
-    Map<const SVFGlobalValue*, const DIType*> vtblToTypeMap;
+    Map<const GlobalObjVar*, const DIType*> vtblToTypeMap;
     /// Maps types to all children (i.e. CHA).
     Map<const DIType*, NodeBS> chaMap;
     /// Maps types to all children but also considering first field.

package/svf-llvm/include/SVF-LLVM/SVFIRBuilder.h

@@ -273,8 +273,7 @@ protected:
         LLVMContext& cxt = llvmModuleSet()->getContext();
         ConstantPointerNull* constNull = ConstantPointerNull::get(PointerType::getUnqual(cxt));
         NodeID nullPtr = pag->addConstantNullPtrValNode(llvmModuleSet()->getSVFValue(constNull),pag->getNullPtr(), nullptr);
-        llvmModuleSet()->addToSVFVar2LLVMValueMap(
-            constNull, pag->getGNode(pag->getNullPtr()));
+        llvmModuleSet()->addToSVFVar2LLVMValueMap(constNull, pag->getGNode(pag->getNullPtr()));
         setCurrentLocation(constNull, nullptr);
         addBlackHoleAddrEdge(pag->getBlkPtr());
         return nullPtr;

package/svf-llvm/lib/CHGBuilder.cpp

@@ -377,12 +377,11 @@ void CHGBuilder::analyzeVTables(const Module &M)
             string vtblClassName = getClassNameFromVtblObj(globalvalue->getName().str());
             CHNode *node = chg->getNode(vtblClassName);
             assert(node && "node not found?");
-
-            SVFGlobalValue* pValue =
-                llvmModuleSet()->getSVFGlobalValue(
-                    globalvalue);
-            pValue->setName(vtblClassName);
-            node->setVTable(pValue);
+            SymID i = SymbolTableInfo::SymbolInfo()->getObjSym(llvmModuleSet()->getSVFGlobalValue(globalvalue));
+            SVFVar* pVar = PAG::getPAG()->getGNode(i);
+            GlobalObjVar* globalObjVar = SVFUtil::cast<GlobalObjVar>(pVar);
+            globalObjVar->setName(vtblClassName);
+            node->setVTable(globalObjVar);
 
             for (unsigned int ei = 0; ei < vtblStruct->getNumOperands(); ++ei)
             {
@@ -675,7 +674,7 @@ void CHGBuilder::buildCSToCHAVtblsAndVfnsMap()
                     for (CHNodeSetTy::const_iterator it = chClasses.begin(), eit = chClasses.end(); it != eit; ++it)
                     {
                         const CHNode *child = *it;
-                        const SVFGlobalValue *vtbl = child->getVTable();
+                        const GlobalObjVar *vtbl = child->getVTable();
                         if (vtbl != nullptr)
                         {
                             vtbls.insert(vtbl);

package/svf-llvm/lib/DCHG.cpp

@@ -178,8 +178,11 @@ void DCHGraph::buildVTables(const SVFModule &module)
                 assert(type && "DCHG::buildVTables: bad metadata for ctir.vt");
                 DCHNode *node = getOrCreateNode(type);
                 const SVFGlobalValue* svfgv = LLVMModuleSet::getLLVMModuleSet()->getSVFGlobalValue(gv);
-                node->setVTable(svfgv);
-                vtblToTypeMap[svfgv] = getCanonicalType(type);
+                SymID i = SymbolTableInfo::SymbolInfo()->getObjSym(svfgv);
+                GlobalObjVar* globalObjVar =
+                    SVFUtil::cast<GlobalObjVar>(PAG::getPAG()->getGNode(i));
+                node->setVTable(globalObjVar);
+                vtblToTypeMap[globalObjVar] = getCanonicalType(type);
 
                 const ConstantStruct *vtbls = cppUtil::getVtblStruct(gv);
                 for (unsigned nthVtbl = 0; nthVtbl < vtbls->getNumOperands(); ++nthVtbl)
@@ -575,7 +578,7 @@ const VTableSet &DCHGraph::getCSVtblsBasedonCHA(const CallICFGNode* cs)
     for (NodeID childId : children)
     {
         DCHNode *child = getGNode(childId);
-        const SVFGlobalValue *vtbl = child->getVTable();
+        const GlobalObjVar *vtbl = child->getVTable();
         // TODO: what if it is null?
         if (vtbl != nullptr)
         {
@@ -593,7 +596,7 @@ void DCHGraph::getVFnsFromVtbls(const CallICFGNode* callsite, const VTableSet &v
 {
     size_t idx = callsite->getFunIdxInVtable();
     std::string funName = callsite->getFunNameOfVirtualCall();
-    for (const SVFGlobalValue *vtbl : vtbls)
+    for (const GlobalObjVar *vtbl : vtbls)
     {
         assert(vtblToTypeMap.find(vtbl) != vtblToTypeMap.end() && "floating vtbl");
         const DIType *type = vtblToTypeMap[vtbl];

package/svf-llvm/lib/LLVMModule.cpp

@@ -1258,6 +1258,7 @@ void LLVMModuleSet::addToSVFVar2LLVMValueMap(const Value* val,
 {
     SVFBaseNode2LLVMValue[svfBaseNode] = val;
     svfBaseNode->setSourceLoc(LLVMUtil::getSourceLoc(val));
+    svfBaseNode->setName(val->getName().str());
 }
 
 SVFConstantData* LLVMModuleSet::getSVFConstantData(const ConstantData* cd)

package/svf-llvm/lib/LLVMUtil.cpp

@@ -753,11 +753,26 @@ const std::string SVFBaseNode::valueOnlyToString() const
     }
     else
     {
-        auto llvmVal = LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(this);
-        if (llvmVal)
-            rawstr << " " << *llvmVal << " ";
+        const SVFBaseNode* baseNode = this;
+        if (const GepValVar* valVar = SVFUtil::dyn_cast<GepValVar>(this))
+        {
+            baseNode = valVar->getBaseNode();
+        }
+        else if (const GepObjVar* objVar = SVFUtil::dyn_cast<GepObjVar>(this))
+        {
+            baseNode = objVar->getBaseObj();
+        }
+        if (SVFUtil::isa<DummyObjVar, DummyValVar, BlackHoleVar>(baseNode))
+            rawstr << "";
         else
-            rawstr << " No llvmVal found";
+        {
+            auto llvmVal =
+                LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(baseNode);
+            if (llvmVal)
+                rawstr << " " << *llvmVal << " ";
+            else
+                rawstr << "";
+        }
     }
     rawstr << getSourceLoc();
     return rawstr.str();

package/svf-llvm/lib/SVFIRBuilder.cpp

@@ -67,11 +67,6 @@ SVFIR* SVFIRBuilder::build()
     // Set callgraph
     pag->setCallGraph(llvmModuleSet()->callgraph);
 
-    CHGraph* chg = new CHGraph(pag->getModule());
-    CHGBuilder chgbuilder(chg);
-    chgbuilder.buildCHG();
-    pag->setCHG(chg);
-
     // We read SVFIR from a user-defined txt instead of parsing SVFIR from LLVM IR
     if (SVFModule::pagReadFromTXT())
     {
@@ -91,6 +86,11 @@ SVFIR* SVFIRBuilder::build()
     visitGlobal(svfModule);
     ///// collect exception vals in the program
 
+    CHGraph* chg = new CHGraph(pag->getModule());
+    CHGBuilder chgbuilder(chg);
+    chgbuilder.buildCHG();
+    pag->setCHG(chg);
+
     /// handle functions
     for (Module& M : llvmModuleSet()->getLLVMModules())
     {
@@ -249,16 +249,21 @@ void SVFIRBuilder::initialiseNodes()
         {
             pag->addGlobalValueValNode(iter->first, iter->second, icfgNode);
         }
-        else if (SVFUtil::isa<ConstantData>(llvmValue))
+        else if (SVFUtil::isa<ConstantData, MetadataAsValue, BlockAddress>(llvmValue))
         {
             pag->addConstantDataValNode(iter->first, iter->second, icfgNode);
         }
+        else if (SVFUtil::isa<ConstantAggregate>(llvmValue))
+        {
+            pag->addConstantAggValNode(iter->first, iter->second, icfgNode);
+        }
         else
         {
             // Add value node to PAG
             pag->addValNode(iter->first, iter->second, icfgNode);
         }
-        llvmModuleSet()->addToSVFVar2LLVMValueMap(llvmValue, pag->getGNode(iter->second));
+        llvmModuleSet()->addToSVFVar2LLVMValueMap(llvmValue,
+                pag->getGNode(iter->second));
     }
 
     // Iterate over all object symbols in the symbol table
@@ -325,16 +330,22 @@ void SVFIRBuilder::initialiseNodes()
             NodeID id = symTable->getObjSym(iter->first);
             pag->addGlobalValueObjNode(iter->first, iter->second, symTable->getObjTypeInfo(id));
         }
-        else if (SVFUtil::isa<ConstantData>(llvmValue))
+        else if (SVFUtil::isa<ConstantData, MetadataAsValue, BlockAddress>(llvmValue))
         {
             NodeID id = symTable->getObjSym(iter->first);
             pag->addConstantDataObjNode(iter->first, iter->second, symTable->getObjTypeInfo(id));
         }
+        else if (SVFUtil::isa<ConstantAggregate>(llvmValue))
+        {
+            NodeID id = symTable->getObjSym(iter->first);
+            pag->addConstantAggObjNode(iter->first, iter->second, symTable->getObjTypeInfo(id));
+        }
         // Add a generic object node for other types of values
         else
         {
             NodeID id = symTable->getObjSym(iter->first);
-            pag->addObjNode(iter->first, iter->second, symTable->getObjTypeInfo(id));
+            pag->addObjNode(iter->first, iter->second,
+                            symTable->getObjTypeInfo(id));
         }
         llvmModuleSet()->addToSVFVar2LLVMValueMap(llvmValue, pag->getGNode(iter->second));
 
@@ -349,22 +360,23 @@ void SVFIRBuilder::initialiseNodes()
                 symTable->retSyms().begin(); iter != symTable->retSyms().end();
             ++iter)
     {
+        const Value* llvmValue = llvmModuleSet()->getLLVMValue(iter->first);
         DBOUT(DPAGBuild, outs() << "add ret node " << iter->second << "\n");
         pag->addRetNode(iter->second,
-                        llvmModuleSet()->getCallGraphNode(SVFUtil::cast<Function>(
-                                    llvmModuleSet()->getLLVMValue(iter->first))));
-        llvmModuleSet()->addToSVFVar2LLVMValueMap(llvmModuleSet()->getLLVMValue(iter->first), pag->getGNode(iter->second));
+                        llvmModuleSet()->getCallGraphNode(SVFUtil::cast<Function>(llvmValue)));
+        llvmModuleSet()->addToSVFVar2LLVMValueMap(llvmValue, pag->getGNode(iter->second));
     }
 
     for (SymbolTableInfo::FunToIDMapTy::iterator iter =
                 symTable->varargSyms().begin();
             iter != symTable->varargSyms().end(); ++iter)
     {
+        const Value* llvmValue = llvmModuleSet()->getLLVMValue(iter->first);
         DBOUT(DPAGBuild, outs() << "add vararg node " << iter->second << "\n");
         pag->addVarargNode(iter->second,
-                           llvmModuleSet()->getCallGraphNode(SVFUtil::cast<Function>(
-                                       llvmModuleSet()->getLLVMValue(iter->first))));
-        llvmModuleSet()->addToSVFVar2LLVMValueMap(llvmModuleSet()->getLLVMValue(iter->first), pag->getGNode(iter->second));
+                           llvmModuleSet()->getCallGraphNode(SVFUtil::cast<Function>(llvmValue)));
+        llvmModuleSet()->addToSVFVar2LLVMValueMap(llvmValue, pag->getGNode(iter->second));
+
     }
 
     /// add address edges for constant nodes.

package/svf-llvm/lib/SVFIRExtAPI.cpp

@@ -65,7 +65,10 @@ const Type* SVFIRBuilder::getBaseTypeAndFlattenedFields(const Value* V, std::vec
         {
             SymbolTableBuilder builder(pag->getSymbolInfo());
             builder.collectSym(offset);
-            pag->addConstantIntValNode(svfOffset, pag->getSymbolInfo()->getValSym(svfOffset), LLVMUtil::getIntegerValue(offset), nullptr);
+            SymID id = pag->getSymbolInfo()->getValSym(svfOffset);
+            pag->addConstantIntValNode(svfOffset, id, LLVMUtil::getIntegerValue(offset), nullptr);
+            llvmModuleSet()->addToSVFVar2LLVMValueMap(offset,
+                    pag->getGNode(id));
         }
         ls.addOffsetVarAndGepTypePair(getPAG()->getGNode(getPAG()->getValueNode(svfOffset)), nullptr);
         fields.push_back(ls);

package/svf-llvm/tools/Example/svf-ex.cpp

@@ -62,10 +62,7 @@ std::string printPts(PointerAnalysis* pta, const SVFVar* svfval)
     {
         rawstr << " " << *ii << " ";
         PAGNode* targetObj = pta->getPAG()->getGNode(*ii);
-        if(targetObj->hasValue())
-        {
-            rawstr << "(" << targetObj->getValue()->toString() << ")\t ";
-        }
+        rawstr << "(" << targetObj->valueOnlyToString() << ")\t ";
     }
 
     return rawstr.str();