diff options
| author | chriseth <chris@ethereum.org> | 2018-12-20 01:06:13 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-20 01:06:13 +0800 |
| commit | 1df8f40cd2fd7b47698d847907b8ca7b47eb488d (patch) | |
| tree | 5ed5816fe2d1a8a207e750d39884aca7957c8289 /libsolidity/interface/AssemblyStack.h | |
| parent | c8a2cb62832afb2dc09ccee6fd42c1516dfdb981 (diff) | |
| parent | ddf54b21d1d002903624f61173ab4af197f50053 (diff) | |
| download | dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.gz dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.bz2 dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.lz dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.xz dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.tar.zst dexon-solidity-1df8f40cd2fd7b47698d847907b8ca7b47eb488d.zip | |
Merge pull request #5697 from ethereum/develop
Merge develop into release for 0.5.2
Diffstat (limited to 'libsolidity/interface/AssemblyStack.h')
| -rw-r--r-- | libsolidity/interface/AssemblyStack.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/libsolidity/interface/AssemblyStack.h b/libsolidity/interface/AssemblyStack.h index 0d04ffec..01db6b61 100644 --- a/libsolidity/interface/AssemblyStack.h +++ b/libsolidity/interface/AssemblyStack.h @@ -29,13 +29,17 @@ #include <libevmasm/LinkerObject.h> -#include <string> #include <memory> +#include <string> namespace langutil { class Scanner; } +namespace yul +{ +class AbstractAssembly; +} namespace dev { @@ -73,7 +77,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; } @@ -83,6 +88,11 @@ public: private: bool analyzeParsed(); + bool analyzeParsed(yul::Object& _object); + + void compileEVM(yul::AbstractAssembly& _assembly, bool _evm15, bool _optimize) const; + + void optimize(yul::Object& _object); Language m_language = Language::Assembly; EVMVersion m_evmVersion; |