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

Merge pull request #3839 from ethereum/unusedVariableWarningOrder

Browse Source 
Static Analyzer: Fix non-deterministic order of unused variable warni…
This commit is contained in:
chriseth 2018-04-06 18:35:21 +02:00 committed by GitHub
commit fe61435c27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -27,6 +27,7 @@ Bugfixes:
* Type System: Improve error message when attempting to shift by a fractional amount. * Type System: Improve error message when attempting to shift by a fractional amount.
* Type System: Make external library functions accessible. * Type System: Make external library functions accessible.
* Type System: Prevent encoding of weird types. * Type System: Prevent encoding of weird types.
* Static Analyzer: Fix non-deterministic order of unused variable warnings.
### 0.4.21 (2018-03-07) ### 0.4.21 (2018-03-07)

14
libsolidity/analysis/StaticAnalyzer.cpp
View File

@ -78,13 +78,13 @@ void StaticAnalyzer::endVisit(FunctionDefinition const&)
for (auto const& var: m_localVarUseCount) for (auto const& var: m_localVarUseCount)
if (var.second == 0) if (var.second == 0)
{ {
if (var.first->isCallableParameter()) if (var.first.second->isCallableParameter())
m_errorReporter.warning( m_errorReporter.warning(
var.first->location(), var.first.second->location(),
"Unused function parameter. Remove or comment out the variable name to silence this warning." "Unused function parameter. Remove or comment out the variable name to silence this warning."
); );
else else
m_errorReporter.warning(var.first->location(), "Unused local variable."); m_errorReporter.warning(var.first.second->location(), "Unused local variable.");
} }
m_localVarUseCount.clear(); m_localVarUseCount.clear();
@ -97,7 +97,7 @@ bool StaticAnalyzer::visit(Identifier const& _identifier)
{ {
solAssert(!var->name().empty(), ""); solAssert(!var->name().empty(), "");
if (var->isLocalVariable()) if (var->isLocalVariable())
m_localVarUseCount[var] += 1; m_localVarUseCount[make_pair(var->id(), var)] += 1;
} }
return true; return true;
} }
@ -109,7 +109,7 @@ bool StaticAnalyzer::visit(VariableDeclaration const& _variable)
solAssert(_variable.isLocalVariable(), ""); solAssert(_variable.isLocalVariable(), "");
if (_variable.name() != "") if (_variable.name() != "")
// This is not a no-op, the entry might pre-exist. // This is not a no-op, the entry might pre-exist.
m_localVarUseCount[&_variable] += 0; m_localVarUseCount[make_pair(_variable.id(), &_variable)] += 0;
} }
else if (_variable.isStateVariable()) else if (_variable.isStateVariable())
{ {
@ -132,7 +132,7 @@ bool StaticAnalyzer::visit(Return const& _return)
if (m_currentFunction && _return.expression()) if (m_currentFunction && _return.expression())
for (auto const& var: m_currentFunction->returnParameters()) for (auto const& var: m_currentFunction->returnParameters())
if (!var->name().empty()) if (!var->name().empty())
m_localVarUseCount[var.get()] += 1; m_localVarUseCount[make_pair(var->id(), var.get())] += 1;
return true; return true;
} }
@ -224,7 +224,7 @@ bool StaticAnalyzer::visit(InlineAssembly const& _inlineAssembly)
{ {
solAssert(!var->name().empty(), ""); solAssert(!var->name().empty(), "");
if (var->isLocalVariable()) if (var->isLocalVariable())
m_localVarUseCount[var] += 1; m_localVarUseCount[make_pair(var->id(), var)] += 1;
} }
} }

4
libsolidity/analysis/StaticAnalyzer.h
View File

@ -77,7 +77,9 @@ private:
bool m_nonPayablePublic = false; bool m_nonPayablePublic = false;
/// Number of uses of each (named) local variable in a function, counter is initialized with zero. /// Number of uses of each (named) local variable in a function, counter is initialized with zero.
std::map<VariableDeclaration const*, int> m_localVarUseCount; /// Pairs of AST ids and pointers are used as keys to ensure a deterministic order
/// when traversing.
std::map<std::pair<size_t, VariableDeclaration const*>, int> m_localVarUseCount;
FunctionDefinition const* m_currentFunction = nullptr; FunctionDefinition const* m_currentFunction = nullptr;