diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-06-29 16:48:53 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2017-07-28 04:52:58 +0800 |
| commit | 7d37eba4ba5e11a59bd201fde91bef7510510b0f (patch) | |
| tree | 18c9b51a029e9a79fda705a78c6a4753ccd82bfe /libsolidity | |
| parent | d4e44ecb46df58ff21690c28098d20e3c5dfe307 (diff) | |
| download | dexon-solidity-7d37eba4ba5e11a59bd201fde91bef7510510b0f.tar.gz dexon-solidity-7d37eba4ba5e11a59bd201fde91bef7510510b0f.tar.zst dexon-solidity-7d37eba4ba5e11a59bd201fde91bef7510510b0f.zip | |
Remove the need of jumping out of the fallback
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/codegen/ContractCompiler.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp index cad388df..fd0998d4 100644 --- a/libsolidity/codegen/ContractCompiler.cpp +++ b/libsolidity/codegen/ContractCompiler.cpp @@ -267,18 +267,13 @@ void ContractCompiler::appendFunctionSelector(ContractDefinition const& _contrac m_context << notFound; if (fallback) { - m_context.setStackOffset(0); if (!fallback->isPayable()) appendCallValueCheck(); - // Return tag is used to jump out of the function. - eth::AssemblyItem returnTag = m_context.pushNewTag(); - fallback->accept(*this); - m_context << returnTag; + solAssert(fallback->isFallback(), ""); solAssert(FunctionType(*fallback).parameterTypes().empty(), ""); solAssert(FunctionType(*fallback).returnParameterTypes().empty(), ""); - // Return tag gets consumed. - m_context.adjustStackOffset(-1); + fallback->accept(*this); m_context << Instruction::STOP; } else @@ -536,7 +531,8 @@ bool ContractCompiler::visit(FunctionDefinition const& _function) m_context.adjustStackOffset(-(int)c_returnValuesSize); - if (!_function.isConstructor()) + /// The constructor and the fallback function doesn't to jump out. + if (!_function.isConstructor() && !_function.isFallback()) m_context.appendJump(eth::AssemblyItem::JumpType::OutOfFunction); return false; } |