Merge pull request #14597 from ethereum/add-steps-to-full-simplify

Add required steps to fullSimplify step.

Author: bshastry

test/libyul/YulOptimizerTestCommon.cpp

@@ -194,6 +194,8 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 		}},
 		{"fullSimplify", [&]() {
 			disambiguate();
+			FunctionGrouper::run(*m_context, *m_ast);
+			BlockFlattener::run(*m_context, *m_ast);
 			ExpressionSplitter::run(*m_context, *m_ast);
 			ForLoopInitRewriter::run(*m_context, *m_ast);
 			FunctionHoister::run(*m_context, *m_ast);
@@ -259,6 +261,8 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 		}},
 		{"loadResolver", [&]() {
 			disambiguate();
+			FunctionGrouper::run(*m_context, *m_ast);
+			BlockFlattener::run(*m_context, *m_ast);
 			ForLoopInitRewriter::run(*m_context, *m_ast);
 			FunctionHoister::run(*m_context, *m_ast);
 			ExpressionSplitter::run(*m_context, *m_ast);

test/libyul/yulOptimizerTests/fullSimplify/scoped_var_ref_in_function_call.yul

@@ -0,0 +1,20 @@
+{
+    function f(x) {}
+    let x
+    {
+        x := add(1, calldataload(0))
+    }
+    f(call(2, 0, 1, mod(x, 8), 1, 1, 1))
+}
+// ----
+// step: fullSimplify
+//
+// {
+//     {
+//         let x_1
+//         let _2 := calldataload(x_1)
+//         let _3 := 1
+//         x_1 := add(_3, _2)
+//         pop(call(2, 0, _3, addmod(_3, _2, 8), _3, _3, _3))
+//     }
+// }

test/libyul/yulOptimizerTests/loadResolver/scoped_var_ref_in_keccak.yul

@@ -0,0 +1,20 @@
+{
+    let x
+    {
+        let y := msize()
+        x := add(4, y)
+    }
+    x := keccak256(0, mod(x, 2))
+}
+// ----
+// step: loadResolver
+//
+// {
+//     {
+//         let x
+//         let y := msize()
+//         let _1 := 4
+//         x := add(_1, y)
+//         x := keccak256(0, addmod(_1, y, 2))
+//     }
+// }