Merge pull request #5128 from ethereum/breakUnbreak

[Yul] Test case that shows that break / unbreak are more or less inverse

4 files changed, 74 insertions, 5 deletions

diff --git a/test/libyul/YulOptimizerTest.cpp b/test/libyul/YulOptimizerTest.cpp
index 38390035..162b167c 100644
--- a/test/libyul/YulOptimizerTest.cpp
+++ b/test/libyul/YulOptimizerTest.cpp
@@ -120,6 +120,19 @@ bool YulOptimizerTest::run(ostream& _stream, string const& _linePrefix, bool con
 		NameDispenser nameDispenser(*m_ast);
 		ExpressionSplitter{nameDispenser}(*m_ast);
 	}
+	else if (m_optimizerStep == "expressionJoiner")
+	{
+		disambiguate();
+		ExpressionJoiner::run(*m_ast);
+	}
+	else if (m_optimizerStep == "splitJoin")
+	{
+		disambiguate();
+		NameDispenser nameDispenser(*m_ast);
+		ExpressionSplitter{nameDispenser}(*m_ast);
+		ExpressionJoiner::run(*m_ast);
+		ExpressionJoiner::run(*m_ast);
+	}
 	else if (m_optimizerStep == "functionGrouper")
 	{
 		disambiguate();
@@ -177,11 +190,6 @@ bool YulOptimizerTest::run(ostream& _stream, string const& _linePrefix, bool con
 		disambiguate();
 		UnusedPruner::runUntilStabilised(*m_ast);
 	}
-	else if (m_optimizerStep == "expressionJoiner")
-	{
-		disambiguate();
-		ExpressionJoiner::run(*m_ast);\
-	}
 	else if (m_optimizerStep == "ssaTransform")
 	{
 		disambiguate();
diff --git a/test/libyul/yulOptimizerTests/splitJoin/control_flow.yul b/test/libyul/yulOptimizerTests/splitJoin/control_flow.yul
new file mode 100644
index 00000000..ad609c74
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/splitJoin/control_flow.yul
@@ -0,0 +1,26 @@
+{
+    if mul(add(calldataload(0), 2), 3) {
+        for { let a := 2 } lt(a, mload(a)) { a := add(a, mul(a, 2)) } {
+            let b := mul(add(a, 2), 4)
+            sstore(b, mul(b, 2))
+        }
+    }
+}
+// ----
+// splitJoin
+// {
+//     if mul(add(calldataload(0), 2), 3)
+//     {
+//         for {
+//             let a := 2
+//         }
+//         lt(a, mload(a))
+//         {
+//             a := add(a, mul(a, 2))
+//         }
+//         {
+//             let b := mul(add(a, 2), 4)
+//             sstore(b, mul(b, 2))
+//         }
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/splitJoin/functions.yul b/test/libyul/yulOptimizerTests/splitJoin/functions.yul
new file mode 100644
index 00000000..549fc550
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/splitJoin/functions.yul
@@ -0,0 +1,30 @@
+{
+    let x := f(0)
+    function f(y) -> r {
+        r := mload(mul(6, add(y, 0x20)))
+    }
+    for { let a := 2 } lt(a, mload(a)) { a := add(a, mul(a, 2)) } {
+        let b := mul(add(a, f(a)), 4)
+        sstore(b, mul(b, 2))
+    }
+}
+// ----
+// splitJoin
+// {
+//     let x := f(0)
+//     function f(y) -> r
+//     {
+//         r := mload(mul(6, add(y, 0x20)))
+//     }
+//     for {
+//         let a := 2
+//     }
+//     lt(a, mload(a))
+//     {
+//         a := add(a, mul(a, 2))
+//     }
+//     {
+//         let b := mul(add(a, f(a)), 4)
+//         sstore(b, mul(b, 2))
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/splitJoin/smoke.yul b/test/libyul/yulOptimizerTests/splitJoin/smoke.yul
new file mode 100644
index 00000000..4b133029
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/splitJoin/smoke.yul
@@ -0,0 +1,5 @@
+{}
+// ----
+// splitJoin
+// {
+// }