svf-lib 1.0.803 → 1.0.807

package/SVF-linux/include/DDA/DDAVFSolver.h

@@ -290,7 +290,7 @@ protected:
     virtual inline void buildSVFG(SVFIR* pag)
     {
         _ander = AndersenWaveDiff::createAndersenWaveDiff(pag);
-        _svfg = svfgBuilder.buildPTROnlySVFGWithoutOPT(_ander);
+        _svfg = svfgBuilder.buildPTROnlySVFG(_ander);
         _pag = _svfg->getPAG();
     }
     /// Reset visited map for next points-to query

package/SVF-linux/include/Graphs/ConsG.h

@@ -67,7 +67,7 @@ protected:
 
     void destroy();
 
-    PAGEdge::SVFStmtSetTy& getPAGEdgeSet(PAGEdge::PEDGEK kind)
+    SVFStmt::SVFStmtSetTy& getPAGEdgeSet(SVFStmt::PEDGEK kind)
     {
         return pag->getPTASVFStmtSet(kind);
     }
@@ -291,7 +291,7 @@ public:
     inline bool isZeroOffsettedGepCGEdge(ConstraintEdge *edge) const
     {
         if (NormalGepCGEdge *normalGepCGEdge = SVFUtil::dyn_cast<NormalGepCGEdge>(edge))
-            if (0 == normalGepCGEdge->getFieldOffset())
+            if (0 == normalGepCGEdge->getConstantFieldIdx())
                 return true;
         return false;
     }

package/SVF-linux/include/Graphs/ConsGEdge.h

@@ -304,7 +304,7 @@ public:
     }
 
     /// Get location set of the gep edge
-    inline s64_t getFieldOffset() const
+    inline s64_t getConstantFieldIdx() const
     {
         return ls.accumulateConstantFieldIdx();
     }

package/SVF-linux/include/Graphs/VFG.h

@@ -427,7 +427,7 @@ protected:
     void addVFGNodes();
 
     /// Get PAGEdge set
-    virtual inline PAGEdge::SVFStmtSetTy& getPAGEdgeSet(PAGEdge::PEDGEK kind)
+    virtual inline SVFStmt::SVFStmtSetTy& getPAGEdgeSet(SVFStmt::PEDGEK kind)
     {
         if (isPtrOnlySVFG())
             return pag->getPTASVFStmtSet(kind);
@@ -435,7 +435,7 @@ protected:
             return pag->getSVFStmtSet(kind);
     }
 
