diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-07-01 03:37:47 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-01 03:37:47 +0800 |
| commit | 4ca3b07e42ba6bb45c290aed7b6087c57f2cb242 (patch) | |
| tree | 8f7e5aa1eb57a4ea47615a72ca561c13ba8c89c1 | |
| parent | 568e7520768cb4612d24f3d12958ce353c4053dd (diff) | |
| parent | 71d866cd7ab8013f36ab5b01d849a74b9908aae0 (diff) | |
| download | dexon-solidity-4ca3b07e42ba6bb45c290aed7b6087c57f2cb242.tar.gz dexon-solidity-4ca3b07e42ba6bb45c290aed7b6087c57f2cb242.tar.zst dexon-solidity-4ca3b07e42ba6bb45c290aed7b6087c57f2cb242.zip | |
Merge pull request #2490 from ethereum/smallJumpOptimization
Abort early if there is nothing to encode or decode.
| -rw-r--r-- | libsolidity/codegen/CompilerUtils.cpp | 3 | ||||
| -rw-r--r-- | libsolidity/codegen/ContractCompiler.cpp | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp index 4edec155..a105036f 100644 --- a/libsolidity/codegen/CompilerUtils.cpp +++ b/libsolidity/codegen/CompilerUtils.cpp @@ -180,6 +180,9 @@ void CompilerUtils::encodeToMemory( t = t->mobileType()->interfaceType(_encodeAsLibraryTypes)->encodingType(); } + if (_givenTypes.empty()) + return; + // Stack during operation: // <v1> <v2> ... <vn> <mem_start> <dyn_head_1> ... <dyn_head_r> <end_of_mem> // The values dyn_head_i are added during the first loop and they point to the head part diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp index 74b07d4d..c358a519 100644 --- a/libsolidity/codegen/ContractCompiler.cpp +++ b/libsolidity/codegen/ContractCompiler.cpp @@ -299,9 +299,12 @@ void ContractCompiler::appendFunctionSelector(ContractDefinition const& _contrac // Return tag is used to jump out of the function. eth::AssemblyItem returnTag = m_context.pushNewTag(); - // Parameter for calldataUnpacker - m_context << CompilerUtils::dataStartOffset; - appendCalldataUnpacker(functionType->parameterTypes()); + if (!functionType->parameterTypes().empty()) + { + // Parameter for calldataUnpacker + m_context << CompilerUtils::dataStartOffset; + appendCalldataUnpacker(functionType->parameterTypes()); + } m_context.appendJumpTo(m_context.functionEntryLabel(functionType->declaration())); m_context << returnTag; // Return tag and input parameters get consumed. |