diff options
author | chriseth <chris@ethereum.org> | 2016-12-02 18:23:45 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-02 18:23:45 +0800 |
commit | 3a01a87afe3468421f31aa5097796dcc88e37e26 (patch) | |
tree | 9069fcc823ca4b27b6add0c7278f1086923eb36e /libsolidity/codegen/Compiler.cpp | |
parent | 55a719a79c1ab5b78ea6e1bcb4f27a888494a538 (diff) | |
parent | 5098e1eb15678859d1bd5e9172184d6525e03863 (diff) | |
download | dexon-solidity-3a01a87afe3468421f31aa5097796dcc88e37e26.tar dexon-solidity-3a01a87afe3468421f31aa5097796dcc88e37e26.tar.gz dexon-solidity-3a01a87afe3468421f31aa5097796dcc88e37e26.tar.bz2 dexon-solidity-3a01a87afe3468421f31aa5097796dcc88e37e26.tar.lz dexon-solidity-3a01a87afe3468421f31aa5097796dcc88e37e26.tar.xz dexon-solidity-3a01a87afe3468421f31aa5097796dcc88e37e26.tar.zst dexon-solidity-3a01a87afe3468421f31aa5097796dcc88e37e26.zip |
Merge pull request #1386 from ethereum/metadataOut
Metadata stamp
Diffstat (limited to 'libsolidity/codegen/Compiler.cpp')
-rw-r--r-- | libsolidity/codegen/Compiler.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libsolidity/codegen/Compiler.cpp b/libsolidity/codegen/Compiler.cpp index 22d25698..44264a07 100644 --- a/libsolidity/codegen/Compiler.cpp +++ b/libsolidity/codegen/Compiler.cpp @@ -30,11 +30,13 @@ using namespace dev::solidity; void Compiler::compileContract( ContractDefinition const& _contract, - std::map<const ContractDefinition*, eth::Assembly const*> const& _contracts + std::map<const ContractDefinition*, eth::Assembly const*> const& _contracts, + bytes const& _metadata ) { ContractCompiler runtimeCompiler(nullptr, m_runtimeContext, m_optimize); runtimeCompiler.compileContract(_contract, _contracts); + m_runtimeContext.appendAuxiliaryData(_metadata); // This might modify m_runtimeContext because it can access runtime functions at // creation time. @@ -42,12 +44,6 @@ void Compiler::compileContract( m_runtimeSub = creationCompiler.compileConstructor(_contract, _contracts); m_context.optimise(m_optimize, m_optimizeRuns); - - if (_contract.isLibrary()) - { - solAssert(m_runtimeSub != size_t(-1), ""); - m_context.injectVersionStampIntoSub(m_runtimeSub); - } } void Compiler::compileClone( |