-    virtual inline bool isInterestedPAGNode(const PAGNode* node) const
+    virtual inline bool isInterestedPAGNode(const SVFVar* node) const
     {
         if (isPtrOnlySVFG())
             return node->isPointer();

package/SVF-linux/include/MSSA/SVFGBuilder.h

@@ -74,9 +74,7 @@ public:
     static SVFG* globalSvfg;
 
     SVFG* buildPTROnlySVFG(BVDataPTAImpl* pta);
-    SVFG* buildPTROnlySVFGWithoutOPT(BVDataPTAImpl* pta);
     SVFG* buildFullSVFG(BVDataPTAImpl* pta);
-    SVFG* buildFullSVFGWithoutOPT(BVDataPTAImpl* pta);
 
     /// Clean up
     static void releaseSVFG()

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

@@ -649,9 +649,9 @@ private:
     /// Add Gep edge
     GepStmt* addGepStmt(NodeID src, NodeID dst, const LocationSet& ls, bool constGep);
     /// Add Offset(Gep) edge
-    NormalGepStmt* addNormalGepStmt(NodeID src, NodeID dst, const LocationSet& ls);
+    GepStmt* addNormalGepStmt(NodeID src, NodeID dst, const LocationSet& ls);
     /// Add Variant(Gep) edge
-    VariantGepStmt* addVariantGepStmt(NodeID src, NodeID dst, const LocationSet& ls);
+    GepStmt* addVariantGepStmt(NodeID src, NodeID dst, const LocationSet& ls);
     /// Add Thread fork edge for parameter passing
     TDForkPE* addThreadForkPE(NodeID src, NodeID dst, const CallICFGNode* cs);
     /// Add Thread join edge for parameter passing

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

@@ -53,7 +53,7 @@ public:
     /// ThreadFork/ThreadJoin is to model parameter passings between thread spawners and spawnees.
     enum PEDGEK
     {
-        Addr, Copy, Store, Load, Call, Ret, NormalGep, VariantGep, Phi, Cmp, BinaryOp, UnaryOp, Branch, ThreadFork, ThreadJoin
+        Addr, Copy, Store, Load, Call, Ret, Gep, Phi, Cmp, BinaryOp, UnaryOp, Branch, ThreadFork, ThreadJoin
     };
 
 private:
@@ -85,8 +85,7 @@ public:
                edge->getEdgeKind() == SVFStmt::Load ||
                edge->getEdgeKind() == SVFStmt::Call ||
                edge->getEdgeKind() == SVFStmt::Ret ||
-               edge->getEdgeKind() == SVFStmt::NormalGep ||
-               edge->getEdgeKind() == SVFStmt::VariantGep ||
+               edge->getEdgeKind() == SVFStmt::Gep ||
                edge->getEdgeKind() == SVFStmt::Cmp ||
                edge->getEdgeKind() == SVFStmt::BinaryOp ||
                edge->getEdgeKind() == SVFStmt::UnaryOp  ||
@@ -227,8 +226,7 @@ public:
                edge->getEdgeKind() == SVFStmt::Load ||
                edge->getEdgeKind() == SVFStmt::Call ||
                edge->getEdgeKind() == SVFStmt::Ret ||
-               edge->getEdgeKind() == SVFStmt::NormalGep ||
-               edge->getEdgeKind() == SVFStmt::VariantGep ||
+               edge->getEdgeKind() == SVFStmt::Gep ||
                edge->getEdgeKind() == SVFStmt::ThreadFork ||
                edge->getEdgeKind() == SVFStmt::ThreadJoin;
     }
@@ -240,8 +238,7 @@ public:
                edge->getEdgeKind() == SVFStmt::Load ||
                edge->getEdgeKind() == SVFStmt::Call ||
                edge->getEdgeKind() == SVFStmt::Ret ||
-               edge->getEdgeKind() == SVFStmt::NormalGep ||
-               edge->getEdgeKind() == SVFStmt::VariantGep ||
+               edge->getEdgeKind() == SVFStmt::Gep ||
                edge->getEdgeKind() == SVFStmt::ThreadFork ||
                edge->getEdgeKind() == SVFStmt::ThreadJoin;
     }
@@ -417,7 +414,7 @@ private:
     void operator=(const GepStmt &); ///< place holder
 
     LocationSet ls;	///< location set of the gep edge
-
+    bool variantField;  ///< Gep statement with a variant field index (pointer arithmetic) for struct field access (e.g., p = &(q + f), where f is a variable)
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -427,111 +424,37 @@ public:
     }
     static inline bool classof(const SVFStmt *edge)
     {
-        return 	edge->getEdgeKind() == SVFStmt::NormalGep ||
-                edge->getEdgeKind() == SVFStmt::VariantGep;
+        return 	edge->getEdgeKind() == SVFStmt::Gep;
     }
     static inline bool classof(const GenericPAGEdgeTy *edge)
     {
-        return	edge->getEdgeKind() == SVFStmt::NormalGep ||
-                edge->getEdgeKind() == SVFStmt::VariantGep;
+        return	edge->getEdgeKind() == SVFStmt::Gep;
     }
     //@}
 
     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;
     }
 
