Skip to content

Commit

Permalink
Merge pull request #1221 from jumormt/10.9
Browse files Browse the repository at this point in the history
remove bbToNode from CFBasicBlockGraph
  • Loading branch information
yuleisui authored Oct 12, 2023
2 parents 832d5c6 + e87fe04 commit 73cd22e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 33 deletions.
33 changes: 2 additions & 31 deletions svf/include/Graphs/CFBasicBlockG.h
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,6 @@ class CFBasicBlockGraph : public GenericCFBasicBlockGTy
private:
u32_t _totalCFBasicBlockNode{0};
u32_t _totalCFBasicBlockEdge{0};
Map<const SVFBasicBlock*, CFBasicBlockNode*> _bbToNode;
Map<const SVFFunction*, CFBasicBlockNode*> _funToFirstNode;
public:

Expand All @@ -380,27 +379,8 @@ class CFBasicBlockGraph : public GenericCFBasicBlockGTy
return hasGNode(id);
}

inline CFBasicBlockNode* getCFBasicBlockNode(const SVFBasicBlock* bb) const
{
if (bb && _bbToNode.find(bb) != _bbToNode.end())
{
return _bbToNode.at(bb);
}
else
{
return nullptr;
}
}

inline bool hasCFBasicBlockNode(const SVFBasicBlock* bb) const
{
return bb && _bbToNode.find(bb) != _bbToNode.end();
}

inline CFBasicBlockNode* getFirstCFBasicBlockNode(const SVFFunction* fun) const
{
if (fun && _funToFirstNode.find(fun) != _funToFirstNode.end())
{
inline CFBasicBlockNode* getFirstCFBasicBlockNode(const SVFFunction* fun) const {
if (fun && _funToFirstNode.find(fun) != _funToFirstNode.end()) {
return _funToFirstNode.at(fun);
}
else
Expand All @@ -418,15 +398,6 @@ class CFBasicBlockGraph : public GenericCFBasicBlockGTy
_funToFirstNode = svfNodeMap;
}

inline void setBBCFNodeMap(const Map<const SVFBasicBlock*, CFBasicBlockNode*>& svfNodeMap)
{
_bbToNode = svfNodeMap;
}

inline const Map<const SVFBasicBlock*, CFBasicBlockNode*>& getBBCFNodeMap() const
{
return _bbToNode;
}

bool hasCFBasicBlockEdge(CFBasicBlockNode *src, CFBasicBlockNode *dst, ICFGEdge *icfgEdge)
{
Expand Down
2 changes: 0 additions & 2 deletions svf/lib/Graphs/CFBasicBlockG.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ void CFBasicBlockGBuilder::build(SVFModule* module)
}
}
}
_CFBasicBlockG->_bbToNode = bbToNode;
}

void CFBasicBlockGBuilder::build(ICFG* icfg)
Expand Down Expand Up @@ -187,7 +186,6 @@ void CFBasicBlockGBuilder::build(ICFG* icfg)
const SVFBasicBlock* bb = *fun->getBasicBlockList().begin();
funToFirstNode[fun] = bbToNode[bb];
}
_CFBasicBlockG->_bbToNode = bbToNode;
_CFBasicBlockG->_funToFirstNode = funToFirstNode;
}
}

0 comments on commit 73cd22e

Please sign in to comment.