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

Merge pull request #5404 from ethereum/jumpFixes

Browse Source 
Annotate jump from calldata decode to function as "jump in".
This commit is contained in:
chriseth 2018-11-26 16:08:04 +01:00 committed by GitHub
commit 764d618c44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -15,6 +15,7 @@ Compiler Features:
Bugfixes: Bugfixes:
* Assembly output: Do not mix in/out jump annotations with arguments. * Assembly output: Do not mix in/out jump annotations with arguments.
* Code Generator: Annotate jump from calldata decoder to function as "jump in".
Build System: Build System:
* Emscripten: Upgrade to Emscripten SDK 1.37.21 and boost 1.67. * Emscripten: Upgrade to Emscripten SDK 1.37.21 and boost 1.67.

5
libsolidity/codegen/CompilerContext.h
View File

@ -167,7 +167,10 @@ public:
/// the data. /// the data.
CompilerContext& appendConditionalRevert(bool _forwardReturnData = false); CompilerContext& appendConditionalRevert(bool _forwardReturnData = false);
/// Appends a JUMP to a specific tag /// Appends a JUMP to a specific tag
CompilerContext& appendJumpTo(eth::AssemblyItem const& _tag) { m_asm->appendJump(_tag); return *this; } CompilerContext& appendJumpTo(
eth::AssemblyItem const& _tag,
eth::AssemblyItem::JumpType _jumpType = eth::AssemblyItem::JumpType::Ordinary
) { *m_asm << _tag.pushTag(); return appendJump(_jumpType); }
/// Appends pushing of a new tag and @returns the new tag. /// Appends pushing of a new tag and @returns the new tag.
eth::AssemblyItem pushNewTag() { return m_asm->append(m_asm->newPushTag()).tag(); } eth::AssemblyItem pushNewTag() { return m_asm->append(m_asm->newPushTag()).tag(); }
/// @returns a new tag without pushing any opcodes or data /// @returns a new tag without pushing any opcodes or data

5
libsolidity/codegen/ContractCompiler.cpp
View File

@ -344,7 +344,10 @@ void ContractCompiler::appendFunctionSelector(ContractDefinition const& _contrac
m_context << Instruction::DUP1 << Instruction::CALLDATASIZE << Instruction::SUB; m_context << Instruction::DUP1 << Instruction::CALLDATASIZE << Instruction::SUB;
CompilerUtils(m_context).abiDecode(functionType->parameterTypes()); CompilerUtils(m_context).abiDecode(functionType->parameterTypes());
} }
m_context.appendJumpTo(m_context.functionEntryLabel(functionType->declaration())); m_context.appendJumpTo(
m_context.functionEntryLabel(functionType->declaration()),
eth::AssemblyItem::JumpType::IntoFunction
);
m_context << returnTag; m_context << returnTag;
// Return tag and input parameters get consumed. // Return tag and input parameters get consumed.
m_context.adjustStackOffset( m_context.adjustStackOffset(