-protected:
-    /// constructor
-    GepStmt(SVFVar* s, SVFVar* d, const LocationSet& l, PEDGEK k) : AssignStmt(s,d,k), ls(l)
-    {
-    }
-
-    virtual const std::string toString() const;
-
-};
-
-
-/*!
- * Gep statement with a fixed field index for struct field access 
- */
-class NormalGepStmt : public GepStmt
-{
-private:
-    NormalGepStmt(); ///< place holder
-    NormalGepStmt(const NormalGepStmt&); ///< place holder
-    void operator=(const NormalGepStmt&); ///< place holder
-
-public:
-    /// Methods for support type inquiry through isa, cast, and dyn_cast:
-    //@{
-    static inline bool classof(const NormalGepStmt *)
+    /// offset of the gep statement
+    inline s64_t getConstantFieldIdx() const
     {
-        return true;
-    }
-    static inline bool classof(const GepStmt *edge)
-    {
-        return edge->getEdgeKind() == SVFStmt::NormalGep;
-    }
-    static inline bool classof(const SVFStmt *edge)
-    {
-        return edge->getEdgeKind() == SVFStmt::NormalGep;
+        return getLocationSet().accumulateConstantFieldIdx();
     }
-    static inline bool classof(const GenericPAGEdgeTy *edge)
+    /// Gep statement with a variant field index (pointer arithmetic) for struct field access 
+    inline bool isVariantFieldGep() const
     {
-        return edge->getEdgeKind() == SVFStmt::NormalGep;
-    }
-    //@}
+        return variantField;
+    }   
 
     /// constructor
-    NormalGepStmt(SVFVar* s, SVFVar* d, const LocationSet& l) : GepStmt(s,d,l, SVFStmt::NormalGep)
-    {}
-
-    /// offset of the gep edge
-    inline s64_t getFieldOffset() const
+    GepStmt(SVFVar* s, SVFVar* d, const LocationSet& l, bool varfld=false) : AssignStmt(s,d,SVFStmt::Gep), ls(l), variantField(varfld)
     {
-        return getLocationSet().accumulateConstantFieldIdx();
     }
 
-    virtual const std::string toString() const override;
-};
-
-/*!
- * Gep statement with a variant field index for struct field access 
- */
-class VariantGepStmt : public GepStmt
-{
-private:
-    VariantGepStmt(); ///< place holder
-    VariantGepStmt(const VariantGepStmt&); ///< place holder
-    void operator=(const VariantGepStmt&); ///< place holder
-
-public:
-    /// Methods for support type inquiry through isa, cast, and dyn_cast:
-    //@{
-    static inline bool classof(const VariantGepStmt *)
-    {
-        return true;
-    }
-    static inline bool classof(const GepStmt *edge)
-    {
-        return edge->getEdgeKind() == SVFStmt::VariantGep;
-    }
-    static inline bool classof(const SVFStmt *edge)
-    {
-        return edge->getEdgeKind() == SVFStmt::VariantGep;
-    }
-    static inline bool classof(const GenericPAGEdgeTy *edge)
-    {
-        return edge->getEdgeKind() == SVFStmt::VariantGep;
-    }
-    //@}
-
-    /// constructor
-    VariantGepStmt(SVFVar* s, SVFVar* d, const LocationSet& l) : GepStmt(s,d,l, SVFStmt::VariantGep) {}
-
-    virtual const std::string toString() const override;
+    virtual const std::string toString() const;
 
 };
 

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

@@ -241,10 +241,13 @@ private:
     /// Has incoming VariantGepEdges
     inline bool hasIncomingVariantGepEdge() const
     {
-        SVFStmt::KindToSVFStmtMapTy::const_iterator it = InEdgeKindToSetMap.find(SVFStmt::VariantGep);
+        SVFStmt::KindToSVFStmtMapTy::const_iterator it = InEdgeKindToSetMap.find(SVFStmt::Gep);
         if (it != InEdgeKindToSetMap.end())
         {
-            return (!it->second.empty());
+            for(auto gep : it->second){
+                if(SVFUtil::cast<GepStmt>(gep)->isVariantFieldGep())
+                    return true;
+            }
         }
         return false;
     }
@@ -422,7 +425,7 @@ public:
     }
 
     /// offset of the base value variable
-    inline s64_t getFieldOffset() const
+    inline s64_t getConstantFieldIdx() const
     {
         return ls.accumulateConstantFieldIdx();
     }
@@ -431,8 +434,8 @@ public:
     inline const std::string getValueName() const
     {
         if (value && value->hasName())
-            return value->getName().str() + "_" + llvm::utostr(getFieldOffset());
-        return "offset_" + llvm::utostr(getFieldOffset());
+            return value->getName().str() + "_" + llvm::utostr(getConstantFieldIdx());
+        return "offset_" + llvm::utostr(getConstantFieldIdx());
     }
 
     inline const Type* getType() const
