Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove bbToNode from CFBasicBlockGraph #1221

Merged
merged 2 commits into from
Oct 12, 2023
Merged

remove bbToNode from CFBasicBlockGraph #1221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce39124
remove bbToNode from CFBasicBlockGraph
Oct 12, 2023
e87fe04
Merge branch 'master' into 10.9
bjjwwang Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 2 additions & 31 deletions svf/include/Graphs/CFBasicBlockG.h
View file
Open in desktop
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
View file
Open in desktop
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;
}
}