From f08ab772499923ccea29806525c7f2589bc5b343 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Wed, 17 Oct 2018 11:33:35 +0200
Subject: Yul: Implements empty-var-decl-propagation

---
 test/libyul/YulOptimizerTest.cpp                        |  6 ++++++
 .../varDeclPropagator/init_assignment_inside_if.yul     | 17 +++++++++++++++++
 .../varDeclPropagator/multi_assignment_vardecl.yul      | 13 +++++++++++++
 .../yulOptimizerTests/varDeclPropagator/overwrite.yul   | 11 +++++++++++
 .../varDeclPropagator/rewrite_removes_unused_var.yul    | 10 ++++++++++
 .../yulOptimizerTests/varDeclPropagator/simple1.yul     |  9 +++++++++
 .../varDeclPropagator/split_assign_splits_vardecl.yul   | 11 +++++++++++
 .../varDeclPropagator/use_before_init.yul               | 12 ++++++++++++
 .../varDeclPropagator/use_doesnt_rewrite.yul            | 16 ++++++++++++++++
 9 files changed, 105 insertions(+)
 create mode 100644 test/libyul/yulOptimizerTests/varDeclPropagator/init_assignment_inside_if.yul
 create mode 100644 test/libyul/yulOptimizerTests/varDeclPropagator/multi_assignment_vardecl.yul
 create mode 100644 test/libyul/yulOptimizerTests/varDeclPropagator/overwrite.yul
 create mode 100644 test/libyul/yulOptimizerTests/varDeclPropagator/rewrite_removes_unused_var.yul
 create mode 100644 test/libyul/yulOptimizerTests/varDeclPropagator/simple1.yul
 create mode 100644 test/libyul/yulOptimizerTests/varDeclPropagator/split_assign_splits_vardecl.yul
 create mode 100644 test/libyul/yulOptimizerTests/varDeclPropagator/use_before_init.yul
 create mode 100644 test/libyul/yulOptimizerTests/varDeclPropagator/use_doesnt_rewrite.yul

(limited to 'test/libyul')

diff --git a/test/libyul/YulOptimizerTest.cpp b/test/libyul/YulOptimizerTest.cpp
index 0378764d..d455c892 100644
--- a/test/libyul/YulOptimizerTest.cpp
+++ b/test/libyul/YulOptimizerTest.cpp
@@ -22,6 +22,7 @@
 #include <test/Options.h>
 
 #include <libyul/optimiser/BlockFlattener.h>
+#include <libyul/optimiser/VarDeclPropagator.h>
 #include <libyul/optimiser/Disambiguator.h>
 #include <libyul/optimiser/CommonSubexpressionEliminator.h>
 #include <libyul/optimiser/NameCollector.h>
@@ -102,6 +103,11 @@ bool YulOptimizerTest::run(ostream& _stream, string const& _linePrefix, bool con
 		disambiguate();
 		BlockFlattener{}(*m_ast);
 	}
+	else if (m_optimizerStep == "varDeclPropagator")
+	{
+		disambiguate();
+		VarDeclPropagator{}(*m_ast);
+	}
 	else if (m_optimizerStep == "commonSubexpressionEliminator")
 	{
 		disambiguate();
diff --git a/test/libyul/yulOptimizerTests/varDeclPropagator/init_assignment_inside_if.yul b/test/libyul/yulOptimizerTests/varDeclPropagator/init_assignment_inside_if.yul
new file mode 100644
index 00000000..54fea2fb
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/varDeclPropagator/init_assignment_inside_if.yul
@@ -0,0 +1,17 @@
+{
+  let a := 4
+  let x
+  if a {
+    x := 2
+  }
+}
+// ----
+// varDeclPropagator
+// {
+//     let a := 4
+//     let x
+//     if a
+//     {
+//         x := 2
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/varDeclPropagator/multi_assignment_vardecl.yul b/test/libyul/yulOptimizerTests/varDeclPropagator/multi_assignment_vardecl.yul
new file mode 100644
index 00000000..4ac07031
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/varDeclPropagator/multi_assignment_vardecl.yul
@@ -0,0 +1,13 @@
+{
+  function f() -> a, b, c {}
+  let x, y, z 
+  z, x, y := f()
+}
+// ----
+// varDeclPropagator
+// {
+//     function f() -> a, b, c
+//     {
+//     }
+//     let z, x, y := f()
+// }
diff --git a/test/libyul/yulOptimizerTests/varDeclPropagator/overwrite.yul b/test/libyul/yulOptimizerTests/varDeclPropagator/overwrite.yul
new file mode 100644
index 00000000..ca921500
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/varDeclPropagator/overwrite.yul
@@ -0,0 +1,11 @@
+{
+  let a
+  a := 4
+  a := 5
+}
+// ----
+// varDeclPropagator
+// {
+//     let a := 4
+//     a := 5
+// }
diff --git a/test/libyul/yulOptimizerTests/varDeclPropagator/rewrite_removes_unused_var.yul b/test/libyul/yulOptimizerTests/varDeclPropagator/rewrite_removes_unused_var.yul
new file mode 100644
index 00000000..3affcac6
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/varDeclPropagator/rewrite_removes_unused_var.yul
@@ -0,0 +1,10 @@
+{
+  let a, b
+  a := mload(0)
+}
+// ----
+// varDeclPropagator
+// {
+//     let b
+//     let a := mload(0)
+// }
diff --git a/test/libyul/yulOptimizerTests/varDeclPropagator/simple1.yul b/test/libyul/yulOptimizerTests/varDeclPropagator/simple1.yul
new file mode 100644
index 00000000..117e0cc9
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/varDeclPropagator/simple1.yul
@@ -0,0 +1,9 @@
+{
+  let f 
+  f := mload(0)
+}
+// ----
+// varDeclPropagator
+// {
+//     let f := mload(0)
+// }
diff --git a/test/libyul/yulOptimizerTests/varDeclPropagator/split_assign_splits_vardecl.yul b/test/libyul/yulOptimizerTests/varDeclPropagator/split_assign_splits_vardecl.yul
new file mode 100644
index 00000000..e8c91e10
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/varDeclPropagator/split_assign_splits_vardecl.yul
@@ -0,0 +1,11 @@
+{
+  let a, b
+  a := mload(0)
+  b := mload(1)
+}
+// ----
+// varDeclPropagator
+// {
+//     let a := mload(0)
+//     let b := mload(1)
+// }
diff --git a/test/libyul/yulOptimizerTests/varDeclPropagator/use_before_init.yul b/test/libyul/yulOptimizerTests/varDeclPropagator/use_before_init.yul
new file mode 100644
index 00000000..5312112a
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/varDeclPropagator/use_before_init.yul
@@ -0,0 +1,12 @@
+{
+	let b
+	let a := b
+	b := 1
+}
+// ----
+// varDeclPropagator
+// {
+//     let b
+//     let a := b
+//     b := 1
+// }
diff --git a/test/libyul/yulOptimizerTests/varDeclPropagator/use_doesnt_rewrite.yul b/test/libyul/yulOptimizerTests/varDeclPropagator/use_doesnt_rewrite.yul
new file mode 100644
index 00000000..e27785dd
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/varDeclPropagator/use_doesnt_rewrite.yul
@@ -0,0 +1,16 @@
+{
+  function f(x) {}
+  let a
+  f(a)
+  a := 4
+}
+// ----
+// varDeclPropagator
+// {
+//     function f(x)
+//     {
+//     }
+//     let a
+//     f(a)
+//     a := 4
+// }
-- 
cgit