@@ -497,7 +500,7 @@ public:
     }
 
     /// offset of the mem object
-    inline s64_t getFieldOffset() const
+    inline s64_t getConstantFieldIdx() const
     {
         return ls.accumulateConstantFieldIdx();
     }

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

@@ -46,7 +46,7 @@ public:
     {
     }
 
-    u32_t getFieldOffset(void) const
+    u32_t getConstantFieldIdx(void) const
     {
         return offset;
     }

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

@@ -72,7 +72,7 @@ public:
     /// Initialize nodes and edges
     //@{
     void initialiseNodes();
-    void addEdge(NodeID src, NodeID dst, PAGEdge::PEDGEK kind,
+    void addEdge(NodeID src, NodeID dst, SVFStmt::PEDGEK kind,
                  s64_t offset = 0, Instruction* cs = nullptr);
     // @}
 
@@ -377,16 +377,16 @@ public:
         return edge;
     }
     /// Add Offset(Gep) edge
-    inline NormalGepStmt* addNormalGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
+    inline GepStmt* addNormalGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
     {
-        NormalGepStmt *edge = pag->addNormalGepStmt(src, dst, ls);
+        GepStmt *edge = pag->addNormalGepStmt(src, dst, ls);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Variant(Gep) edge
-    inline VariantGepStmt* addVariantGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
+    inline GepStmt* addVariantGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
     {
-        VariantGepStmt *edge = pag->addVariantGepStmt(src, dst, ls);
+        GepStmt *edge = pag->addVariantGepStmt(src, dst, ls);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }

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

@@ -64,7 +64,7 @@ private:
     void writePAGgepNode(SVF::NodeID nodeId, GepObjVar* gepNode)
     {
         auto baseNodeId = gepNode->getBaseNode();
-        auto locationSetOffset = gepNode->getFieldOffset();
+        auto locationSetOffset = gepNode->getConstantFieldIdx();
 
         LLVMContext &context = mainModule->getContext();
         llvm::SmallVector<llvm::Metadata *, 32> operands;

package/SVF-osx/include/DDA/DDAVFSolver.h

@@ -290,7 +290,7 @@ protected:
     virtual inline void buildSVFG(SVFIR* pag)
     {
         _ander = AndersenWaveDiff::createAndersenWaveDiff(pag);
-        _svfg = svfgBuilder.buildPTROnlySVFGWithoutOPT(_ander);
+        _svfg = svfgBuilder.buildPTROnlySVFG(_ander);
         _pag = _svfg->getPAG();
     }
     /// Reset visited map for next points-to query

package/SVF-osx/include/Graphs/ConsG.h

@@ -67,7 +67,7 @@ protected:
 
     void destroy();
 
-    PAGEdge::SVFStmtSetTy& getPAGEdgeSet(PAGEdge::PEDGEK kind)
+    SVFStmt::SVFStmtSetTy& getPAGEdgeSet(SVFStmt::PEDGEK kind)
     {
         return pag->getPTASVFStmtSet(kind);
     }
@@ -291,7 +291,7 @@ public:
     inline bool isZeroOffsettedGepCGEdge(ConstraintEdge *edge) const
     {
         if (NormalGepCGEdge *normalGepCGEdge = SVFUtil::dyn_cast<NormalGepCGEdge>(edge))
-            if (0 == normalGepCGEdge->getFieldOffset())
+            if (0 == normalGepCGEdge->getConstantFieldIdx())
                 return true;
         return false;
     }

package/SVF-osx/include/Graphs/ConsGEdge.h

@@ -304,7 +304,7 @@ public:
     }
 
     /// Get location set of the gep edge
-    inline s64_t getFieldOffset() const
+    inline s64_t getConstantFieldIdx() const
     {
         return ls.accumulateConstantFieldIdx();
     }

package/SVF-osx/include/Graphs/VFG.h

@@ -427,7 +427,7 @@ protected:
     void addVFGNodes();
 
     /// Get PAGEdge set
-    virtual inline PAGEdge::SVFStmtSetTy& getPAGEdgeSet(PAGEdge::PEDGEK kind)
+    virtual inline SVFStmt::SVFStmtSetTy& getPAGEdgeSet(SVFStmt::PEDGEK kind)
     {
         if (isPtrOnlySVFG())
             return pag->getPTASVFStmtSet(kind);
@@ -435,7 +435,7 @@ protected:
             return pag->getSVFStmtSet(kind);
     }
 
-    virtual inline bool isInterestedPAGNode(const PAGNode* node) const
+    virtual inline bool isInterestedPAGNode(const SVFVar* node) const
     {
         if (isPtrOnlySVFG())
             return node->isPointer();

package/SVF-osx/include/MSSA/SVFGBuilder.h

@@ -74,9 +74,7 @@ public:
     static SVFG* globalSvfg;
 
     SVFG* buildPTROnlySVFG(BVDataPTAImpl* pta);
-    SVFG* buildPTROnlySVFGWithoutOPT(BVDataPTAImpl* pta);
     SVFG* buildFullSVFG(BVDataPTAImpl* pta);
-    SVFG* buildFullSVFGWithoutOPT(BVDataPTAImpl* pta);
 
     /// Clean up
     static void releaseSVFG()

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

@@ -649,9 +649,9 @@ private:
     /// Add Gep edge
     GepStmt* addGepStmt(NodeID src, NodeID dst, const LocationSet& ls, bool constGep);
     /// Add Offset(Gep) edge
-    NormalGepStmt* addNormalGepStmt(NodeID src, NodeID dst, const LocationSet& ls);
+    GepStmt* addNormalGepStmt(NodeID src, NodeID dst, const LocationSet& ls);
     /// Add Variant(Gep) edge
-    VariantGepStmt* addVariantGepStmt(NodeID src, NodeID dst, const LocationSet& ls);
+    GepStmt* addVariantGepStmt(NodeID src, NodeID dst, const LocationSet& ls);
     /// Add Thread fork edge for parameter passing
     TDForkPE* addThreadForkPE(NodeID src, NodeID dst, const CallICFGNode* cs);
     /// Add Thread join edge for parameter passing

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

@@ -53,7 +53,7 @@ public:
     /// ThreadFork/ThreadJoin is to model parameter passings between thread spawners and spawnees.
     enum PEDGEK
     {
-        Addr, Copy, Store, Load, Call, Ret, NormalGep, VariantGep, Phi, Cmp, BinaryOp, UnaryOp, Branch, ThreadFork, ThreadJoin
+        Addr, Copy, Store, Load, Call, Ret, Gep, Phi, Cmp, BinaryOp, UnaryOp, Branch, ThreadFork, ThreadJoin
     };
 
 private:
@@ -85,8 +85,7 @@ public:
                edge->getEdgeKind() == SVFStmt::Load ||
                edge->getEdgeKind() == SVFStmt::Call ||
                edge->getEdgeKind() == SVFStmt::Ret ||
-               edge->getEdgeKind() == SVFStmt::NormalGep ||
-               edge->getEdgeKind() == SVFStmt::VariantGep ||
+               edge->getEdgeKind() == SVFStmt::Gep ||
                edge->getEdgeKind() == SVFStmt::Cmp ||
                edge->getEdgeKind() == SVFStmt::BinaryOp ||
                edge->getEdgeKind() == SVFStmt::UnaryOp  ||
@@ -227,8 +226,7 @@ public:
                edge->getEdgeKind() == SVFStmt::Load ||
                edge->getEdgeKind() == SVFStmt::Call ||
                edge->getEdgeKind() == SVFStmt::Ret ||
-               edge->getEdgeKind() == SVFStmt::NormalGep ||
-               edge->getEdgeKind() == SVFStmt::VariantGep ||
+               edge->getEdgeKind() == SVFStmt::Gep ||
                edge->getEdgeKind() == SVFStmt::ThreadFork ||
                edge->getEdgeKind() == SVFStmt::ThreadJoin;
     }
@@ -240,8 +238,7 @@ public:
                edge->getEdgeKind() == SVFStmt::Load ||
                edge->getEdgeKind() == SVFStmt::Call ||
                edge->getEdgeKind() == SVFStmt::Ret ||
-               edge->getEdgeKind() == SVFStmt::NormalGep ||
-               edge->getEdgeKind() == SVFStmt::VariantGep ||
+               edge->getEdgeKind() == SVFStmt::Gep ||
                edge->getEdgeKind() == SVFStmt::ThreadFork ||
                edge->getEdgeKind() == SVFStmt::ThreadJoin;
     }
