svf-tools 1.0.1034 → 1.0.1035

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1034",
+  "version": "1.0.1035",
   "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/AE/Svfexe/AbsExtAPI.h

@@ -130,13 +130,6 @@ public:
      */
     AbstractState& getAbsStateFromTrace(const ICFGNode* node);
 
-    /**
-     * @brief Retrieves the SVF variable from a given SVF value.
-     * @param val Pointer to the SVF value.
-     * @return Pointer to the corresponding SVF variable.
-     */
-    const SVFVar* getSVFVar(const SVFValue* val);
-
 protected:
     SVFIR* svfir; ///< Pointer to the SVF intermediate representation.
     ICFG* icfg; ///< Pointer to the interprocedural control flow graph.

package/svf/include/CFL/CFLAlias.h

@@ -61,14 +61,6 @@ public:
     /// Solving CFL Reachability
     virtual void solve();
 
-    /// Interface exposed to users of our Alias analysis, given Value infos
-    virtual AliasResult alias(const SVFValue* v1, const SVFValue* v2)
-    {
-        NodeID n1 = svfir->getValueNode(v1);
-        NodeID n2 = svfir->getValueNode(v2);
-        return alias(n1,n2);
-    }
-
     /// Interface exposed to users of our Alias analysis, given PAGNodeID
     virtual AliasResult alias(NodeID node1, NodeID node2)
     {

package/svf/include/DDA/DDAPass.h

@@ -57,7 +57,10 @@ public:
     ~DDAPass();
 
     /// Interface expose to users of our pointer analysis, given Value infos
-    virtual AliasResult alias(const SVFValue* V1,	const SVFValue* V2);
+    virtual AliasResult alias(const SVFVar* V1,	const SVFVar* V2)
+    {
+        return alias(V1->getId(), V2->getId());
+    }
 
     /// Interface expose to users of our pointer analysis, given PAGNodes
     virtual AliasResult alias(NodeID V1, NodeID V2);

package/svf/include/Graphs/ConsG.h

@@ -76,11 +76,6 @@ protected:
 
     /// Wrappers used internally, not expose to Andersen Pass
     //@{
-    inline NodeID getValueNode(const SVFValue* value) const
-    {
-        return sccRepNode(pag->getValueNode(value));
-    }
-
     inline NodeID getReturnNode(const SVFFunction* value) const
     {
         return pag->getReturnNode(value);

package/svf/include/Graphs/IRGraph.h

@@ -53,7 +53,6 @@ class IRGraph : public GenericGraph<SVFVar, SVFStmt>
 
 public:
     typedef Set<const SVFStmt*> SVFStmtSet;
-    typedef Map<const SVFValue*,SVFStmtSet> ValueToEdgeMap;
 
 protected:
     SVFStmt::KindToSVFStmtMapTy KindToSVFStmtSetMap; ///< SVFIR edge map containing all PAGEdges
@@ -61,7 +60,6 @@ protected:
     bool fromFile; ///< Whether the SVFIR is built according to user specified data from a txt file
     NodeID nodeNumAfterPAGBuild; ///< initial node number after building SVFIR, excluding later added nodes, e.g., gepobj nodes
     u32_t totalPTAPAGEdge;
-    ValueToEdgeMap valueToEdgeMap; ///< Map SVFValues (e.g., ICFGNodes) to all corresponding PAGEdges
     SymbolTableInfo* symInfo;
 
     /// Add a node into the graph
@@ -86,22 +84,11 @@ protected:
     SVFStmt* hasLabeledEdge(SVFVar* src, SVFVar* op1, SVFStmt::PEDGEK kind,
                             const SVFVar* op2);
 
-    /// Map a value to a set of edges
-    inline void mapValueToEdge(const SVFValue* V, SVFStmt *edge)
-    {
-        auto inserted = valueToEdgeMap.emplace(V, SVFStmtSet{edge});
-        if (!inserted.second)
-        {
-            inserted.first->second.emplace(edge);
-        }
-    }
 public:
     IRGraph(bool buildFromFile)
         : fromFile(buildFromFile), nodeNumAfterPAGBuild(0), totalPTAPAGEdge(0)
     {
         symInfo = SymbolTableInfo::SymbolInfo();
-        // insert dummy value if a correct value cannot be found
-        valueToEdgeMap[nullptr] = SVFStmtSet();
     }
 
     virtual ~IRGraph();
@@ -115,17 +102,6 @@ public:
     {
         return fromFile;
     }
-    /// Get all SVFIR Edges that corresponds to an LLVM value
-    inline const SVFStmtSet& getValueEdges(const SVFValue* V)
-    {
-        auto it = valueToEdgeMap.find(V);
-        if (it == valueToEdgeMap.end())
-        {
-            //special empty set
-            return valueToEdgeMap.at(nullptr);
-        }
-        return it->second;
-    }
 
     /// Get SVFIR Node according to LLVM value
     ///getNode - Return the node corresponding to the specified pointer.

package/svf/include/MSSA/MemRegion.h

@@ -480,7 +480,7 @@ public:
     NodeBS getModInfoForCall(const CallICFGNode* cs);
     NodeBS getRefInfoForCall(const CallICFGNode* cs);
     ModRefInfo getModRefInfo(const CallICFGNode* cs);
-    ModRefInfo getModRefInfo(const CallICFGNode* cs, const SVFValue* V);
+    ModRefInfo getModRefInfo(const CallICFGNode* cs, const SVFVar* V);
     ModRefInfo getModRefInfo(const CallICFGNode* cs1, const CallICFGNode* cs2);
     //@}
 

package/svf/include/MemoryModel/PointerAnalysis.h

@@ -233,8 +233,8 @@ public:
     virtual void computeDDAPts(NodeID) {}
 
     /// Interface exposed to users of our pointer analysis, given Value infos
-    virtual AliasResult alias(const SVFValue* V1,
-                              const SVFValue* V2) = 0;
+    virtual AliasResult alias(const SVFVar* V1,
+                              const SVFVar* V2) = 0;
 
     /// Interface exposed to users of our pointer analysis, given PAGNodeID
     virtual AliasResult alias(NodeID node1, NodeID node2) = 0;

package/svf/include/MemoryModel/PointerAnalysisImpl.h

@@ -215,8 +215,11 @@ private:
 
 public:
     /// Interface expose to users of our pointer analysis, given Value infos
-    AliasResult alias(const SVFValue* V1,
-                      const SVFValue* V2) override;
+    AliasResult alias(const SVFVar* V1,
+                      const SVFVar* V2) override
+    {
+        return alias(V1->getId(), V2->getId());
+    }
 
     /// Interface expose to users of our pointer analysis, given PAGNodeID
     AliasResult alias(NodeID node1, NodeID node2) override;
@@ -501,9 +504,9 @@ public:
     }
 
     /// Interface expose to users of our pointer analysis, given Value infos
-    virtual inline AliasResult alias(const SVFValue* V1, const SVFValue* V2)
+    virtual inline AliasResult alias(const SVFVar* V1, const SVFVar* V2)
     {
-        return  alias(pag->getValueNode(V1),pag->getValueNode(V2));
+        return  alias(V1->getId(), V2->getId());
     }
     /// Interface expose to users of our pointer analysis, given two pointers
     virtual inline AliasResult alias(NodeID node1, NodeID node2)

package/svf/include/SVFIR/SVFIR.h

@@ -70,7 +70,7 @@ public:
     typedef std::pair<NodeID, AccessPath> NodeAccessPath;
     typedef Map<NodeOffset,NodeID> NodeOffsetMap;
     typedef Map<NodeAccessPath,NodeID> NodeAccessPathMap;
-    typedef Map<const SVFValue*, NodeAccessPathMap> GepValueVarMap;
+    typedef Map<NodeID, NodeAccessPathMap> GepValueVarMap;
     typedef std::pair<const SVFType*, std::vector<AccessPath>> SVFTypeLocSetsPair;
     typedef Map<NodeID, SVFTypeLocSetsPair> TypeLocSetsMap;
     typedef Map<NodePair,NodeID> NodePairSetMap;
@@ -343,7 +343,7 @@ public:
     //@}
 
     /// Due to constraint expression, curInst is used to distinguish different instructions (e.g., memorycpy) when creating GepValVar.
-    NodeID getGepValVar(const SVFValue* curInst, NodeID base,
+    NodeID getGepValVar(NodeID curInst, NodeID base,
                         const AccessPath& ap) const;
 
     /// Add/get indirect callsites
@@ -693,7 +693,7 @@ private:
     }
 
     /// Add a temp field value node, this method can only invoked by getGepValVar
-    NodeID addGepValNode(const SVFValue* curInst,const SVFValue* val, const AccessPath& ap, NodeID i, const SVFType* type, const ICFGNode* node);
+    NodeID addGepValNode(NodeID curInst, const ValVar* base, const AccessPath& ap, NodeID i, const SVFType* type, const ICFGNode* node);
     /// Add a field obj node, this method can only invoked by getGepObjVar
     NodeID addGepObjNode(const BaseObjVar* baseObj, const APOffset& apOffset, const NodeID gepId);
     /// Add a field-insensitive node, this method can only invoked by getFIGepObjNode

package/svf/include/SVFIR/SVFVariables.h

@@ -443,7 +443,7 @@ class GepValVar: public ValVar
 
 private:
     AccessPath ap;	// AccessPath
-    ValVar* base;	// base node
+    const ValVar* base;	// base node
     const SVFType* gepValType;
 
     /// Constructor to create empty GeValVar (for SVFIRReader/deserialization)
@@ -475,7 +475,7 @@ public:
     //@}
 
     /// Constructor
-    GepValVar(ValVar* baseNode, NodeID i, const AccessPath& ap,
+    GepValVar(const ValVar* baseNode, NodeID i, const AccessPath& ap,
               const SVFType* ty, const ICFGNode* node);
 
     /// offset of the base value variable
@@ -485,7 +485,7 @@ public:
     }
 
     /// Return the base object from which this GEP node came from.
-    inline ValVar* getBaseNode(void) const
+    inline const ValVar* getBaseNode(void) const
     {
         return base;
     }

package/svf/include/Util/SVFUtil.h

@@ -171,14 +171,6 @@ bool isIntrinsicInst(const SVFInstruction* inst);
 bool isIntrinsicInst(const ICFGNode* inst);
 //@}
 
-/// Whether an instruction is a call or invoke instruction
-inline bool isCallSite(const SVFValue* val)
-{
-    if(SVFUtil::isa<SVFCallInst>(val))
-        return true;
-    else
-        return false;
-}
 
 bool isCallSite(const ICFGNode* inst);
 
@@ -342,14 +334,6 @@ inline bool isProgExitFunction (const SVFFunction * fun)
                    fun->getName() == "__assert_fail" );
 }
 
