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

Special case for storage types with offset zero.

Browse Source
This commit is contained in:
chriseth 2017-04-25 12:56:34 +02:00
parent 3df7b06464
commit e841b23bfd
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libsolidity/codegen/ContractCompiler.cpp
View File

@ -573,10 +573,25 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
int stackDiff = _assembly.deposit() - m_context.baseStackOffsetOfVariable(*variable); int stackDiff = _assembly.deposit() - m_context.baseStackOffsetOfVariable(*variable);
if (ref->second.isSlot || ref->second.isOffset) if (ref->second.isSlot || ref->second.isOffset)
{ {
solAssert(variable->type()->sizeOnStack() == 2, ""); solAssert(variable->type()->dataStoredIn(DataLocation::Storage), "");
unsigned size = variable->type()->sizeOnStack();
if (size == 2)
{
// slot plus offset
if (ref->second.isOffset) if (ref->second.isOffset)
stackDiff--; stackDiff--;
} }
else
{
solAssert(size == 1, "");
// only slot, offset is zero
if (ref->second.isOffset)
{
_assembly.append(u256(0));
return;
}
}
}
else else
solAssert(variable->type()->sizeOnStack() == 1, ""); solAssert(variable->type()->sizeOnStack() == 1, "");
if (stackDiff < 1 || stackDiff > 16) if (stackDiff < 1 || stackDiff > 16)