@@ -417,7 +414,7 @@ private:
     void operator=(const GepStmt &); ///< place holder
 
     LocationSet ls;	///< location set of the gep edge
-
+    bool variantField;  ///< Gep statement with a variant field index (pointer arithmetic) for struct field access (e.g., p = &(q + f), where f is a variable)
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -427,111 +424,37 @@ public:
     }
     static inline bool classof(const SVFStmt *edge)
     {
-        return 	edge->getEdgeKind() == SVFStmt::NormalGep ||
-                edge->getEdgeKind() == SVFStmt::VariantGep;
+        return 	edge->getEdgeKind() == SVFStmt::Gep;
     }
     static inline bool classof(const GenericPAGEdgeTy *edge)
     {
-        return	edge->getEdgeKind() == SVFStmt::NormalGep ||
-                edge->getEdgeKind() == SVFStmt::VariantGep;
+        return	edge->getEdgeKind() == SVFStmt::Gep;
     }
     //@}
 
     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;
     }
 
-protected:
-    /// constructor
-    GepStmt(SVFVar* s, SVFVar* d, const LocationSet& l, PEDGEK k) : AssignStmt(s,d,k), ls(l)
-    {
-    }
-
-    virtual const std::string toString() const;
-
-};
-
-
-/*!
- * Gep statement with a fixed field index for struct field access 
- */
-class NormalGepStmt : public GepStmt
-{
-private:
-    NormalGepStmt(); ///< place holder
-    NormalGepStmt(const NormalGepStmt&); ///< place holder
-    void operator=(const NormalGepStmt&); ///< place holder
-
-public:
-    /// Methods for support type inquiry through isa, cast, and dyn_cast:
-    //@{
-    static inline bool classof(const NormalGepStmt *)
+    /// offset of the gep statement
+    inline s64_t getConstantFieldIdx() const
     {
-        return true;
-    }
-    static inline bool classof(const GepStmt *edge)
-    {
-        return edge->getEdgeKind() == SVFStmt::NormalGep;
-    }
-    static inline bool classof(const SVFStmt *edge)
-    {
-        return edge->getEdgeKind() == SVFStmt::NormalGep;
+        return getLocationSet().accumulateConstantFieldIdx();
     }
-    static inline bool classof(const GenericPAGEdgeTy *edge)
+    /// Gep statement with a variant field index (pointer arithmetic) for struct field access 
+    inline bool isVariantFieldGep() const
     {
-        return edge->getEdgeKind() == SVFStmt::NormalGep;
-    }
-    //@}
+        return variantField;
+    }   
 
     /// constructor