-/// Return true if this argument belongs to an uncalled function
-inline bool isArgOfUncalledFunction(const SVFValue* svfval)
-{
-    if(const SVFArgument* arg = SVFUtil::dyn_cast<SVFArgument>(svfval))
-        return arg->isArgOfUncalledFunction();
-    else
-        return false;
-}
 
 bool isArgOfUncalledFunction(const SVFVar* svfvar);
 

package/svf/include/WPA/WPAPass.h

@@ -75,11 +75,7 @@ public:
     /// Destructor
     virtual ~WPAPass();
 
-    /// Interface expose to users of our pointer analysis, given Value infos
-    virtual AliasResult alias(const SVFValue* V1,	const SVFValue* V2);
-
     /// Retrieve points-to set information
-    virtual const PointsTo& getPts(const SVFValue* value);
     virtual const PointsTo& getPts(NodeID var);
 
     /// Print all alias pairs
@@ -94,9 +90,6 @@ public:
     //     return getModRefInfo(callInst, Loc.Ptr);
     // }
 
-    /// Interface of mod-ref analysis to determine whether a CallSite instruction can mod or ref a specific memory location, given Value infos
-    virtual ModRefInfo getModRefInfo(const CallICFGNode* callInst, const SVFValue* V);
-
     /// Interface of mod-ref analysis between two CallSite instructions
     virtual ModRefInfo getModRefInfo(const CallICFGNode* callInst1, const CallICFGNode* callInst2);
 

