svf-tools 1.0.1033 → 1.0.1034

package/package.json

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

@@ -0,0 +1,310 @@
+//===- BasicBlockG.h -- BasicBlock node------------------------------------------------//
+//
+//                     SVF: Static Value-Flow Analysis
+//
+// Copyright (C) <2013-2025>  <Yulei Sui>
+//
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//===----------------------------------------------------------------------===//
+
+/*
+ * ICFGNode.h
+ *
+ *  Created on: 23 Jan, 2025
+ *      Author: Jiawei, Xiao
+ */
+
+#ifndef BASICBLOCKGRAPH_H_
+#define BASICBLOCKGRAPH_H_
+#include "GenericGraph.h"
+#include <sstream>
+#include <algorithm>
+
+
+namespace SVF
+{
+class SVFBasicBlock;
+class BasicBlockEdge;
+class ICFGNode;
+class SVFFunction;
+typedef GenericEdge<SVFBasicBlock> GenericBasicBlockEdgeTy;
+class BasicBlockEdge: public GenericBasicBlockEdgeTy
+{
+    friend class SVFIRWriter;
+    friend class SVFIRReader;
+
+public:
+public:
+    /// Constructor
+    BasicBlockEdge(SVFBasicBlock* s, SVFBasicBlock* d) : GenericBasicBlockEdgeTy(s, d, 0)
+    {
+    }
+    /// Destructor
+    ~BasicBlockEdge() {}
+
+    /// Overloading operator << for dumping ICFG node ID
+    //@{
+    friend OutStream& operator<<(OutStream& o, const BasicBlockEdge& edge)
+    {
+        o << edge.toString();
+        return o;
+    }
+    //@}
+
+    virtual const std::string toString() const;
+};
+
+
+typedef GenericNode<SVFBasicBlock, BasicBlockEdge> GenericBasicBlockNodeTy;
+class SVFBasicBlock : public GenericBasicBlockNodeTy
+{
+    friend class LLVMModuleSet;
+    friend class SVFIRWriter;
+    friend class SVFIRReader;
+    friend class SVFIRBuilder;
+    friend class SVFFunction;
+    friend class ICFGBuilder;
+    friend class ICFG;
+
+public:
+    typedef std::vector<const ICFGNode*>::const_iterator const_iterator;
+    std::vector<const SVFBasicBlock*> succBBs;
+    std::vector<const SVFBasicBlock*> predBBs;
+
+private:
+    std::vector<const ICFGNode*> allICFGNodes;    ///< all ICFGNodes in this BasicBlock
+    const SVFFunction* fun;                 /// Function where this BasicBlock is
+
+
+
+protected:
+    ///@{ attributes to be set only through Module builders e.g., LLVMModule
+
+    inline void addICFGNode(const ICFGNode* icfgNode)
+    {
+        assert(std::find(getICFGNodeList().begin(), getICFGNodeList().end(),
+                         icfgNode) == getICFGNodeList().end() && "duplicated icfgnode");
+        allICFGNodes.push_back(icfgNode);
+    }
+
+    /// @}
+
+public:
+    /// Constructor without name
+    SVFBasicBlock(NodeID id, const SVFFunction* f): GenericBasicBlockNodeTy(id, BasicBlockKd), fun(f)
+    {
+
+    }
+    SVFBasicBlock() = delete;
+    ~SVFBasicBlock()
+    {
+
+    }
+
+    static inline bool classof(const SVFBaseNode* node)
+    {
+        return node->getNodeKind() == SVFBaseNode::BasicBlockKd;
+    }
+
+    static inline bool classof(const SVFBasicBlock* node)
+    {
+        return true;
+    }
+
+    //@{
+    friend OutStream &operator<<(OutStream &o, const SVFBasicBlock&node)
+    {
+        o << node.toString();
+        return o;
+    }
+    //@}
+
+
+    inline const std::vector<const ICFGNode*>& getICFGNodeList() const
+    {
+        return allICFGNodes;
+    }
+
+    inline const_iterator begin() const
+    {
+        return allICFGNodes.begin();
+    }
+
+    inline const_iterator end() const
+    {
+        return allICFGNodes.end();
+    }
+
+    inline void addSuccBasicBlock(const SVFBasicBlock* succ2)
+    {
+        // check if the edge already exists
+        for (auto edge: this->getOutEdges())
+        {
+            if (edge->getDstNode() == succ2)
+                return;
+        }
+
+        SVFBasicBlock* succ = const_cast<SVFBasicBlock*>(succ2);
+        BasicBlockEdge* edge = new BasicBlockEdge(this, succ);
+        this->addOutgoingEdge(edge);
+        succ->addIncomingEdge(edge);
+        this->succBBs.push_back(succ);
+        succ->predBBs.push_back(this);
+    }
+
+    inline void addPredBasicBlock(const SVFBasicBlock* pred2)
+    {
+        // check if the edge already exists
+        for (auto edge: this->getInEdges())
+        {
+            if (edge->getSrcNode() == pred2)
+                return;
+        }
+        SVFBasicBlock* pred = const_cast<SVFBasicBlock*>(pred2);
+        BasicBlockEdge* edge = new BasicBlockEdge(pred, this);
+        this->addIncomingEdge(edge);
+        pred->addOutgoingEdge(edge);
+        this->predBBs.push_back(pred);
+        pred->succBBs.push_back(this);
+    }
+
+    inline const SVFFunction* getParent() const
+    {
+        return fun;
+    }
+
+    inline const SVFFunction* getFunction() const
+    {
+        return fun;
+    }
+
+    inline const ICFGNode* front() const
+    {
+        assert(!allICFGNodes.empty() && "bb empty?");
+        return allICFGNodes.front();
+    }
+
+    inline const ICFGNode* back() const
+    {
+        assert(!allICFGNodes.empty() && "bb empty?");
+        return allICFGNodes.back();
+    }
+
+    inline std::vector<const SVFBasicBlock*> getSuccessors() const
+    {
+        std::vector<const SVFBasicBlock*> res;
+        for (auto edge : this->getOutEdges())
+        {
+            res.push_back(edge->getDstNode());
+        }
+        return res;
+    }
+
+    inline std::vector<const SVFBasicBlock*> getPredecessors() const
+    {
+        std::vector<const SVFBasicBlock*> res;
+        for (auto edge : this->getInEdges())
+        {
+            res.push_back(edge->getSrcNode());
+        }
+        return res;
+    }
+    u32_t getNumSuccessors() const
+    {
+        return this->getOutEdges().size();
+    }
+    u32_t getBBSuccessorPos(const SVFBasicBlock* Succ)
+    {
+        u32_t i = 0;
+        for (const SVFBasicBlock* SuccBB: succBBs)
+        {
+            if (SuccBB == Succ)
+                return i;
+            i++;
+        }
+        assert(false && "Didn't find successor edge?");
+        return 0;
+    }
+    u32_t getBBSuccessorPos(const SVFBasicBlock* Succ) const
+    {
+        u32_t i = 0;
+        for (const SVFBasicBlock* SuccBB: succBBs)
+        {
+            if (SuccBB == Succ)
+                return i;
+            i++;
+        }
+        assert(false && "Didn't find successor edge?");
+        return 0;
+
+    }
+    u32_t getBBPredecessorPos(const SVFBasicBlock* succbb)
+    {
+        u32_t pos = 0;
+        for (const SVFBasicBlock* PredBB : succbb->getPredecessors())
+        {
+            if(PredBB == this)
+                return pos;
+            ++pos;
+        }
+        assert(false && "Didn't find predecessor edge?");
+        return pos;
+    }
+    u32_t getBBPredecessorPos(const SVFBasicBlock* succbb) const
+    {
+        u32_t pos = 0;
+        for (const SVFBasicBlock* PredBB : succbb->getPredecessors())
+        {
+            if(PredBB == this)
+                return pos;
+            ++pos;
+        }
+        assert(false && "Didn't find predecessor edge?");
+        return pos;
+    }
+
+    const std::string toString() const;
+
+};
+
+
+
+typedef GenericGraph<SVFBasicBlock, BasicBlockEdge> GenericBasicBlockGraphTy;
+class BasicBlockGraph: public GenericBasicBlockGraphTy
+{
+private:
+    NodeID id{0};
+    const SVFFunction* fun;
+public:
+    /// Constructor
+    BasicBlockGraph(const SVFFunction* f): fun(f)
+    {
+
+    }
+
+    SVFBasicBlock* addBasicBlock(const std::string& bbname)
+    {
+        id++;
+        SVFBasicBlock* bb = new SVFBasicBlock(id, fun);
+        addGNode(id, bb);
+        bb->setName(bbname);
+        return bb;
+    }
+
+};
+}
+
+#endif

