cerc-io/solidity
16
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

CFGNode: For function calls store a pointer to a resolved function definition rather than the FunctionCall AST node

Browse Source
This commit is contained in:
wechman 2022-08-30 09:46:55 +02:00 committed by Kamil Śliwak
parent 2f33105d11
commit fbe1181517
5 changed files with 46 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libsolidity/analysis/ControlFlowBuilder.cpp
View File

@ -300,8 +300,7 @@ bool ControlFlowBuilder::visit(FunctionCall const& _functionCall)
_functionCall.expression().accept(*this); _functionCall.expression().accept(*this);
ASTNode::listAccept(_functionCall.arguments(), *this); ASTNode::listAccept(_functionCall.arguments(), *this);
solAssert(!m_currentNode->functionCall); m_currentNode->functionDefinition = ASTNode::resolveFunctionCall(_functionCall, m_contract);
m_currentNode->functionCall = &_functionCall;
auto nextNode = newLabel(); auto nextNode = newLabel();
@ -318,6 +317,8 @@ bool ControlFlowBuilder::visit(FunctionCall const& _functionCall)
bool ControlFlowBuilder::visit(ModifierInvocation const& _modifierInvocation) bool ControlFlowBuilder::visit(ModifierInvocation const& _modifierInvocation)
{ {
solAssert(m_contract, "Free functions cannot have modifiers");
if (auto arguments = _modifierInvocation.arguments()) if (auto arguments = _modifierInvocation.arguments())
for (auto& argument: *arguments) for (auto& argument: *arguments)
appendControlFlow(*argument); appendControlFlow(*argument);

4
libsolidity/analysis/ControlFlowBuilder.h
View File

@ -38,14 +38,14 @@ public:
static std::unique_ptr<FunctionFlow> createFunctionFlow( static std::unique_ptr<FunctionFlow> createFunctionFlow(
CFG::NodeContainer& _nodeContainer, CFG::NodeContainer& _nodeContainer,
FunctionDefinition const& _function, FunctionDefinition const& _function,
ContractDefinition const* _contract = nullptr ContractDefinition const* _contract
); );
private: private:
explicit ControlFlowBuilder( explicit ControlFlowBuilder(
CFG::NodeContainer& _nodeContainer, CFG::NodeContainer& _nodeContainer,
FunctionFlow const& _functionFlow, FunctionFlow const& _functionFlow,
ContractDefinition const* _contract = nullptr ContractDefinition const* _contract
); );
// Visits for constructing the control flow. // Visits for constructing the control flow.

6
libsolidity/analysis/ControlFlowGraph.cpp
View File

@ -34,7 +34,11 @@ bool CFG::constructFlow(ASTNode const& _astRoot)
bool CFG::visit(FunctionDefinition const& _function) bool CFG::visit(FunctionDefinition const& _function)
{ {
if (_function.isImplemented() && _function.isFree()) if (_function.isImplemented() && _function.isFree())
m_functionControlFlow[{nullptr, &_function}] = ControlFlowBuilder::createFunctionFlow(m_nodeContainer, _function); m_functionControlFlow[{nullptr, &_function}] = ControlFlowBuilder::createFunctionFlow(
m_nodeContainer,
_function,
nullptr /* _contract */
);
return false; return false;
} }

5
libsolidity/analysis/ControlFlowGraph.h
View File

@ -98,9 +98,8 @@ struct CFGNode
std::vector<CFGNode*> entries; std::vector<CFGNode*> entries;
/// Exit nodes. All CFG nodes to which control flow may continue after this node. /// Exit nodes. All CFG nodes to which control flow may continue after this node.
std::vector<CFGNode*> exits; std::vector<CFGNode*> exits;
/// Function call done by this node /// Resolved definition of the function called by this node
FunctionCall const* functionCall = nullptr; FunctionDefinition const* functionDefinition = nullptr;
/// Variable occurrences in the node. /// Variable occurrences in the node.
std::vector<VariableOccurrence> variableOccurrences; std::vector<VariableOccurrence> variableOccurrences;
// Source location of this control flow block. // Source location of this control flow block.

12
libsolidity/analysis/ControlFlowRevertPruner.cpp
View File

@ -81,10 +81,7 @@ void ControlFlowRevertPruner::findRevertStates()
if (_node == functionFlow.exit) if (_node == functionFlow.exit)
foundExit = true; foundExit = true;
if (auto const* functionCall = _node->functionCall) auto const* resolvedFunction = _node->functionDefinition;
{
auto const* resolvedFunction = ASTNode::resolveFunctionCall(*functionCall, item.contract);
if (resolvedFunction && resolvedFunction->isImplemented()) if (resolvedFunction && resolvedFunction->isImplemented())
{ {
CFG::FunctionContractTuple calledFunctionTuple{ CFG::FunctionContractTuple calledFunctionTuple{
@ -103,7 +100,6 @@ void ControlFlowRevertPruner::findRevertStates()
break; break;
} }
} }
}
for (CFGNode* exit: _node->exits) for (CFGNode* exit: _node->exits)
_addChild(exit); _addChild(exit);
@ -135,10 +131,7 @@ void ControlFlowRevertPruner::modifyFunctionFlows()
FunctionFlow const& functionFlow = m_cfg.functionFlow(*item.first.function, item.first.contract); FunctionFlow const& functionFlow = m_cfg.functionFlow(*item.first.function, item.first.contract);
solidity::util::BreadthFirstSearch<CFGNode*>{{functionFlow.entry}}.run( solidity::util::BreadthFirstSearch<CFGNode*>{{functionFlow.entry}}.run(
[&](CFGNode* _node, auto&& _addChild) { [&](CFGNode* _node, auto&& _addChild) {
if (auto const* functionCall = _node->functionCall) auto const* resolvedFunction = _node->functionDefinition;
{
auto const* resolvedFunction = ASTNode::resolveFunctionCall(*functionCall, item.first.contract);
if (resolvedFunction && resolvedFunction->isImplemented()) if (resolvedFunction && resolvedFunction->isImplemented())
switch (m_functions.at({findScopeContract(*resolvedFunction, item.first.contract), resolvedFunction})) switch (m_functions.at({findScopeContract(*resolvedFunction, item.first.contract), resolvedFunction}))
{ {
@ -158,7 +151,6 @@ void ControlFlowRevertPruner::modifyFunctionFlows()
default: default:
break; break;
} }
}
for (CFGNode* exit: _node->exits) for (CFGNode* exit: _node->exits)
_addChild(exit); _addChild(exit);