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 #2462 from ethereum/lll-fix-def

Browse Source 
LLL: fix redefinitions on some compilers
This commit is contained in:
chriseth 2017-06-28 16:32:43 +02:00 committed by GitHub
commit 79d1336687
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
liblll/CodeFragment.cpp
View File

@ -258,7 +258,11 @@ void CodeFragment::constructOperation(sp::utree const& _t, CompilerState& _s)
} }
else if (ii == 2) else if (ii == 2)
if (_t.size() == 3) if (_t.size() == 3)
_s.defs[n] = CodeFragment(i, _s); {
/// NOTE: some compilers could do the assignment first if this is done in a single line
CodeFragment code = CodeFragment(i, _s);
_s.defs[n] = code;
}
else else
for (auto const& j: i) for (auto const& j: i)
{ {

37
test/liblll/EndToEndTest.cpp
View File

@ -57,6 +57,32 @@ BOOST_AUTO_TEST_CASE(panic)
BOOST_REQUIRE(m_output.empty()); BOOST_REQUIRE(m_output.empty());
} }
BOOST_AUTO_TEST_CASE(macro_zeroarg)
{
char const* sourceCode = R"(
(returnlll
(seq
(def 'zeroarg () (seq (mstore 0 0x1234) (return 0 32)))
(zeroarg)))
)";
compileAndRun(sourceCode);
BOOST_CHECK(callFallback() == encodeArgs(u256(0x1234)));
}
BOOST_AUTO_TEST_CASE(macros)
{
char const* sourceCode = R"(
(returnlll
(seq
(def 'x 1)
(def 'y () { (def 'x (+ x 2)) })
(y)
(return x)))
)";
compileAndRun(sourceCode);
BOOST_CHECK(callFallback() == encodeArgs(u256(3)));
}
BOOST_AUTO_TEST_CASE(variables) BOOST_AUTO_TEST_CASE(variables)
{ {
char const* sourceCode = R"( char const* sourceCode = R"(
@ -361,17 +387,6 @@ BOOST_AUTO_TEST_CASE(assembly_codecopy)
BOOST_CHECK(callFallback() == encodeArgs(string("abcdef"))); BOOST_CHECK(callFallback() == encodeArgs(string("abcdef")));
} }
BOOST_AUTO_TEST_CASE(zeroarg_macro)
{
char const* sourceCode = R"(
(returnlll
(seq
(def 'zeroarg () (seq (mstore 0 0x1234) (return 0 32)))
(zeroarg)))
)";
compileAndRun(sourceCode);
BOOST_CHECK(callFallback() == encodeArgs(u256(0x1234)));
}
BOOST_AUTO_TEST_CASE(keccak256_32bytes) BOOST_AUTO_TEST_CASE(keccak256_32bytes)
{ {