cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIXUP] Don't skip edges to functions that have already been visited

Browse Source
This commit is contained in:
Kamil Śliwak 2021-02-05 13:10:37 +01:00
parent 20933f5f13
commit 7411742dad
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libsolidity/analysis/FunctionCallGraph.cpp
View File

@ -177,18 +177,13 @@ void FunctionCallGraphBuilder::endVisit(ModifierInvocation const& _modifierInvoc
}
}
void FunctionCallGraphBuilder::visitCallable(CallableDeclaration const* _callable, bool _directCall)
void FunctionCallGraphBuilder::visitCallable(CallableDeclaration const* _callable)
{
solAssert(!m_graph->edges.count(_callable), "");
optional<Node> previousNode = m_currentNode;
m_currentNode = _callable;
if (previousNode.has_value() && _directCall)
add(*previousNode, _callable);
if (!_directCall)
add(*m_currentNode, m_currentDispatch);
_callable->accept(*this);
m_currentNode = previousNode;
@ -201,12 +196,16 @@ bool FunctionCallGraphBuilder::add(Node _caller, Node _callee)
void FunctionCallGraphBuilder::processFunction(CallableDeclaration const& _callable, bool _calledDirectly)
{
if (m_graph->edges.count(&_callable))
return;
if (m_currentNode.has_value() && _calledDirectly)
add(*m_currentNode, &_callable);
// Create edge to creation dispatch
if (!_calledDirectly)
{
add(m_currentDispatch, &_callable);
visitCallable(&_callable, _calledDirectly);
add(&_callable, m_currentDispatch);
}
if (!m_graph->edges.count(&_callable))
visitCallable(&_callable);
}

2
libsolidity/analysis/FunctionCallGraph.h
View File

@ -88,7 +88,7 @@ private:
void endVisit(MemberAccess const& _memberAccess) override;
void endVisit(ModifierInvocation const& _modifierInvocation) override;
void visitCallable(CallableDeclaration const* _callable, bool _directCall = true);
void visitCallable(CallableDeclaration const* _callable);
bool add(Node _caller, Node _callee);
void processFunction(CallableDeclaration const& _callable, bool _calledDirectly = true);