package/svf/lib/AE/Svfexe/AbsExtAPI.cpp

@@ -757,10 +757,4 @@ IntervalValue AbsExtAPI::getRangeLimitFromType(const SVFType* type)
         return IntervalValue::top();
         // other types, return top interval
     }
-}
-
-const SVFVar* AbsExtAPI::getSVFVar(const SVF::SVFValue* val)
-{
-    assert(svfir->hasGNode(svfir->getValueNode(val)));
-    return svfir->getGNode(svfir->getValueNode(val));
 }

package/svf/lib/DDA/DDAPass.cpp

@@ -290,34 +290,7 @@ AliasResult DDAPass::alias(NodeID node1, NodeID node2)
 
     return _pta->alias(node1,node2);
 }
-/*!
- * Return alias results based on our points-to/alias analysis
- * TODO: Need to handle PartialAlias and MustAlias here.
- */
-AliasResult DDAPass::alias(const SVFValue* V1, const SVFValue* V2)
-{
-    SVFIR* pag = _pta->getPAG();
-
-    /// TODO: When this method is invoked during compiler optimizations, the IR
-    ///       used for pointer analysis may been changed, so some Values may not
-    ///       find corresponding SVFIR node. In this case, we only check alias
-    ///       between two Values if they both have SVFIR nodes. Otherwise, MayAlias
-    ///       will be returned.
-    if (pag->hasValueNode(V1) && pag->hasValueNode(V2))
-    {
-        PAGNode* node1 = pag->getGNode(pag->getValueNode(V1));
-        if(pag->isValidTopLevelPtr(node1))
-            _pta->computeDDAPts(node1->getId());
-
-        PAGNode* node2 = pag->getGNode(pag->getValueNode(V2));
-        if(pag->isValidTopLevelPtr(node2))
-            _pta->computeDDAPts(node2->getId());
 
-        return _pta->alias(V1,V2);
-    }
-
-    return AliasResult::MayAlias;
-}
 
 /*!
  * Print queries' pts

package/svf/lib/MSSA/MemRegion.cpp

@@ -737,26 +737,23 @@ ModRefInfo MRGenerator::getModRefInfo(const CallICFGNode* cs)
  * Determine whether a const CallICFGNode* instruction can mod or ref
  * a specific memory location pointed by V
  */