package/svf/include/Graphs/GenericGraph.h

@@ -240,6 +240,7 @@ public:
         ConstraintNodeKd, // Constraint graph node
         TCTNodeKd,        // Thread creation tree node
         DCHNodeKd,        // DCHG node
+        BasicBlockKd,     // Basic block node
         OtherKd           // Other node kind
     };
 

package/svf/include/SVFIR/SVFValue.h

@@ -33,6 +33,7 @@
 #include "SVFIR/SVFType.h"
 #include "Graphs/GraphPrinter.h"
 #include "Util/Casting.h"
+#include "Graphs/BasicBlockG.h"
 
 namespace SVF
 {
@@ -299,7 +300,8 @@ class SVFFunction : public SVFValue
     friend class SVFIRBuilder;
 
 public:
-    typedef std::vector<const SVFBasicBlock*>::const_iterator const_iterator;
+    typename BasicBlockGraph::IDToNodeMapTy::iterator iterator;
+    typedef BasicBlockGraph::IDToNodeMapTy::const_iterator const_iterator;
     typedef SVFLoopAndDomInfo::BBSet BBSet;
     typedef SVFLoopAndDomInfo::BBList BBList;
     typedef SVFLoopAndDomInfo::LoopBBs LoopBBs;
@@ -314,10 +316,10 @@ private:
     const SVFFunctionType* funcType; /// FunctionType, which is different from the type (PointerType) of this SVFFunction
     SVFLoopAndDomInfo* loopAndDom;  /// the loop and dominate information
     const SVFFunction* realDefFun;  /// the definition of a function across multiple modules
-    std::vector<const SVFBasicBlock*> allBBs;   /// all BasicBlocks of this function
     std::vector<const SVFArgument*> allArgs;    /// all formal arguments of this function
     SVFBasicBlock *exitBlock;             /// a 'single' basic block having no successors and containing return instruction in a function
     const CallGraphNode *callGraphNode;          /// call graph node for this function
+    BasicBlockGraph* bbGraph; /// the basic block graph of this function
 
 protected:
     inline void setCallGraphNode(CallGraphNode *cgn)
@@ -325,12 +327,6 @@ protected:
         callGraphNode = cgn;
     }
 
