diff options
| author | chriseth <chris@ethereum.org> | 2018-08-07 19:00:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-07 19:00:34 +0800 |
| commit | c6278fbae1e1dac33ebfad7e8d42e071c9e78914 (patch) | |
| tree | d6772c27c34253ff8fc249eb1fc18f1ec2b49a4d /libsolidity/interface/CompilerStack.cpp | |
| parent | d0bfe4b2254a9fa30429215fba8cd7e47db7a3b0 (diff) | |
| parent | 71e26f6adb7d6b28400a6607570bb1e17da24feb (diff) | |
| download | dexon-solidity-c6278fbae1e1dac33ebfad7e8d42e071c9e78914.tar dexon-solidity-c6278fbae1e1dac33ebfad7e8d42e071c9e78914.tar.gz dexon-solidity-c6278fbae1e1dac33ebfad7e8d42e071c9e78914.tar.bz2 dexon-solidity-c6278fbae1e1dac33ebfad7e8d42e071c9e78914.tar.lz dexon-solidity-c6278fbae1e1dac33ebfad7e8d42e071c9e78914.tar.xz dexon-solidity-c6278fbae1e1dac33ebfad7e8d42e071c9e78914.tar.zst dexon-solidity-c6278fbae1e1dac33ebfad7e8d42e071c9e78914.zip | |
Merge pull request #4701 from ethereum/removeClone
Remove clone feature.
Diffstat (limited to 'libsolidity/interface/CompilerStack.cpp')
| -rw-r--r-- | libsolidity/interface/CompilerStack.cpp | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp index 32cb488f..29f9ce7d 100644 --- a/libsolidity/interface/CompilerStack.cpp +++ b/libsolidity/interface/CompilerStack.cpp @@ -329,7 +329,6 @@ void CompilerStack::link() { contract.second.object.link(m_libraries); contract.second.runtimeObject.link(m_libraries); - contract.second.cloneObject.link(m_libraries); } } @@ -408,11 +407,6 @@ eth::LinkerObject const& CompilerStack::runtimeObject(string const& _contractNam return contract(_contractName).runtimeObject; } -eth::LinkerObject const& CompilerStack::cloneObject(string const& _contractName) const -{ - return contract(_contractName).cloneObject; -} - /// FIXME: cache this string string CompilerStack::assemblyString(string const& _contractName, StringMap _sourceCodes) const { @@ -767,23 +761,6 @@ void CompilerStack::compileContract( } _compiledContracts[compiledContract.contract] = &compiler->assembly(); - - try - { - if (!_contract.isLibrary()) - { - Compiler cloneCompiler(m_evmVersion, m_optimize, m_optimizeRuns); - cloneCompiler.compileClone(_contract, _compiledContracts); - compiledContract.cloneObject = cloneCompiler.assembledObject(); - } - } - catch (eth::AssemblyException const&) - { - // In some cases (if the constructor requests a runtime function), it is not - // possible to compile the clone. - - // TODO: Report error / warning - } } string const CompilerStack::lastContractName() const |