-ModRefInfo MRGenerator::getModRefInfo(const CallICFGNode* cs, const SVFValue* V)
+ModRefInfo MRGenerator::getModRefInfo(const CallICFGNode* cs, const SVFVar* V)
 {
     bool ref = false;
     bool mod = false;
 
-    if (pta->getPAG()->hasValueNode(V))
-    {
-        const NodeBS pts(pta->getPts(pta->getPAG()->getValueNode(V)).toNodeBS());
-        const NodeBS csRef = getRefInfoForCall(cs);
-        const NodeBS csMod = getModInfoForCall(cs);
-        NodeBS ptsExpanded, csRefExpanded, csModExpanded;
-        pta->expandFIObjs(pts, ptsExpanded);
-        pta->expandFIObjs(csRef, csRefExpanded);
-        pta->expandFIObjs(csMod, csModExpanded);
+    const NodeBS pts(pta->getPts(V->getId()).toNodeBS());
+    const NodeBS csRef = getRefInfoForCall(cs);
+    const NodeBS csMod = getModInfoForCall(cs);
+    NodeBS ptsExpanded, csRefExpanded, csModExpanded;
+    pta->expandFIObjs(pts, ptsExpanded);
+    pta->expandFIObjs(csRef, csRefExpanded);
+    pta->expandFIObjs(csMod, csModExpanded);
 
-        if (csRefExpanded.intersects(ptsExpanded))
-            ref = true;
-        if (csModExpanded.intersects(ptsExpanded))
-            mod = true;
-    }
+    if (csRefExpanded.intersects(ptsExpanded))
+        ref = true;
+    if (csModExpanded.intersects(ptsExpanded))
+        mod = true;
 
     if (mod && ref)
         return ModRefInfo::ModRef;

package/svf/lib/MemoryModel/PointerAnalysisImpl.cpp

@@ -612,14 +612,6 @@ void BVDataPTAImpl::normalizePointsTo()
     }
 }
 
