diff options
| author | chriseth <chris@ethereum.org> | 2018-04-16 21:23:36 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-16 21:23:36 +0800 |
| commit | 3d04d832972cf56555945fe51f9a7eb2fe9c4ac1 (patch) | |
| tree | 67622d6d4ff1a0fc88e66bd930eb875d7e28a127 /libsolidity/codegen/ExpressionCompiler.cpp | |
| parent | 533d08517f37496295e213194b489cd6ed15432b (diff) | |
| parent | a9c16b8c3976dbd2c386586cdf143150a4266ac0 (diff) | |
| download | dexon-solidity-3d04d832972cf56555945fe51f9a7eb2fe9c4ac1.tar dexon-solidity-3d04d832972cf56555945fe51f9a7eb2fe9c4ac1.tar.gz dexon-solidity-3d04d832972cf56555945fe51f9a7eb2fe9c4ac1.tar.bz2 dexon-solidity-3d04d832972cf56555945fe51f9a7eb2fe9c4ac1.tar.lz dexon-solidity-3d04d832972cf56555945fe51f9a7eb2fe9c4ac1.tar.xz dexon-solidity-3d04d832972cf56555945fe51f9a7eb2fe9c4ac1.tar.zst dexon-solidity-3d04d832972cf56555945fe51f9a7eb2fe9c4ac1.zip | |
Merge pull request #3868 from ethereum/bytescleanup
Properly force-clean for shortening bytesXX conversions.
Diffstat (limited to 'libsolidity/codegen/ExpressionCompiler.cpp')
| -rw-r--r-- | libsolidity/codegen/ExpressionCompiler.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp index ed5af42e..3cf46a9d 100644 --- a/libsolidity/codegen/ExpressionCompiler.cpp +++ b/libsolidity/codegen/ExpressionCompiler.cpp @@ -1023,7 +1023,6 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall) solAssert(function.kind() == FunctionType::Kind::ABIEncodeWithSelector, ""); } - // Cleanup actually does not clean on shrinking the type. utils().convertType(*dataOnStack, FixedBytesType(4), true); // stack: <memory pointer> <selector> @@ -1034,7 +1033,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall) let data_start := add(mem_ptr, 0x20) let data := mload(data_start) let mask := )" + mask + R"( - mstore(data_start, or(and(data, mask), and(selector, not(mask)))) + mstore(data_start, or(and(data, mask), selector)) })", {"mem_ptr", "selector"}); m_context << Instruction::POP; } |