cerc-io/solidity
11
0 Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7650 from ethereum/develop

Browse Source 
Merge develop into develop_060
This commit is contained in:
chriseth authored and GitHub committed 2019-11-06 21:56:55 +01:00
2 parents d4354a47b7 efeee15d32
commit 21e65076b3
30 files changed
+1081 -135
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libyul/AssemblyStack.cpp
+4 -1
View File
@@ -202,7 +202,10 @@ MachineAssemblyObject AssemblyStack::assemble(Machine _machine) const
Dialect const& dialect = languageToDialect(m_language, EVMVersion{});
MachineAssemblyObject object;
object.assembly = EWasmObjectCompiler::compile(*m_parserResult, dialect);
auto result = EWasmObjectCompiler::compile(*m_parserResult, dialect);
object.assembly = std::move(result.first);
object.bytecode = make_shared<dev::eth::LinkerObject>();
object.bytecode->bytecode = std::move(result.second);
return object;
}
}