Make optimiser settings available to assembly stack.

libyul/AssemblyStack.h

@@ -27,6 +27,8 @@
 #include <libyul/Object.h>
 #include <libyul/ObjectParser.h>
 
+#include <libsolidity/interface/OptimiserSettings.h>
+
 #include <libevmasm/LinkerObject.h>
 
 #include <memory>
@@ -58,8 +60,14 @@ public:
 	enum class Language { Yul, Assembly, StrictAssembly };
 	enum class Machine { EVM, EVM15, eWasm };
 
-	explicit AssemblyStack(langutil::EVMVersion _evmVersion = langutil::EVMVersion(), Language _language = Language::Assembly):
-		m_language(_language), m_evmVersion(_evmVersion), m_errorReporter(m_errors)
+	AssemblyStack():
+		AssemblyStack(langutil::EVMVersion{}, Language::Assembly, dev::solidity::OptimiserSettings::none())
+	{}
+	AssemblyStack(langutil::EVMVersion _evmVersion, Language _language, dev::solidity::OptimiserSettings _optimiserSettings):
+		m_language(_language),
+		m_evmVersion(_evmVersion),
+		m_optimiserSettings(std::move(_optimiserSettings)),
+		m_errorReporter(m_errors)
 	{}
 
 	/// @returns the scanner used during parsing
@@ -70,11 +78,11 @@ public:
 	bool parseAndAnalyze(std::string const& _sourceName, std::string const& _source);
 
 	/// Run the optimizer suite. Can only be used with Yul or strict assembly.
+	/// If the settings (see constructor) disabled the optimizer, nothing is done here.
 	void optimize();
 
 	/// Run the assembly step (should only be called after parseAndAnalyze).
-	/// @param _optimize does not run the optimizer but performs optimized code generation.
-	MachineAssemblyObject assemble(Machine _machine, bool _optimize) const;
+	MachineAssemblyObject assemble(Machine _machine) const;
 
 	/// @returns the errors generated during parsing, analysis (and potentially assembly).
 	langutil::ErrorList const& errors() const { return m_errors; }
@@ -95,6 +103,7 @@ private:
 
 	Language m_language = Language::Assembly;
 	langutil::EVMVersion m_evmVersion;
+	dev::solidity::OptimiserSettings m_optimiserSettings;
 
 	std::shared_ptr<langutil::Scanner> m_scanner;