diff options
| author | liangdzou <liang.d.zou@gmail.com> | 2018-09-25 10:47:25 +0800 |
|---|---|---|
| committer | chriseth <chris@ethereum.org> | 2018-12-10 21:28:56 +0800 |
| commit | 362648a45042d74da4e631520c0be581902c871b (patch) | |
| tree | a7f9d5df94b4d9ac8cbbc89e99c6d74d8d080732 /libsolidity/interface | |
| parent | 6240d9e72a6f1696d7c37facf805af6ce2352ab2 (diff) | |
| download | dexon-solidity-362648a45042d74da4e631520c0be581902c871b.tar.gz dexon-solidity-362648a45042d74da4e631520c0be581902c871b.tar.zst dexon-solidity-362648a45042d74da4e631520c0be581902c871b.zip | |
Reuse stack slots in Yul to EVM code generation.
Diffstat (limited to 'libsolidity/interface')
| -rw-r--r-- | libsolidity/interface/AssemblyStack.cpp | 6 | ||||
| -rw-r--r-- | libsolidity/interface/AssemblyStack.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libsolidity/interface/AssemblyStack.cpp b/libsolidity/interface/AssemblyStack.cpp index fbfb3472..5952d914 100644 --- a/libsolidity/interface/AssemblyStack.cpp +++ b/libsolidity/interface/AssemblyStack.cpp @@ -122,7 +122,7 @@ void AssemblyStack::optimize(yul::Object& _object) yul::OptimiserSuite::run(*_object.code, *_object.analysisInfo); } -MachineAssemblyObject AssemblyStack::assemble(Machine _machine) const +MachineAssemblyObject AssemblyStack::assemble(Machine _machine, bool _optimize) const { solAssert(m_analysisSuccessful, ""); solAssert(m_parserResult, ""); @@ -136,7 +136,7 @@ MachineAssemblyObject AssemblyStack::assemble(Machine _machine) const MachineAssemblyObject object; eth::Assembly assembly; EthAssemblyAdapter adapter(assembly); - yul::EVMObjectCompiler::compile(*m_parserResult, adapter, m_language == Language::Yul, false); + yul::EVMObjectCompiler::compile(*m_parserResult, adapter, m_language == Language::Yul, false, _optimize); object.bytecode = make_shared<eth::LinkerObject>(assembly.assemble()); object.assembly = assembly.assemblyString(); return object; @@ -145,7 +145,7 @@ MachineAssemblyObject AssemblyStack::assemble(Machine _machine) const { MachineAssemblyObject object; yul::EVMAssembly assembly(true); - yul::EVMObjectCompiler::compile(*m_parserResult, assembly, m_language == Language::Yul, true); + yul::EVMObjectCompiler::compile(*m_parserResult, assembly, m_language == Language::Yul, true, _optimize); object.bytecode = make_shared<eth::LinkerObject>(assembly.finalize()); /// TODO: fill out text representation return object; diff --git a/libsolidity/interface/AssemblyStack.h b/libsolidity/interface/AssemblyStack.h index 485ec1e7..6cfefcd8 100644 --- a/libsolidity/interface/AssemblyStack.h +++ b/libsolidity/interface/AssemblyStack.h @@ -73,7 +73,8 @@ public: void optimize(); /// Run the assembly step (should only be called after parseAndAnalyze). - MachineAssemblyObject assemble(Machine _machine) const; + /// @param _optimize does not run the optimizer but performs optimized code generation. + MachineAssemblyObject assemble(Machine _machine, bool _optimize = false) const; /// @returns the errors generated during parsing, analysis (and potentially assembly). langutil::ErrorList const& errors() const { return m_errors; } |