-/*!
- * Return alias results based on our points-to/alias analysis
- */
-AliasResult BVDataPTAImpl::alias(const SVFValue* V1,
-                                 const SVFValue* V2)
-{
-    return alias(pag->getValueNode(V1),pag->getValueNode(V2));
-}
 
 /*!
  * Return alias results based on our points-to/alias analysis

package/svf/lib/SVFIR/SVFIR.cpp

@@ -384,14 +384,14 @@ GepStmt* SVFIR::addVariantGepStmt(NodeID src, NodeID dst, const AccessPath& ap)
  * Add a temp field value node, this method can only invoked by getGepValVar
  * due to constraint expression, curInst is used to distinguish different instructions (e.g., memorycpy) when creating GepValVar.
  */
-NodeID SVFIR::addGepValNode(const SVFValue* curInst,const SVFValue* gepVal, const AccessPath& ap, NodeID i, const SVFType* type, const ICFGNode* icn)
+NodeID SVFIR::addGepValNode(NodeID curInst,const ValVar* baseVar, const AccessPath& ap, NodeID i, const SVFType* type, const ICFGNode* icn)
 {
-    NodeID base = getValueNode(gepVal);
+    NodeID base = baseVar->getId();
     //assert(findPAGNode(i) == false && "this node should not be created before");
     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(cast<ValVar>(getGNode(base)), i, ap, type, icn);
+    GepValVar *node = new GepValVar(baseVar, i, ap, type, icn);
     return addValNode(node);
 }
 
@@ -503,7 +503,7 @@ NodeBS SVFIR::getFieldsAfterCollapse(NodeID id)
 /*!
  * It is used to create a dummy GepValVar during global initialization.
  */
-NodeID SVFIR::getGepValVar(const SVFValue* curInst, NodeID base, const AccessPath& ap) const
+NodeID SVFIR::getGepValVar(NodeID curInst, NodeID base, const AccessPath& ap) const
 {
     GepValueVarMap::const_iterator iter = GepValObjMap.find(curInst);
     if(iter==GepValObjMap.end())

package/svf/lib/SVFIR/SVFVariables.cpp

@@ -137,7 +137,7 @@ const std::string ArgValVar::toString() const
     return rawstr.str();
 }
 
-GepValVar::GepValVar(ValVar* baseNode, NodeID i,
+GepValVar::GepValVar(const ValVar* baseNode, NodeID i,
                      const AccessPath& ap, const SVFType* ty, const ICFGNode* node)
     : ValVar(i, ty, node, GepValNode), ap(ap), base(baseNode), gepValType(ty)
 {

package/svf/lib/WPA/WPAPass.cpp

@@ -154,12 +154,6 @@ void WPAPass::PrintAliasPairs(PointerAnalysis* pta)
     }
 }
 
-const PointsTo& WPAPass::getPts(const SVFValue* value)
-{
-    assert(_pta && "initialize a pointer analysis first");
-    SVFIR* pag = _pta->getPAG();
-    return getPts(pag->getValueNode(value));
-}
 
 const PointsTo& WPAPass::getPts(NodeID var)
 {
@@ -167,54 +161,6 @@ const PointsTo& WPAPass::getPts(NodeID var)
     return _pta->getPts(var);
 }
 
-/*!
- * Return alias results based on our points-to/alias analysis
- * TODO: Need to handle PartialAlias and MustAlias here.
- */
-AliasResult WPAPass::alias(const SVFValue* V1, const SVFValue* V2)
-{
-
-    AliasResult result = AliasResult::MayAlias;
-
-    SVFIR* pag = _pta->getPAG();
-
-    /// TODO: When this method is invoked during compiler optimizations, the IR
-    ///       used for pointer analysis may been changed, so some Values may not
-    ///       find corresponding SVFIR node. In this case, we only check alias
-    ///       between two Values if they both have SVFIR nodes. Otherwise, MayAlias
-    ///       will be returned.
-    if (pag->hasValueNode(V1) && pag->hasValueNode(V2))
-    {
-        /// Veto is used by default
-        if (Options::AliasRule.nothingSet() || Options::AliasRule(Veto))
-        {
-            /// Return NoAlias if any PTA gives NoAlias result
-            result = AliasResult::MayAlias;
-
-            for (PTAVector::const_iterator it = ptaVector.begin(), eit = ptaVector.end();
-                    it != eit; ++it)
-            {
-                if ((*it)->alias(V1, V2) == AliasResult::NoAlias)
-                    result = AliasResult::NoAlias;
-            }
-        }
-        else if (Options::AliasRule(Conservative))
-        {
-            /// Return MayAlias if any PTA gives MayAlias result
-            result = AliasResult::NoAlias;
-
-            for (PTAVector::const_iterator it = ptaVector.begin(), eit = ptaVector.end();
-                    it != eit; ++it)
-            {
-                if ((*it)->alias(V1, V2) == AliasResult::MayAlias)
-                    result = AliasResult::MayAlias;
-            }
-        }
-    }
-
-    return result;
-}
-
 /*!
  * Return mod-ref result of a Callsite
  */
@@ -224,14 +170,6 @@ ModRefInfo WPAPass::getModRefInfo(const CallICFGNode* callInst)
     return _svfg->getMSSA()->getMRGenerator()->getModRefInfo(callInst);
 }
 
-/*!
- * Return mod-ref results of a Callsite to a specific memory location
- */
-ModRefInfo WPAPass::getModRefInfo(const CallICFGNode* callInst, const SVFValue* V)
-{
-    assert(Options::PASelected(PointerAnalysis::AndersenWaveDiff_WPA) && Options::AnderSVFG() && "mod-ref query is only support with -ander and -svfg turned on");
-    return _svfg->getMSSA()->getMRGenerator()->getModRefInfo(callInst, V);
-}
 
 /*!
  * Return mod-ref result between two CallInsts

package/svf-llvm/lib/SVFIRBuilder.cpp

@@ -1386,7 +1386,7 @@ void SVFIRBuilder::sanityCheck()
 NodeID SVFIRBuilder::getGepValVar(const Value* val, const AccessPath& ap, const SVFType* elementType)
 {
     NodeID base = getValueNode(val);
-    NodeID gepval = pag->getGepValVar(curVal, base, ap);
+    NodeID gepval = pag->getGepValVar(pag->getValueNode(curVal), base, ap);
     if (gepval==UINT_MAX)
     {
         assert(((int) UINT_MAX)==-1 && "maximum limit of unsigned int is not -1?");
@@ -1412,7 +1412,7 @@ NodeID SVFIRBuilder::getGepValVar(const Value* val, const AccessPath& ap, const
             {
                 node = llvmmodule->getICFGNode(inst);
             }
-        NodeID gepNode = pag->addGepValNode(curVal, llvmmodule->getSVFValue(val), ap,
+        NodeID gepNode = pag->addGepValNode(pag->getValueNode(curVal), cast<ValVar>(pag->getGNode(getValueNode(val))), ap,
                                             NodeIDAllocator::get()->allocateValueId(),
                                             llvmmodule->getSVFType(PointerType::getUnqual(llvmmodule->getContext())), node);
         addGepEdge(base, gepNode, ap, true);
@@ -1445,8 +1445,6 @@ void SVFIRBuilder::setCurrentBBAndValueForPAGEdge(PAGEdge* edge)
     assert(curVal && "current Val is nullptr?");
     edge->setBB(curBB!=nullptr ? curBB : nullptr);
     edge->setValue(pag->getGNode(pag->getValueNode(curVal)));
-    // backmap in valuToEdgeMap
-    pag->mapValueToEdge(curVal, edge);
     ICFGNode* icfgNode = pag->getICFG()->getGlobalICFGNode();
     LLVMModuleSet* llvmMS = llvmModuleSet();
     if (const SVFInstruction* curInst = SVFUtil::dyn_cast<SVFInstruction>(curVal))