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

C++ namespace cleanup (except tests).

Browse Source
This commit is contained in:
Christian Parpart authored and Daniel Kirchner committed 2020-01-07 15:51:50 +01:00
1 parent 8385256bdc
commit 6b23412fae
403 files changed
+1656 -1926
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libyul/AssemblyStack.cpp
+7 -6
View File
@@ -45,8 +45,9 @@
#include <liblangutil/Scanner.h>
using namespace std;
using namespace langutil;
using namespace yul;
using namespace solidity;
using namespace solidity::yul;
using namespace solidity::langutil;
namespace
{
@@ -198,10 +199,10 @@ MachineAssemblyObject AssemblyStack::assemble(Machine _machine) const
case Machine::EVM:
{
MachineAssemblyObject object;
dev::eth::Assembly assembly;
evmasm::Assembly assembly;
EthAssemblyAdapter adapter(assembly);
compileEVM(adapter, false, m_optimiserSettings.optimizeStackAllocation);
object.bytecode = make_shared<dev::eth::LinkerObject>(assembly.assemble());
object.bytecode = make_shared<evmasm::LinkerObject>(assembly.assemble());
object.assembly = assembly.assemblyString();
return object;
}
@@ -210,7 +211,7 @@ MachineAssemblyObject AssemblyStack::assemble(Machine _machine) const
MachineAssemblyObject object;
EVMAssembly assembly(true);
compileEVM(assembly, true, m_optimiserSettings.optimizeStackAllocation);
object.bytecode = make_shared<dev::eth::LinkerObject>(assembly.finalize());
object.bytecode = make_shared<evmasm::LinkerObject>(assembly.finalize());
/// TODO: fill out text representation
return object;
}
@@ -222,7 +223,7 @@ MachineAssemblyObject AssemblyStack::assemble(Machine _machine) const
MachineAssemblyObject object;
auto result = WasmObjectCompiler::compile(*m_parserResult, dialect);
object.assembly = std::move(result.first);
object.bytecode = make_shared<dev::eth::LinkerObject>();
object.bytecode = make_shared<evmasm::LinkerObject>();
object.bytecode->bytecode = std::move(result.second);
return object;
}