diff options
| -rw-r--r-- | libjulia/optimiser/FullInliner.cpp | 5 | ||||
| -rw-r--r-- | test/libjulia/Inliner.cpp | 35 |
2 files changed, 40 insertions, 0 deletions
diff --git a/libjulia/optimiser/FullInliner.cpp b/libjulia/optimiser/FullInliner.cpp index e8776e23..f41dc198 100644 --- a/libjulia/optimiser/FullInliner.cpp +++ b/libjulia/optimiser/FullInliner.cpp @@ -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) diff --git a/test/libjulia/Inliner.cpp b/test/libjulia/Inliner.cpp index 43a7d757..d0ecd42f 100644 --- a/test/libjulia/Inliner.cpp +++ b/test/libjulia/Inliner.cpp @@ -342,5 +342,40 @@ BOOST_AUTO_TEST_CASE(pop_result) ); } +BOOST_AUTO_TEST_CASE(inside_condition) +{ + // This tests that breaking the expression inside the condition works properly. + BOOST_CHECK_EQUAL( + 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) + ); +} BOOST_AUTO_TEST_SUITE_END() |