aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-12-07 01:07:08 +0800
committerchriseth <chris@ethereum.org>2018-12-12 02:24:31 +0800
commit8d49e539951791a25a63f470e8a9935679c7404f (patch)
tree8dae3a5aa91f78576076aa4af61688cb08574c25 /libsolidity
parent9f86ede32d4aa3e53bf82d0e4c64dbea3661791b (diff)
downloaddexon-solidity-8d49e539951791a25a63f470e8a9935679c7404f.tar.gz
dexon-solidity-8d49e539951791a25a63f470e8a9935679c7404f.tar.zst
dexon-solidity-8d49e539951791a25a63f470e8a9935679c7404f.zip
Provide Dialect to EVMCodeTransform.
Diffstat (limited to 'libsolidity')
-rw-r--r--libsolidity/codegen/AsmCodeGen.cpp2
-rw-r--r--libsolidity/interface/AssemblyStack.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/libsolidity/codegen/AsmCodeGen.cpp b/libsolidity/codegen/AsmCodeGen.cpp
index 3f770f62..45efe55b 100644
--- a/libsolidity/codegen/AsmCodeGen.cpp
+++ b/libsolidity/codegen/AsmCodeGen.cpp
@@ -189,7 +189,7 @@ void CodeGenerator::assemble(
_analysisInfo,
_parsedData,
_optimize,
- false,
+ Dialect::strictAssemblyForEVM(),
false,
_identifierAccess,
_useNamedLabelsForFunctions
diff --git a/libsolidity/interface/AssemblyStack.cpp b/libsolidity/interface/AssemblyStack.cpp
index 5952d914..4af1e23d 100644
--- a/libsolidity/interface/AssemblyStack.cpp
+++ b/libsolidity/interface/AssemblyStack.cpp
@@ -136,7 +136,7 @@ MachineAssemblyObject AssemblyStack::assemble(Machine _machine, bool _optimize)
MachineAssemblyObject object;
eth::Assembly assembly;
EthAssemblyAdapter adapter(assembly);
- yul::EVMObjectCompiler::compile(*m_parserResult, adapter, m_language == Language::Yul, false, _optimize);
+ yul::EVMObjectCompiler::compile(*m_parserResult, adapter, languageToDialect(m_language), false, _optimize);
object.bytecode = make_shared<eth::LinkerObject>(assembly.assemble());
object.assembly = assembly.assemblyString();
return object;
@@ -145,7 +145,7 @@ MachineAssemblyObject AssemblyStack::assemble(Machine _machine, bool _optimize)
{
MachineAssemblyObject object;
yul::EVMAssembly assembly(true);
- yul::EVMObjectCompiler::compile(*m_parserResult, assembly, m_language == Language::Yul, true, _optimize);
+ yul::EVMObjectCompiler::compile(*m_parserResult, assembly, languageToDialect(m_language), true, _optimize);
object.bytecode = make_shared<eth::LinkerObject>(assembly.finalize());
/// TODO: fill out text representation
return object;