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

Delete for memory objects.

Browse Source
This commit is contained in:
chriseth 2015-06-26 18:35:43 +02:00
parent 109b4eafb9
commit ca497f5d10
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ExpressionCompiler.cpp
View File

@ -679,10 +679,24 @@ void ExpressionCompiler::endVisit(MemberAccess const& _memberAccess)
case Type::Category::Struct: case Type::Category::Struct:
{ {
StructType const& type = dynamic_cast<StructType const&>(*_memberAccess.getExpression().getType()); StructType const& type = dynamic_cast<StructType const&>(*_memberAccess.getExpression().getType());
m_context << eth::Instruction::POP; // structs always align to new slot switch (type.location())
pair<u256, unsigned> const& offsets = type.getStorageOffsetsOfMember(member); {
m_context << offsets.first << eth::Instruction::ADD << u256(offsets.second); case DataLocation::Storage:
setLValueToStorageItem(_memberAccess); {
m_context << eth::Instruction::POP; // structs always align to new slot
pair<u256, unsigned> const& offsets = type.getStorageOffsetsOfMember(member);
m_context << offsets.first << eth::Instruction::ADD << u256(offsets.second);
setLValueToStorageItem(_memberAccess);
break;
}
case DataLocation::Memory:
{
solAssert(false, "Member access for memory structs not yet implemented.");
break;
}
default:
solAssert(false, "Illegal data location for struct.");
}
break; break;
} }
case Type::Category::Enum: case Type::Category::Enum:

13
LValue.cpp
View File

@ -69,17 +69,8 @@ void StackVariable::storeValue(Type const&, SourceLocation const& _location, boo
void StackVariable::setToZero(SourceLocation const& _location, bool) const void StackVariable::setToZero(SourceLocation const& _location, bool) const
{ {
unsigned stackDiff = m_context.baseToCurrentStackOffset(m_baseStackOffset); CompilerUtils(m_context).pushZeroValue(m_dataType);
if (stackDiff > 16) storeValue(m_dataType, _location, true);
BOOST_THROW_EXCEPTION(
CompilerError() <<
errinfo_sourceLocation(_location) <<
errinfo_comment("Stack too deep, try removing local variables.")
);
solAssert(stackDiff >= m_size - 1, "");
for (unsigned i = 0; i < m_size; ++i)
m_context << u256(0) << eth::swapInstruction(stackDiff + 1 - i)
<< eth::Instruction::POP;
} }
MemoryItem::MemoryItem(CompilerContext& _compilerContext, Type const& _type, bool _padded): MemoryItem::MemoryItem(CompilerContext& _compilerContext, Type const& _type, bool _padded):