cerc-io/solidity
16
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

LLL: Fix msg macro with six arguments.

Browse Source 
The previous macro used the set built-in in a way incompatible with the current
implementation of set. This commit updates the macro to be more transparent in how it's
working and avoids the use of the set and alloc built-ins.
This commit is contained in:
benjaminion 2017-06-22 13:18:54 +01:00
parent f823952d9f
commit 0175008ffa
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
liblll/CompilerState.cpp
View File

@ -49,7 +49,8 @@ void CompilerState::populateStandard()
"(def 'allgas (- (gas) 21))"
"(def 'send (to value) (call allgas to value 0 0 0 0))"
"(def 'send (gaslimit to value) (call gaslimit to value 0 0 0 0))"
"(def 'msg (gaslimit to value data datasize outsize) { (set x outsize) (set y (alloc @32)) (call gaslimit to value data datasize @0 @32) @0 })"
// NOTE: in this macro, memory location 0 is set in order to force msize to be at least 32 bytes.
"(def 'msg (gaslimit to value data datasize outsize) { [0]:0 [0]:(msize) (call gaslimit to value data datasize @0 outsize) @0 })"
"(def 'msg (gaslimit to value data datasize) { (call gaslimit to value data datasize 0 32) @0 })"
"(def 'msg (gaslimit to value data) { [0]:data (msg gaslimit to value 0 32) })"
"(def 'msg (to value data) { [0]:data (msg allgas to value 0 32) })"

17
test/liblll/EndToEndTest.cpp
View File

@ -366,6 +366,23 @@ BOOST_AUTO_TEST_CASE(keccak256_32bytes)
fromHex("b10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6")));
}
BOOST_AUTO_TEST_CASE(msg_six_args)
{
char const* sourceCode = R"(
(returnlll
(seq
(when (= 0 (calldatasize))
(seq
(mstore 0x40 1)
(def 'outsize 0x20)
(return (msg 1000 (address) 42 0x40 0x20 outsize) outsize)))
(when (= 1 (calldataload 0x00))
(return (callvalue)))))
)";
compileAndRun(sourceCode);
BOOST_CHECK(callFallbackWithValue(42) == encodeArgs(u256(42)));
}
BOOST_AUTO_TEST_CASE(create_1_arg)
{
char const* sourceCode = R"(