Skip to content

[Yul] Proper recursion in ForLoopInitRewriter. #5585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chriseth merged 1 commit into from
Dec 4, 2018
Merged

[Yul] Proper recursion in ForLoopInitRewriter. #5585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions libyul/optimiser/ForLoopInitRewriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,24 @@ void ForLoopInitRewriter::operator()(Block& _block)
{
iterateReplacing(
_block.statements,
[](Statement& _stmt) -> boost::optional<vector<Statement>>
[&](Statement& _stmt) -> boost::optional<vector<Statement>>
{
if (_stmt.type() == typeid(ForLoop))
{
auto& forLoop = boost::get<ForLoop>(_stmt);
(*this)(forLoop.pre);
(*this)(forLoop.body);
(*this)(forLoop.post);
vector<Statement> rewrite;
swap(rewrite, forLoop.pre.statements);
rewrite.emplace_back(move(forLoop));
return rewrite;
}
return {};
else
{
visit(_stmt);
return {};
}
}
);
}
48 changes: 48 additions & 0 deletions test/libyul/yulOptimizerTests/forLoopInitRewriter/nested.yul
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
let random := 42
for {
for { let a := 1} iszero(eq(a,10)) {} {
a := add(a, 1)
}
let b := 1
} iszero(eq(b, 10)) {
for { let c := 1 } iszero(eq(c,2)) { c := add(c, 1) } {
b := add(b, 1)
}
} {
mstore(b,b)
}
}
// ----
// forLoopInitRewriter
// {
// let random := 42
// let a := 1
// for {
// }
// iszero(eq(a, 10))
// {
// }
// {
// a := add(a, 1)
// }
// let b := 1
// for {
// }
// iszero(eq(b, 10))
// {
// let c := 1
// for {
// }
// iszero(eq(c, 2))
// {
// c := add(c, 1)
// }
// {
// b := add(b, 1)
// }
// }
// {
// mstore(b, b)
// }
// }
10 changes: 5 additions & 5 deletions test/libyul/yulOptimizerTests/fullSuite/abi_example1.yul
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,8 +468,8 @@
// let abi_encode_pos_590 := 64
// abi_encode_pos := abi_encode_pos_590
// let abi_encode_srcPtr := add(_485, _1)
// let abi_encode_i_69 := _2
// for {
// let abi_encode_i_69 := _2
// }
// lt(abi_encode_i_69, abi_encode_length_68)
// {
Expand All @@ -480,8 +480,8 @@
// let abi_encode_pos_71_1037 := abi_encode_pos
// let abi_encode_length_72_1038 := 0x3
// let abi_encode_srcPtr_73_1039 := _931
// let abi_encode_i_74_1040 := _2
// for {
// let abi_encode_i_74_1040 := _2
// }
// lt(abi_encode_i_74_1040, abi_encode_length_72_1038)
// {
Expand Down Expand Up @@ -544,8 +544,8 @@
// {
// revert(_2, _2)
// }
// let abi_decode_i_33_1052 := _2
// for {
// let abi_decode_i_33_1052 := _2
// }
// lt(abi_decode_i_33_1052, abi_decode_length_30_1046)
// {
Expand Down Expand Up @@ -586,8 +586,8 @@
// {
// revert(_2, _2)
// }
// let abi_decode_i_9_1068 := _2
// for {
// let abi_decode_i_9_1068 := _2
// }
// lt(abi_decode_i_9_1068, abi_decode_length_6_1058)
// {
Expand Down Expand Up @@ -616,8 +616,8 @@
// {
// revert(_2, _2)
// }
// let abi_decode_abi_decode_i_17_1073 := _2
// for {
// let abi_decode_abi_decode_i_17_1073 := _2
// }
// lt(abi_decode_abi_decode_i_17_1073, abi_decode_abi_decode_length_14_1069)
// {
Expand Down