Merge pull request #5341 from ethereum/optimizeAssemblyCommandline

Apply the optimize commandline parameter to assembly mode.

2 files changed, 12 insertions, 0 deletions

diff --git a/libsolidity/interface/AssemblyStack.cpp b/libsolidity/interface/AssemblyStack.cpp
index 66ba42ee..f5eb7e41 100644
--- a/libsolidity/interface/AssemblyStack.cpp
+++ b/libsolidity/interface/AssemblyStack.cpp
@@ -34,6 +34,8 @@
 
 #include <libevmasm/Assembly.h>
 
+#include <libyul/optimiser/Suite.h>
+
 using namespace std;
 using namespace dev;
 using namespace langutil;
@@ -79,6 +81,13 @@ bool AssemblyStack::parseAndAnalyze(std::string const& _sourceName, std::string
 	return analyzeParsed();
 }
 
+void AssemblyStack::optimize()
+{
+	solAssert(m_language != Language::Assembly, "Optimization requested for loose assembly.");
+	yul::OptimiserSuite::run(*m_parserResult->code, *m_parserResult->analysisInfo);
+	solAssert(analyzeParsed(), "Invalid source code after optimization.");
+}
+
 bool AssemblyStack::analyzeParsed()
 {
 	solAssert(m_parserResult, "");
diff --git a/libsolidity/interface/AssemblyStack.h b/libsolidity/interface/AssemblyStack.h
index 7ae0592e..0d04ffec 100644
--- a/libsolidity/interface/AssemblyStack.h
+++ b/libsolidity/interface/AssemblyStack.h
@@ -69,6 +69,9 @@ public:
 	/// Multiple calls overwrite the previous state.
 	bool parseAndAnalyze(std::string const& _sourceName, std::string const& _source);
 
+	/// Run the optimizer suite. Can only be used with Yul or strict assembly.
+	void optimize();
+
 	/// Run the assembly step (should only be called after parseAndAnalyze).
 	MachineAssemblyObject assemble(Machine _machine) const;