-    NormalGepStmt(SVFVar* s, SVFVar* d, const LocationSet& l) : GepStmt(s,d,l, SVFStmt::NormalGep)
-    {}
-
-    /// offset of the gep edge
-    inline s64_t getFieldOffset() const
+    GepStmt(SVFVar* s, SVFVar* d, const LocationSet& l, bool varfld=false) : AssignStmt(s,d,SVFStmt::Gep), ls(l), variantField(varfld)
     {
-        return getLocationSet().accumulateConstantFieldIdx();
     }
 
-    virtual const std::string toString() const override;
-};
-
-/*!
- * Gep statement with a variant field index for struct field access 
- */
-class VariantGepStmt : public GepStmt
-{
-private:
-    VariantGepStmt(); ///< place holder
-    VariantGepStmt(const VariantGepStmt&); ///< place holder
-    void operator=(const VariantGepStmt&); ///< place holder
-
-public:
-    /// Methods for support type inquiry through isa, cast, and dyn_cast:
-    //@{
-    static inline bool classof(const VariantGepStmt *)
-    {
-        return true;
-    }
-    static inline bool classof(const GepStmt *edge)
-    {
-        return edge->getEdgeKind() == SVFStmt::VariantGep;
-    }
-    static inline bool classof(const SVFStmt *edge)
-    {
-        return edge->getEdgeKind() == SVFStmt::VariantGep;
-    }
-    static inline bool classof(const GenericPAGEdgeTy *edge)
-    {
-        return edge->getEdgeKind() == SVFStmt::VariantGep;
-    }
-    //@}
-
-    /// constructor
-    VariantGepStmt(SVFVar* s, SVFVar* d, const LocationSet& l) : GepStmt(s,d,l, SVFStmt::VariantGep) {}
-
-    virtual const std::string toString() const override;
+    virtual const std::string toString() const;
 
 };
 

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

