cerc-io/solidity
11
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 #1375 from ethereum/inline-assembly-stack-height

Browse Source 
Fix inline assembly stack warnings when using variables
This commit is contained in:
chriseth
2016-11-15 11:25:12 +01:00
committed by GitHub
parent c1b1efafdb dce80911e1
commit 028ab1fbfb
3 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/inlineasm/AsmCodeGen.cpp
+9 -7
View File
@@ -216,10 +216,18 @@ public:
size_t numVariables = m_state.variables.size();
int deposit = m_state.assembly.deposit();
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);
deposit = m_state.assembly.deposit() - deposit;
// issue warnings for stack height discrepancies
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: