diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-09-27 20:04:37 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 20:04:37 +0800 |
| commit | 3f783c8dad7a143d364f75ddac839aac2eeece1a (patch) | |
| tree | 9df24003560a05a73f1cdb1f2c6a2c28105fb669 /libsolidity/codegen/CompilerUtils.cpp | |
| parent | a27b23bacb60a6902547fb99b9f7a2df8bb014cd (diff) | |
| parent | 204214f0700179e3d8fa97c77d4f92acd349f015 (diff) | |
| download | dexon-solidity-3f783c8dad7a143d364f75ddac839aac2eeece1a.tar dexon-solidity-3f783c8dad7a143d364f75ddac839aac2eeece1a.tar.gz dexon-solidity-3f783c8dad7a143d364f75ddac839aac2eeece1a.tar.bz2 dexon-solidity-3f783c8dad7a143d364f75ddac839aac2eeece1a.tar.lz dexon-solidity-3f783c8dad7a143d364f75ddac839aac2eeece1a.tar.xz dexon-solidity-3f783c8dad7a143d364f75ddac839aac2eeece1a.tar.zst dexon-solidity-3f783c8dad7a143d364f75ddac839aac2eeece1a.zip | |
Merge pull request #2975 from ethereum/encode-memory
Split encodeToMemory into packedEncode and abiEncode
Diffstat (limited to 'libsolidity/codegen/CompilerUtils.cpp')
| -rw-r--r-- | libsolidity/codegen/CompilerUtils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp index ce97ed61..f9b181ae 100644 --- a/libsolidity/codegen/CompilerUtils.cpp +++ b/libsolidity/codegen/CompilerUtils.cpp @@ -191,7 +191,7 @@ void CompilerUtils::encodeToMemory( { // Use the new JULIA-based encoding function auto stackHeightBefore = m_context.stackHeight(); - abiEncode(_givenTypes, targetTypes, _encodeAsLibraryTypes); + abiEncodeV2(_givenTypes, targetTypes, _encodeAsLibraryTypes); solAssert(stackHeightBefore - m_context.stackHeight() == sizeOnStack(_givenTypes), ""); return; } @@ -302,7 +302,7 @@ void CompilerUtils::encodeToMemory( popStackSlots(argSize + dynPointers + 1); } -void CompilerUtils::abiEncode( +void CompilerUtils::abiEncodeV2( TypePointers const& _givenTypes, TypePointers const& _targetTypes, bool _encodeAsLibraryTypes |