@@ -241,10 +241,13 @@ private:
     /// Has incoming VariantGepEdges
     inline bool hasIncomingVariantGepEdge() const
     {
-        SVFStmt::KindToSVFStmtMapTy::const_iterator it = InEdgeKindToSetMap.find(SVFStmt::VariantGep);
+        SVFStmt::KindToSVFStmtMapTy::const_iterator it = InEdgeKindToSetMap.find(SVFStmt::Gep);
         if (it != InEdgeKindToSetMap.end())
         {
-            return (!it->second.empty());
+            for(auto gep : it->second){
+                if(SVFUtil::cast<GepStmt>(gep)->isVariantFieldGep())
+                    return true;
+            }
         }
         return false;
     }
@@ -422,7 +425,7 @@ public:
     }
 
     /// offset of the base value variable
-    inline s64_t getFieldOffset() const
+    inline s64_t getConstantFieldIdx() const
     {
         return ls.accumulateConstantFieldIdx();
     }
@@ -431,8 +434,8 @@ public:
     inline const std::string getValueName() const
     {
         if (value && value->hasName())
-            return value->getName().str() + "_" + llvm::utostr(getFieldOffset());
-        return "offset_" + llvm::utostr(getFieldOffset());
+            return value->getName().str() + "_" + llvm::utostr(getConstantFieldIdx());
+        return "offset_" + llvm::utostr(getConstantFieldIdx());
     }
 
     inline const Type* getType() const
@@ -497,7 +500,7 @@ public:
     }
 
     /// offset of the mem object
-    inline s64_t getFieldOffset() const
+    inline s64_t getConstantFieldIdx() const
     {
         return ls.accumulateConstantFieldIdx();
     }

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

@@ -46,7 +46,7 @@ public:
     {
     }
 
-    u32_t getFieldOffset(void) const
+    u32_t getConstantFieldIdx(void) const
     {
         return offset;
     }

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

@@ -72,7 +72,7 @@ public:
     /// Initialize nodes and edges
     //@{
     void initialiseNodes();
-    void addEdge(NodeID src, NodeID dst, PAGEdge::PEDGEK kind,
+    void addEdge(NodeID src, NodeID dst, SVFStmt::PEDGEK kind,
                  s64_t offset = 0, Instruction* cs = nullptr);
     // @}
 
@@ -377,16 +377,16 @@ public:
         return edge;
     }
     /// Add Offset(Gep) edge
-    inline NormalGepStmt* addNormalGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
+    inline GepStmt* addNormalGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
     {
-        NormalGepStmt *edge = pag->addNormalGepStmt(src, dst, ls);
+        GepStmt *edge = pag->addNormalGepStmt(src, dst, ls);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Variant(Gep) edge
-    inline VariantGepStmt* addVariantGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
+    inline GepStmt* addVariantGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
     {
-        VariantGepStmt *edge = pag->addVariantGepStmt(src, dst, ls);
+        GepStmt *edge = pag->addVariantGepStmt(src, dst, ls);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }

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

@@ -64,7 +64,7 @@ private:
     void writePAGgepNode(SVF::NodeID nodeId, GepObjVar* gepNode)
     {
         auto baseNodeId = gepNode->getBaseNode();
-        auto locationSetOffset = gepNode->getFieldOffset();
+        auto locationSetOffset = gepNode->getConstantFieldIdx();
 
         LLVMContext &context = mainModule->getContext();
         llvm::SmallVector<llvm::Metadata *, 32> operands;

package/package.json

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