Skip to content

Commit a3ad63e

Browse files
bshastrycameel
authored andcommitted
Add missing optimizer dependencies for fullSimplify and loadResolver tests and update tests.
1 parent f8282a6 commit a3ad63e

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

test/libyul/YulOptimizerTestCommon.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,8 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
194194
}},
195195
{"fullSimplify", [&]() {
196196
disambiguate();
197+
FunctionGrouper::run(*m_context, *m_ast);
198+
BlockFlattener::run(*m_context, *m_ast);
197199
ExpressionSplitter::run(*m_context, *m_ast);
198200
ForLoopInitRewriter::run(*m_context, *m_ast);
199201
FunctionHoister::run(*m_context, *m_ast);
@@ -259,6 +261,8 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
259261
}},
260262
{"loadResolver", [&]() {
261263
disambiguate();
264+
FunctionGrouper::run(*m_context, *m_ast);
265+
BlockFlattener::run(*m_context, *m_ast);
262266
ForLoopInitRewriter::run(*m_context, *m_ast);
263267
FunctionHoister::run(*m_context, *m_ast);
264268
ExpressionSplitter::run(*m_context, *m_ast);

test/libyul/yulOptimizerTests/fullSimplify/scoped_var_ref_in_function_call.yul

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@
1212
// {
1313
// {
1414
// let x_1
15-
// {
16-
// let _2 := calldataload(x_1)
17-
// let _3 := 1
18-
// x_1 := add(_3, _2)
19-
// }
20-
// let _4 := 1
21-
// pop(call(2, 0, _4, addmod(_3, _2, 8), _4, _4, _4))
15+
// let _2 := calldataload(x_1)
16+
// let _3 := 1
17+
// x_1 := add(_3, _2)
18+
// pop(call(2, 0, _3, addmod(_3, _2, 8), _3, _3, _3))
2219
// }
2320
// }

test/libyul/yulOptimizerTests/loadResolver/scoped_var_ref_in_keccak.yul

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@
1212
// {
1313
// {
1414
// let x
15-
// {
16-
// let y := msize()
17-
// let _1 := 4
18-
// x := add(_1, y)
19-
// }
15+
// let y := msize()
16+
// let _1 := 4
17+
// x := add(_1, y)
2018
// x := keccak256(0, addmod(_1, y, 2))
2119
// }
2220
// }

0 commit comments

Comments
 (0)