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

Reduce misleading stack height error message.

Browse Source
This commit is contained in:
chriseth 2019-05-22 16:08:49 +02:00
parent a86a88f123
commit fb2b3bb2b9
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libyul/AsmAnalysis.cpp
View File

@ -399,9 +399,11 @@ bool AsmAnalyzer::operator()(If const& _if)
{ {
bool success = true; bool success = true;
int const initialHeight = m_stackHeight;
if (!expectExpression(*_if.condition)) if (!expectExpression(*_if.condition))
success = false; success = false;
m_stackHeight--;
m_stackHeight = initialHeight;
if (!(*this)(_if.body)) if (!(*this)(_if.body))
success = false; success = false;
@ -417,6 +419,7 @@ bool AsmAnalyzer::operator()(Switch const& _switch)
bool success = true; bool success = true;
int const initialHeight = m_stackHeight;
if (!expectExpression(*_switch.expression)) if (!expectExpression(*_switch.expression))
success = false; success = false;
@ -476,7 +479,7 @@ bool AsmAnalyzer::operator()(Switch const& _switch)
success = false; success = false;
} }
m_stackHeight--; m_stackHeight = initialHeight;
m_info.stackHeightInfo[&_switch] = m_stackHeight; m_info.stackHeightInfo[&_switch] = m_stackHeight;
return success; return success;
@ -488,6 +491,8 @@ bool AsmAnalyzer::operator()(ForLoop const& _for)
Scope* outerScope = m_currentScope; Scope* outerScope = m_currentScope;
int const initialHeight = m_stackHeight;
bool success = true; bool success = true;
if (!(*this)(_for.pre)) if (!(*this)(_for.pre))
success = false; success = false;
@ -498,6 +503,7 @@ bool AsmAnalyzer::operator()(ForLoop const& _for)
if (!expectExpression(*_for.condition)) if (!expectExpression(*_for.condition))
success = false; success = false;
m_stackHeight--; m_stackHeight--;
// backup outer for-loop & create new state // backup outer for-loop & create new state
@ -510,7 +516,7 @@ bool AsmAnalyzer::operator()(ForLoop const& _for)
if (!(*this)(_for.post)) if (!(*this)(_for.post))
success = false; success = false;
m_stackHeight -= scope(&_for.pre).numberOfVariables(); m_stackHeight = initialHeight;
m_info.stackHeightInfo[&_for] = m_stackHeight; m_info.stackHeightInfo[&_for] = m_stackHeight;
m_currentScope = outerScope; m_currentScope = outerScope;
m_currentForLoop = outerForLoop; m_currentForLoop = outerForLoop;