diff options
| author | chriseth <chris@ethereum.org> | 2018-12-04 22:55:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-04 22:55:53 +0800 |
| commit | 8b38cf3ed43d17a7d80a45237f1ec5b538af55b3 (patch) | |
| tree | c6a34c4f194a088f749aec0e875f15f4cd05fc61 /libsolidity/interface/AssemblyStack.cpp | |
| parent | 126ed2e990280b7200a7872d8d6f5b8db14e4b0a (diff) | |
| parent | 7ee1ddc172a29ed1ccdd545a996d19f4c2a145a3 (diff) | |
| download | dexon-solidity-8b38cf3ed43d17a7d80a45237f1ec5b538af55b3.tar dexon-solidity-8b38cf3ed43d17a7d80a45237f1ec5b538af55b3.tar.gz dexon-solidity-8b38cf3ed43d17a7d80a45237f1ec5b538af55b3.tar.bz2 dexon-solidity-8b38cf3ed43d17a7d80a45237f1ec5b538af55b3.tar.lz dexon-solidity-8b38cf3ed43d17a7d80a45237f1ec5b538af55b3.tar.xz dexon-solidity-8b38cf3ed43d17a7d80a45237f1ec5b538af55b3.tar.zst dexon-solidity-8b38cf3ed43d17a7d80a45237f1ec5b538af55b3.zip | |
Merge pull request #5586 from ethereum/refactorEVMAssembly
Refactor evm assembly
Diffstat (limited to 'libsolidity/interface/AssemblyStack.cpp')
| -rw-r--r-- | libsolidity/interface/AssemblyStack.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libsolidity/interface/AssemblyStack.cpp b/libsolidity/interface/AssemblyStack.cpp index ff345089..c15a192a 100644 --- a/libsolidity/interface/AssemblyStack.cpp +++ b/libsolidity/interface/AssemblyStack.cpp @@ -22,12 +22,13 @@ #include <libsolidity/interface/AssemblyStack.h> +#include <libsolidity/codegen/AsmCodeGen.h> + #include <liblangutil/Scanner.h> #include <libyul/AsmPrinter.h> #include <libyul/AsmParser.h> #include <libyul/AsmAnalysis.h> #include <libyul/AsmAnalysisInfo.h> -#include <libyul/AsmCodeGen.h> #include <libyul/backends/evm/EVMCodeTransform.h> #include <libyul/backends/evm/EVMAssembly.h> #include <libyul/ObjectParser.h> @@ -111,7 +112,7 @@ MachineAssemblyObject AssemblyStack::assemble(Machine _machine) const { MachineAssemblyObject object; eth::Assembly assembly; - yul::CodeGenerator::assemble(*m_parserResult->code, *m_parserResult->analysisInfo, assembly); + CodeGenerator::assemble(*m_parserResult->code, *m_parserResult->analysisInfo, assembly); object.bytecode = make_shared<eth::LinkerObject>(assembly.assemble()); object.assembly = assembly.assemblyString(); return object; |