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

Merge pull request #2415 from benjaminion/lll-fix-create-macro

Browse Source 
LLL: Fix for edge case in the create macros.
This commit is contained in:
chriseth 2017-06-22 12:33:45 +02:00 committed by GitHub
commit de7a488f82
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
liblll/CompilerState.cpp
View File

@ -54,8 +54,9 @@ void CompilerState::populateStandard()
"(def 'msg (gaslimit to value data) { [0]:data (msg gaslimit to value 0 32) })" "(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) })" "(def 'msg (to value data) { [0]:data (msg allgas to value 0 32) })"
"(def 'msg (to data) { [0]:data (msg allgas to 0 0 32) })" "(def 'msg (to data) { [0]:data (msg allgas to 0 0 32) })"
"(def 'create (value code) { [0]:(msize) (create value @0 (lll code @0)) })" // NOTE: in the create macros, memory location 0 is set in order to force msize to be at least 32 bytes.
"(def 'create (code) { [0]:(msize) (create 0 @0 (lll code @0)) })" "(def 'create (value code) { [0]:0 [0]:(msize) (create value @0 (lll code @0)) })"
"(def 'create (code) { [0]:0 [0]:(msize) (create 0 @0 (lll code @0)) })"
"(def 'sha3 (loc len) (keccak256 loc len))" "(def 'sha3 (loc len) (keccak256 loc len))"
"(def 'sha3 (val) { [0]:val (sha3 0 32) })" "(def 'sha3 (val) { [0]:val (sha3 0 32) })"
"(def 'sha3pair (a b) { [0]:a [32]:b (sha3 0 64) })" "(def 'sha3pair (a b) { [0]:a [32]:b (sha3 0 64) })"

28
test/liblll/EndToEndTest.cpp
View File

@ -366,6 +366,34 @@ BOOST_AUTO_TEST_CASE(keccak256_32bytes)
fromHex("b10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6"))); fromHex("b10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6")));
} }
BOOST_AUTO_TEST_CASE(create_1_arg)
{
char const* sourceCode = R"(
(returnlll
(seq
(call allgas
(create (returnlll (return 42)))
0 0 0 0x00 0x20)
(return 0x00 0x20)))
)";
compileAndRun(sourceCode);
BOOST_CHECK(callFallback() == encodeArgs(u256(42)));
}
BOOST_AUTO_TEST_CASE(create_2_args)
{
char const* sourceCode = R"(
(returnlll
(seq
(call allgas
(create 42 (returnlll (return (balance (address)))))
0 0 0 0x00 0x20)
(return 0x00 0x20)))
)";
compileAndRun(sourceCode);
BOOST_CHECK(callFallbackWithValue(42) == encodeArgs(u256(42)));
}
BOOST_AUTO_TEST_CASE(sha3_two_args) BOOST_AUTO_TEST_CASE(sha3_two_args)
{ {
char const* sourceCode = R"( char const* sourceCode = R"(