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

Fix for inlining inside conditions.

Browse Source
This commit is contained in:
chriseth 2018-09-25 16:29:08 +02:00
parent ba62831143
commit d5cd02b8ed
2 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjulia/optimiser/FullInliner.cpp
View File

@ -89,6 +89,9 @@ void InlineModifier::operator()(ForLoop& _loop)
void InlineModifier::operator()(Block& _block)
{
vector<Statement> saved;
saved.swap(m_statementsToPrefix);
// This is only used if needed to minimize the number of move operations.
vector<Statement> modifiedStatements;
for (size_t i = 0; i < _block.statements.size(); ++i)
@ -110,6 +113,8 @@ void InlineModifier::operator()(Block& _block)
}
if (!modifiedStatements.empty())
_block.statements = std::move(modifiedStatements);
saved.swap(m_statementsToPrefix);
}
void InlineModifier::visit(Expression& _expression)

60
test/libjulia/Inliner.cpp
View File

@ -344,37 +344,37 @@ BOOST_AUTO_TEST_CASE(pop_result)
BOOST_AUTO_TEST_CASE(inside_condition)
{
// This tests that breaking the expresison inside the condition works properly.
// This tests that breaking the expression inside the condition works properly.
BOOST_CHECK_EQUAL(
fullInline(R"({
if gt(f(mload(1)), mload(0)) {
sstore(0, 2)
}
function f(a) -> r {
a := mload(a)
r := add(a, calldatasize())
}
})", false),
format(R"({
{
let _1 := mload(0)
let f_a := mload(1)
let f_r
{
f_a := mload(f_a)
f_r := add(f_a, calldatasize())
}
if gt(f_r, _1)
{
sstore(0, 2)
}
}
function f(a) -> r
{
a := mload(a)
r := add(a, calldatasize())
}
})", false)
fullInline("{"
"if gt(f(mload(1)), mload(0)) {"
"sstore(0, 2)"
"}"
"function f(a) -> r {"
"a := mload(a)"
"r := add(a, calldatasize())"
"}"
"}", false),
format("{"
"{"
"let _1 := mload(0)"
"let f_a := mload(1)"
"let f_r"
"{"
"f_a := mload(f_a)"
"f_r := add(f_a, calldatasize())"
"}"
"if gt(f_r, _1)"
"{"
"sstore(0, 2)"
"}"
"}"
"function f(a) -> r"
"{"
"a := mload(a)"
"r := add(a, calldatasize())"
"}"
"}", false)
);
}