-    ///@{ attributes to be set only through Module builders e.g., LLVMModule
-    inline void addBasicBlock(const SVFBasicBlock* bb)
-    {
-        allBBs.push_back(bb);
-    }
-
     inline void addArgument(SVFArgument* arg)
     {
         allArgs.push_back(arg);
@@ -376,6 +372,21 @@ public:
         return isDecl;
     }
 
+    void setBasicBlockGraph(BasicBlockGraph* graph)
+    {
+        this->bbGraph = graph;
+    }
+
+    BasicBlockGraph* getBasicBlockGraph()
+    {
+        return bbGraph;
+    }
+
+    const BasicBlockGraph* getBasicBlockGraph() const
+    {
+        return bbGraph;
+    }
+
     inline bool isIntrinsic() const
     {
         return intrinsic;
@@ -411,13 +422,14 @@ public:
 
     inline bool hasBasicBlock() const
     {
-        return !allBBs.empty();
+        return bbGraph && bbGraph->begin() != bbGraph->end();
     }
 
     inline const SVFBasicBlock* getEntryBlock() const
     {
         assert(hasBasicBlock() && "function does not have any Basicblock, external function?");
-        return allBBs.front();
+        assert(bbGraph->begin()->second->getInEdges().size() == 0 && "the first basic block is not entry block");
+        return bbGraph->begin()->second;
     }
 
     /// Carefully! when you call getExitBB, you need ensure the function has return instruction
@@ -437,23 +449,19 @@ public:
         /// Carefully! 'back' is just the last basic block of function,
         /// but not necessarily a exit basic block
         /// more refer to: https://github.com/SVF-tools/SVF/pull/1262
-        return allBBs.back();
+        return std::prev(bbGraph->end())->second;
     }
 
     inline const_iterator begin() const
     {
-        return allBBs.begin();
+        return bbGraph->begin();
     }
 
     inline const_iterator end() const
     {
-        return allBBs.end();
+        return bbGraph->end();
     }
 
