diff options
| author | Lefteris Karapetsas <lefteris@refu.co> | 2015-03-07 00:20:00 +0800 |
|---|---|---|
| committer | Lefteris Karapetsas <lefteris@refu.co> | 2015-03-12 19:53:00 +0800 |
| commit | 3ca37cadddf4f58cef5273c6b49e0f55c1162251 (patch) | |
| tree | 1147f0f7d00ec34b8099016ff180c5c5f6722087 /CompilerUtils.cpp | |
| parent | 7d7f37bd5e1221243729edbd6ef8d19fd2ce13eb (diff) | |
| download | dexon-solidity-3ca37cadddf4f58cef5273c6b49e0f55c1162251.tar dexon-solidity-3ca37cadddf4f58cef5273c6b49e0f55c1162251.tar.gz dexon-solidity-3ca37cadddf4f58cef5273c6b49e0f55c1162251.tar.bz2 dexon-solidity-3ca37cadddf4f58cef5273c6b49e0f55c1162251.tar.lz dexon-solidity-3ca37cadddf4f58cef5273c6b49e0f55c1162251.tar.xz dexon-solidity-3ca37cadddf4f58cef5273c6b49e0f55c1162251.tar.zst dexon-solidity-3ca37cadddf4f58cef5273c6b49e0f55c1162251.zip | |
Fixes after rebasing on top of develop
Diffstat (limited to 'CompilerUtils.cpp')
| -rw-r--r-- | CompilerUtils.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/CompilerUtils.cpp b/CompilerUtils.cpp index e11b6b4f..7b078e03 100644 --- a/CompilerUtils.cpp +++ b/CompilerUtils.cpp @@ -177,8 +177,7 @@ void CompilerUtils::computeHashStatic(Type const& _type, bool _padToWordBoundari unsigned CompilerUtils::loadFromMemoryHelper(Type const& _type, bool _fromCalldata, bool _padToWordBoundaries) { - unsigned _encodedSize = _type.getCalldataEncodedSize(); - unsigned numBytes = _padToWordBoundaries ? getPaddedSize(_encodedSize) : _encodedSize; + unsigned numBytes = _type.getCalldataEncodedSize(_padToWordBoundaries); bool leftAligned = _type.getCategory() == Type::Category::FixedBytes; if (numBytes == 0) m_context << eth::Instruction::POP << u256(0); |