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

Fix call graph with respect to constants.

Browse Source
This commit is contained in:
chriseth 2021-02-25 11:46:59 +01:00 committed by Kamil Śliwak
parent eacf7c1cf9
commit 16db3a84f1
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libsolidity/analysis/FunctionCallGraph.cpp
View File

@ -41,7 +41,8 @@ CallGraph FunctionCallGraphBuilder::buildCreationGraph(ContractDefinition const&
// an edge from Entry // an edge from Entry
builder.m_currentNode = CallGraph::SpecialNode::Entry; builder.m_currentNode = CallGraph::SpecialNode::Entry;
for (auto const* stateVar: base->stateVariables()) for (auto const* stateVar: base->stateVariables())
stateVar->accept(builder); if (!stateVar->isConstant())
stateVar->accept(builder);
if (base->constructor()) if (base->constructor())
{ {
@ -140,7 +141,15 @@ bool FunctionCallGraphBuilder::visit(EmitStatement const& _emitStatement)
bool FunctionCallGraphBuilder::visit(Identifier const& _identifier) bool FunctionCallGraphBuilder::visit(Identifier const& _identifier)
{ {
if (auto const* callable = dynamic_cast<CallableDeclaration const*>(_identifier.annotation().referencedDeclaration)) if (auto const* variable = dynamic_cast<VariableDeclaration const*>(_identifier.annotation().referencedDeclaration))
{
if (variable->isConstant())
{
solAssert(variable->isStateVariable() || variable->isFileLevelVariable(), "");
variable->accept(*this);
}
}
else if (auto const* callable = dynamic_cast<CallableDeclaration const*>(_identifier.annotation().referencedDeclaration))
{ {
solAssert(*_identifier.annotation().requiredLookup == VirtualLookup::Virtual, ""); solAssert(*_identifier.annotation().requiredLookup == VirtualLookup::Virtual, "");

2
libsolidity/codegen/ir/IRGenerator.cpp
View File

@ -66,7 +66,7 @@ void verifyCallGraph(
{ {
solAssert( solAssert(
_generatedFunctions.count(expectedFunction) == 1 || expectedFunction->isConstructor(), _generatedFunctions.count(expectedFunction) == 1 || expectedFunction->isConstructor(),
"No code generated for function " + expectedFunction->name() + "even though it is not a constructor." "No code generated for function " + expectedFunction->name() + " even though it is not a constructor."
); );
_generatedFunctions.erase(expectedFunction); _generatedFunctions.erase(expectedFunction);
} }