-    inline const std::vector<const SVFBasicBlock*>& getBasicBlockList() const
-    {
-        return allBBs;
-    }
 
     inline const std::vector<const SVFBasicBlock*>& getReachableBBs() const
     {
@@ -523,113 +531,6 @@ public:
 
 class ICFGNode;
 
-class SVFBasicBlock : public SVFValue
-{
-    friend class LLVMModuleSet;
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-    friend class SVFIRBuilder;
-    friend class SVFFunction;
-    friend class ICFGBuilder;
-    friend class ICFG;
-
-public:
-    typedef std::vector<const ICFGNode*>::const_iterator const_iterator;
-
-private:
-    std::vector<const ICFGNode*> allICFGNodes;    ///< all ICFGNodes in this BasicBlock
-    std::vector<const SVFBasicBlock*> succBBs;  ///< all successor BasicBlocks of this BasicBlock
-    std::vector<const SVFBasicBlock*> predBBs;  ///< all predecessor BasicBlocks of this BasicBlock
-    const SVFFunction* fun;                 /// Function where this BasicBlock is
-
-protected:
-    ///@{ attributes to be set only through Module builders e.g., LLVMModule
-
-    inline void addICFGNode(const ICFGNode* icfgNode)
-    {
-        assert(std::find(getICFGNodeList().begin(), getICFGNodeList().end(),
-                         icfgNode) == getICFGNodeList().end() && "duplicated icfgnode");
-        allICFGNodes.push_back(icfgNode);
-    }
-
-    inline void addSuccBasicBlock(const SVFBasicBlock* succ)
-    {
-        succBBs.push_back(succ);
-    }
-
-    inline void addPredBasicBlock(const SVFBasicBlock* pred)
-    {
-        predBBs.push_back(pred);
-    }
-    /// @}
-
-public:
-    /// Constructor without name
-    SVFBasicBlock(const SVFType* ty, const SVFFunction* f);
-    SVFBasicBlock() = delete;
-    ~SVFBasicBlock() override;
-
-    static inline bool classof(const SVFValue *node)
-    {
-        return node->getKind() == SVFBB;
-    }
-
-    inline const std::vector<const ICFGNode*>& getICFGNodeList() const
-    {
-        return allICFGNodes;
-    }
-
-    inline const_iterator begin() const
-    {
-        return allICFGNodes.begin();
-    }
-
-    inline const_iterator end() const
-    {
-        return allICFGNodes.end();
-    }
-
-    inline const SVFFunction* getParent() const
-    {
-        return fun;
-    }
-
-    inline const SVFFunction* getFunction() const
-    {
-        return fun;
-    }
-
-    inline const ICFGNode* front() const
-    {
-        assert(!allICFGNodes.empty() && "bb empty?");
-        return allICFGNodes.front();
-    }
-
-    inline const ICFGNode* back() const
-    {
-        assert(!allICFGNodes.empty() && "bb empty?");
-        return allICFGNodes.back();
-    }
-
-    inline const std::vector<const SVFBasicBlock*>& getSuccessors() const
-    {
-        return succBBs;
-    }
-
-    inline const std::vector<const SVFBasicBlock*>& getPredecessors() const
-    {
-        return predBBs;
-    }
-    u32_t getNumSuccessors() const
-    {
-        return succBBs.size();
-    }
-    u32_t getBBSuccessorPos(const SVFBasicBlock* succbb);
-    u32_t getBBSuccessorPos(const SVFBasicBlock* succbb) const;
-    u32_t getBBPredecessorPos(const SVFBasicBlock* succbb);
-    u32_t getBBPredecessorPos(const SVFBasicBlock* succbb) const;
-};
-
 class SVFInstruction : public SVFValue
 {
     friend class SVFIRWriter;

package/svf/lib/Graphs/BasicBlockG.cpp

@@ -0,0 +1,10 @@
+#include "Graphs/BasicBlockG.h"
+
+using namespace SVF;
+const std::string BasicBlockEdge::toString() const
+{
+    std::string str;
+    std::stringstream rawstr(str);
+    rawstr << "BasicBlockEdge: " << getSrcNode()->toString() << " -> " << getDstNode()->getName();
+    return rawstr.str();
+}

package/svf/lib/MSSA/MemRegion.cpp

@@ -186,7 +186,7 @@ void MRGenerator::collectModRefForLoadStore()
         for (SVFFunction::const_iterator iter = fun.begin(), eiter = fun.end();
                 iter != eiter; ++iter)
         {
-            const SVFBasicBlock* bb = *iter;
+            const SVFBasicBlock* bb = iter->second;
             for (const auto& inst: bb->getICFGNodeList())
             {
                 SVFStmtList& pagEdgeList = getPAGEdgesFromInst(inst);

package/svf/lib/MSSA/MemSSA.cpp

@@ -597,7 +597,7 @@ void MemSSA::dumpMSSA(OutStream& Out)
         for (SVFFunction::const_iterator bit = fun->begin(), ebit = fun->end();
                 bit != ebit; ++bit)
         {
-            const SVFBasicBlock* bb = *bit;
+            const SVFBasicBlock* bb = bit->second;
             Out << bb->getName() << "\n";
             PHISet& phiSet = getPHISet(bb);
             for(PHISet::iterator pi = phiSet.begin(), epi = phiSet.end(); pi !=epi; ++pi)

package/svf/lib/MTA/LockAnalysis.cpp

@@ -72,8 +72,9 @@ void LockAnalysis::collectLockUnlocksites()
 
     for (const SVFFunction* F : tct->getSVFModule()->getFunctionSet())
     {
-        for (const SVFBasicBlock* bb : F->getBasicBlockList())
+        for (auto it : *F)
         {
+            const SVFBasicBlock* bb = it.second;
             for (const ICFGNode* icfgNode : bb->getICFGNodeList())
             {
                 if (isa<CallICFGNode>(icfgNode) && tcg->getThreadAPI()->isTDRelease(cast<CallICFGNode>(icfgNode)))

package/svf/lib/MTA/MHP.cpp

@@ -159,8 +159,9 @@ void MHP::updateNonCandidateFunInterleaving()
             {
                 const CallStrCxt& curCxt = cts.getContext();
 
-                for (const SVFBasicBlock* svfbb : fun->getBasicBlockList())
+                for (auto it : *fun)
                 {
+                    const SVFBasicBlock* svfbb = it.second;
                     for (const ICFGNode* curNode : svfbb->getICFGNodeList())
                     {
                         if (curNode == entryNode)

package/svf/lib/MTA/MTA.cpp

@@ -139,8 +139,9 @@ void MTA::detect(SVFModule* module)
     for (const SVFFunction* F : module->getFunctionSet())
     {
         // collect and create symbols inside the function body
-        for (const SVFBasicBlock* svfbb : F->getBasicBlockList())
+        for (auto it : *F)
         {
+            const SVFBasicBlock* svfbb = it.second;
             for (const ICFGNode* icfgNode : svfbb->getICFGNodeList())
             {
                 for(const SVFStmt* stmt : pag->getSVFStmtList(icfgNode))

package/svf/lib/MTA/MTAStat.cpp

@@ -126,7 +126,7 @@ void MTAStat::performMHPPairStat(MHP* mhp, LockAnalysis* lsa)
                 continue;
             for (SVFFunction::const_iterator bit =  fun->begin(), ebit = fun->end(); bit != ebit; ++bit)
             {
-                const SVFBasicBlock* bb = *bit;
+                const SVFBasicBlock* bb = bit->second;
                 for (const auto& icfgNode : bb->getICFGNodeList())
                 {
                     for(const SVFStmt* stmt : pag->getSVFStmtList(icfgNode))

package/svf/lib/SABER/SaberCondAllocator.cpp

@@ -70,7 +70,7 @@ void SaberCondAllocator::allocate(const SVFModule *M)
             for (SVFFunction::const_iterator bit = func->begin(), ebit = func->end();
                     bit != ebit; ++bit)
             {
-                const SVFBasicBlock* bb = *bit;
+                const SVFBasicBlock* bb = bit->second;
                 collectBBCallingProgExit(*bb);
                 allocateForBB(*bb);
             }

package/svf/lib/SVFIR/SVFValue.cpp

@@ -160,11 +160,10 @@ SVFFunction::SVFFunction(const SVFType* ty, const SVFFunctionType* ft,
 
 SVFFunction::~SVFFunction()
 {
-    for(const SVFBasicBlock* bb : allBBs)
-        delete bb;
     for(const SVFArgument* arg : allArgs)
         delete arg;
     delete loopAndDom;
+    delete bbGraph;
 }
 
 u32_t SVFFunction::arg_size() const
@@ -196,72 +195,6 @@ void SVFFunction::setExitBlock(SVFBasicBlock *bb)
     exitBlock = bb;
 }
 
-SVFBasicBlock::SVFBasicBlock(const SVFType* ty, const SVFFunction* f)
-    : SVFValue(ty, SVFValue::SVFBB), fun(f)
-{
-}
-
-SVFBasicBlock::~SVFBasicBlock()
-{
-
-}
-
-/*!
- * Get position of a successor basic block
- */
-u32_t SVFBasicBlock::getBBSuccessorPos(const SVFBasicBlock* Succ)
-{
-    u32_t i = 0;
-    for (const SVFBasicBlock* SuccBB: succBBs)
-    {
-        if (SuccBB == Succ)
-            return i;
-        i++;
-    }
-    assert(false && "Didn't find successor edge?");
-    return 0;
-}
-
-u32_t SVFBasicBlock::getBBSuccessorPos(const SVFBasicBlock* Succ) const
-{
-    u32_t i = 0;
-    for (const SVFBasicBlock* SuccBB: succBBs)
-    {
-        if (SuccBB == Succ)
-            return i;
-        i++;
-    }
-    assert(false && "Didn't find successor edge?");
-    return 0;
-}
-
-/*!
- * Return a position index from current bb to it successor bb
- */
-u32_t SVFBasicBlock::getBBPredecessorPos(const SVFBasicBlock* succbb)
-{
-    u32_t pos = 0;
-    for (const SVFBasicBlock* PredBB : succbb->getPredecessors())
-    {
-        if(PredBB == this)
-            return pos;
-        ++pos;
-    }
-    assert(false && "Didn't find predecessor edge?");
-    return pos;
-}
-u32_t SVFBasicBlock::getBBPredecessorPos(const SVFBasicBlock* succbb) const
-{
-    u32_t pos = 0;
-    for (const SVFBasicBlock* PredBB : succbb->getPredecessors())
-    {
-        if(PredBB == this)
-            return pos;
-        ++pos;
-    }
-    assert(false && "Didn't find predecessor edge?");
-    return pos;
-}
 
 SVFInstruction::SVFInstruction(const SVFType* ty, const SVFBasicBlock* b,
                                bool tm, bool isRet, SVFValKind k)

package/svf/lib/Util/CDGBuilder.cpp

@@ -171,8 +171,9 @@ void CDGBuilder::buildControlDependence(const SVFModule *svfgModule)
 void CDGBuilder::extractBBS(const SVF::SVFFunction *func,
                             Map<const SVF::SVFBasicBlock *, std::vector<const SVFBasicBlock *>> &res)
 {
-    for (const auto &bb: *func)
+    for (const auto &it: *func)
     {
+        const SVFBasicBlock* bb = it.second;
         for (const auto &succ: bb->getSuccessors())
         {
             if (func->postDominate(succ, bb))

package/svf/lib/Util/CallGraphBuilder.cpp

@@ -48,8 +48,9 @@ CallGraph* CallGraphBuilder::buildSVFIRCallGraph(SVFModule* svfModule)
 
     for (const auto& item : *callgraph)
     {
-        for (const SVFBasicBlock* svfbb : (item.second)->getFunction()->getBasicBlockList())
+        for (auto it : *(item.second)->getFunction())
         {
+            const SVFBasicBlock* svfbb = it.second;
             for (const ICFGNode* inst : svfbb->getICFGNodeList())
             {
                 if (SVFUtil::isNonInstricCallSite(inst))
@@ -80,8 +81,9 @@ ThreadCallGraph* CallGraphBuilder::buildThreadCallGraph()
     ThreadAPI* tdAPI = ThreadAPI::getThreadAPI();
     for (const auto& item: *svfirCallGraph)
     {
-        for (const SVFBasicBlock* svfbb : (item.second)->getFunction()->getBasicBlockList())
+        for (auto it : *(item.second)->getFunction())
         {
+            const SVFBasicBlock* svfbb = it.second;
             for (const ICFGNode* inst : svfbb->getICFGNodeList())
             {
                 if (SVFUtil::isa<CallICFGNode>(inst) && tdAPI->isTDFork(SVFUtil::cast<CallICFGNode>(inst)))
@@ -105,8 +107,9 @@ ThreadCallGraph* CallGraphBuilder::buildThreadCallGraph()
     // record join sites
     for (const auto& item: *svfirCallGraph)
     {
-        for (const SVFBasicBlock* svfbb : (item.second)->getFunction()->getBasicBlockList())
+        for (auto it : *(item.second)->getFunction())
         {
+            const SVFBasicBlock* svfbb = it.second;
             for (const ICFGNode* node : svfbb->getICFGNodeList())
             {
                 if (SVFUtil::isa<CallICFGNode>(node) && tdAPI->isTDJoin(SVFUtil::cast<CallICFGNode>(node)))

package/svf/lib/Util/SVFStat.cpp

@@ -230,7 +230,7 @@ void SVFStat::branchStat()
         for (SVFFunction::const_iterator bbIt = func->begin(), bbEit = func->end();
                 bbIt != bbEit; ++bbIt)
         {
-            const SVFBasicBlock* bb = *bbIt;
+            const SVFBasicBlock* bb = bbIt->second;
             u32_t numOfSucc = bb->getNumSuccessors();
             if (numOfSucc == 2)
                 numOfBB_2Succ++;

package/svf/lib/Util/ThreadAPI.cpp

@@ -275,7 +275,7 @@ void ThreadAPI::performAPIStat(SVFModule* module)
     {
         for (SVFFunction::const_iterator bit = (item.second)->getFunction()->begin(), ebit = (item.second)->getFunction()->end(); bit != ebit; ++bit)
         {
-            const SVFBasicBlock* bb = *bit;
+            const SVFBasicBlock* bb = bit->second;
             for (const auto& svfInst: bb->getICFGNodeList())
             {
                 if (!SVFUtil::isCallSite(svfInst))

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

@@ -34,6 +34,7 @@
 #include "SVFIR/SVFValue.h"
 #include "SVFIR/SVFModule.h"
 #include "Util/Options.h"
+#include "Graphs/BasicBlockG.h"
 
 namespace SVF
 {
@@ -177,11 +178,14 @@ public:
 
     void addFunctionMap(const Function* func, CallGraphNode* svfFunc);
 
-    inline void addBasicBlockMap(const BasicBlock* bb, SVFBasicBlock* svfBB)
+    // create a SVFBasicBlock according to LLVM BasicBlock, then add it to SVFFunction's BasicBlockGraph
+    inline void addBasicBlock(SVFFunction* fun, const BasicBlock* bb)
     {
+        SVFBasicBlock* svfBB = fun->getBasicBlockGraph()->addBasicBlock(bb->getName().str());
         LLVMBB2SVFBB[bb] = svfBB;
-        setValueAttr(bb,svfBB);
+        SVFBaseNode2LLVMValue[svfBB] = bb;
     }
+
     inline void addInstructionMap(const Instruction* inst, SVFInstruction* svfInst)
     {
         LLVMInst2SVFInst[inst] = svfInst;
@@ -246,7 +250,7 @@ public:
     const Value* getLLVMValue(const SVFBaseNode* value) const
     {
         SVFBaseNode2LLVMValueMap ::const_iterator it = SVFBaseNode2LLVMValue.find(value);
-        assert(it!=SVFBaseNode2LLVMValue.end() && "can't find corresponding llvm value!");
+        assert(it != SVFBaseNode2LLVMValue.end() && "can't find corresponding llvm value!");
         return it->second;
     }
 
@@ -264,7 +268,7 @@ public:
         return it->second;
     }
 
-    inline SVFBasicBlock* getSVFBasicBlock(const BasicBlock* bb) const
+    SVFBasicBlock* getSVFBasicBlock(const BasicBlock* bb)
     {
         LLVMBB2SVFBBMap::const_iterator it = LLVMBB2SVFBB.find(bb);
         assert(it!=LLVMBB2SVFBB.end() && "SVF BasicBlock not found!");

package/svf-llvm/lib/LLVMModule.cpp

@@ -280,6 +280,8 @@ void LLVMModuleSet::createSVFFunction(const Function* func)
             getSVFType(func->getFunctionType())),
         func->isDeclaration(), LLVMUtil::isIntrinsicFun(func),
         func->hasAddressTaken(), func->isVarArg(), new SVFLoopAndDomInfo);
+    BasicBlockGraph* bbGraph = new BasicBlockGraph(svfFunc);
+    svfFunc->setBasicBlockGraph(bbGraph);
     svfModule->addFunctionSet(svfFunc);
     addFunctionMap(func, svfFunc);
 
@@ -298,17 +300,14 @@ void LLVMModuleSet::createSVFFunction(const Function* func)
 
     for (const BasicBlock& bb : *func)
     {
-        SVFBasicBlock* svfBB =
-            new SVFBasicBlock(getSVFType(bb.getType()), svfFunc);
-        svfFunc->addBasicBlock(svfBB);
-        addBasicBlockMap(&bb, svfBB);
+        addBasicBlock(svfFunc, &bb);
         for (const Instruction& inst : bb)
         {
             SVFInstruction* svfInst = nullptr;
             if (const CallBase* call = SVFUtil::dyn_cast<CallBase>(&inst))
             {
                 svfInst = new SVFCallInst(
-                    getSVFType(call->getType()), svfBB,
+                    getSVFType(call->getType()), getSVFBasicBlock(&bb),
                     call->getFunctionType()->isVarArg(),
                     inst.isTerminator());
             }
@@ -316,7 +315,7 @@ void LLVMModuleSet::createSVFFunction(const Function* func)
             {
                 svfInst =
                     new SVFInstruction(getSVFType(inst.getType()),
-                                       svfBB, inst.isTerminator(),
+                                       getSVFBasicBlock(&bb), inst.isTerminator(),
                                        SVFUtil::isa<ReturnInst>(inst));
             }
 
@@ -1365,8 +1364,6 @@ SVFValue* LLVMModuleSet::getSVFValue(const Value* value)
 {
     if (const Function* fun = SVFUtil::dyn_cast<Function>(value))
         return getSVFFunction(fun);
-    else if (const BasicBlock* bb = SVFUtil::dyn_cast<BasicBlock>(value))
-        return getSVFBasicBlock(bb);
     else if(const Instruction* inst = SVFUtil::dyn_cast<Instruction>(value))
         return getSVFInstruction(inst);
     else if (const Argument* arg = SVFUtil::dyn_cast<Argument>(value))

package/svf-llvm/lib/LLVMUtil.cpp

@@ -726,10 +726,6 @@ std::string SVFValue::toString() const
     {
         rawstr << "Function: " << fun->getName() << " ";
     }
-    else if (const SVFBasicBlock* bb = SVFUtil::dyn_cast<SVFBasicBlock>(this))
-    {
-        rawstr << "BasicBlock: " << bb->getName() << " ";
-    }
     else
     {
         auto llvmVal = LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(this);
@@ -742,6 +738,18 @@ std::string SVFValue::toString() const
     return rawstr.str();
 }
 
+const std::string SVFBasicBlock::toString() const
+{
+    std::string str;
+    llvm::raw_string_ostream rawstr(str);
+    auto llvmVal = LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(this);
+    if (llvmVal)
+        rawstr << " " << *llvmVal << " ";
+    else
+        rawstr << " No llvmVal found";
+    rawstr << this->getSourceLoc();
+    return rawstr.str();
+}
 
 const std::string SVFBaseNode::valueOnlyToString() const
 {

package/svf-llvm/lib/ObjTypeInference.cpp

@@ -586,8 +586,8 @@ Set<const Value *> &ObjTypeInference::bwfindAllocOfVar(const Value *var)
                 if (!callee->isDeclaration())
                 {
                     const SVFFunction *svfFunc = LLVMModuleSet::getLLVMModuleSet()->getSVFFunction(callee);
-                    const BasicBlock* exitBB = SVFUtil::cast<BasicBlock>(LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(
-                                                   svfFunc->getExitBB()));
+                    const BasicBlock* exitBB = SVFUtil::dyn_cast<BasicBlock>(LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(svfFunc->getExitBB()));
+                    assert (exitBB && "exit bb is not a basic block?");
                     const Value *pValue = &exitBB->back();
                     const auto *retInst = SVFUtil::dyn_cast<ReturnInst>(pValue);
                     ABORT_IFNOT(retInst && retInst->getReturnValue(), "not return inst?");
@@ -894,8 +894,8 @@ Set<const Value *> &ObjTypeInference::bwFindAllocOrClsNameSources(const Value *s
                 if (!callee->isDeclaration())
                 {
                     const SVFFunction *svfFunc = LLVMModuleSet::getLLVMModuleSet()->getSVFFunction(callee);
-                    const BasicBlock* exitBB = SVFUtil::cast<BasicBlock>(LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(
-                                                   svfFunc->getExitBB()));
+                    const BasicBlock* exitBB = SVFUtil::dyn_cast<BasicBlock>(LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(svfFunc->getExitBB()));
+                    assert (exitBB && "exit bb is not a basic block?");
                     const Value *pValue = &exitBB->back();
                     const auto *retInst = SVFUtil::dyn_cast<ReturnInst>(pValue);
                     ABORT_IFNOT(retInst && retInst->getReturnValue(), "not return inst?");