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

Fix inline assembly stack warnings when using variables

Browse Source
This commit is contained in:
Alex Beregszaszi 2016-11-15 02:53:19 +00:00
parent 58e75c7a48
commit dad33f80dd
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -7,6 +7,7 @@ Features:
Bugfixes: Bugfixes:
* Inline assembly: calculate stack height warning correctly even when local variables are used.
* Parser: disallow empty enum definitions. * Parser: disallow empty enum definitions.
* Type checker: disallow conversion between different enum types. * Type checker: disallow conversion between different enum types.

16
libsolidity/inlineasm/AsmCodeGen.cpp
View File

@ -216,10 +216,18 @@ public:
size_t numVariables = m_state.variables.size(); size_t numVariables = m_state.variables.size();
int deposit = m_state.assembly.deposit(); int deposit = m_state.assembly.deposit();
std::for_each(_block.statements.begin(), _block.statements.end(), boost::apply_visitor(*this)); std::for_each(_block.statements.begin(), _block.statements.end(), boost::apply_visitor(*this));
deposit = m_state.assembly.deposit() - deposit;
// pop variables
while (m_state.variables.size() > numVariables)
{
m_state.assembly.append(solidity::Instruction::POP);
m_state.variables.pop_back();
}
m_state.assembly.setSourceLocation(_block.location); m_state.assembly.setSourceLocation(_block.location);
deposit = m_state.assembly.deposit() - deposit;
// issue warnings for stack height discrepancies // issue warnings for stack height discrepancies
if (deposit < 0) if (deposit < 0)
{ {
@ -238,12 +246,6 @@ public:
); );
} }
// pop variables
while (m_state.variables.size() > numVariables)
{
m_state.assembly.append(solidity::Instruction::POP);
m_state.variables.pop_back();
}
} }
private: private: