diff options
| author | chriseth <chris@ethereum.org> | 2018-12-12 07:37:20 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-12 07:37:20 +0800 |
| commit | e74d9df20d1d1e8253cf51ef8d4191e9a0f51e14 (patch) | |
| tree | 72a8593bf822032ecf50dbc8e1c78e899a5befd4 /libsolidity/codegen | |
| parent | 9f86ede32d4aa3e53bf82d0e4c64dbea3661791b (diff) | |
| parent | fb3a0ac1c7d2c4624df6ae62d290a2de7768d036 (diff) | |
| download | dexon-solidity-e74d9df20d1d1e8253cf51ef8d4191e9a0f51e14.tar dexon-solidity-e74d9df20d1d1e8253cf51ef8d4191e9a0f51e14.tar.gz dexon-solidity-e74d9df20d1d1e8253cf51ef8d4191e9a0f51e14.tar.bz2 dexon-solidity-e74d9df20d1d1e8253cf51ef8d4191e9a0f51e14.tar.lz dexon-solidity-e74d9df20d1d1e8253cf51ef8d4191e9a0f51e14.tar.xz dexon-solidity-e74d9df20d1d1e8253cf51ef8d4191e9a0f51e14.tar.zst dexon-solidity-e74d9df20d1d1e8253cf51ef8d4191e9a0f51e14.zip | |
Merge pull request #5616 from ethereum/codegenForObjectsAccess
[Yul] Codegen for objects access
Diffstat (limited to 'libsolidity/codegen')
| -rw-r--r-- | libsolidity/codegen/AsmCodeGen.cpp | 2 | ||||
| -rw-r--r-- | libsolidity/codegen/CompilerContext.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libsolidity/codegen/AsmCodeGen.cpp b/libsolidity/codegen/AsmCodeGen.cpp index 3f770f62..c04c1c34 100644 --- a/libsolidity/codegen/AsmCodeGen.cpp +++ b/libsolidity/codegen/AsmCodeGen.cpp @@ -188,9 +188,9 @@ void CodeGenerator::assemble( assemblyAdapter, _analysisInfo, _parsedData, + *EVMDialect::strictAssemblyForEVM(), _optimize, false, - false, _identifierAccess, _useNamedLabelsForFunctions )(_parsedData); diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp index dac09c2e..0b018e1e 100644 --- a/libsolidity/codegen/CompilerContext.cpp +++ b/libsolidity/codegen/CompilerContext.cpp @@ -31,6 +31,7 @@ #include <libyul/AsmAnalysis.h> #include <libyul/AsmAnalysisInfo.h> #include <libyul/YulString.h> +#include <libyul/backends/evm/EVMDialect.h> #include <liblangutil/ErrorReporter.h> #include <liblangutil/Scanner.h> @@ -361,7 +362,7 @@ void CompilerContext::appendInlineAssembly( ErrorList errors; ErrorReporter errorReporter(errors); auto scanner = make_shared<langutil::Scanner>(langutil::CharStream(_assembly, "--CODEGEN--")); - auto parserResult = yul::Parser(errorReporter, yul::Dialect::strictAssemblyForEVM()).parse(scanner, false); + auto parserResult = yul::Parser(errorReporter, yul::EVMDialect::strictAssemblyForEVM()).parse(scanner, false); #ifdef SOL_OUTPUT_ASM cout << yul::AsmPrinter()(*parserResult) << endl; #endif @@ -373,7 +374,7 @@ void CompilerContext::appendInlineAssembly( errorReporter, m_evmVersion, boost::none, - yul::Dialect::strictAssemblyForEVM(), + yul::EVMDialect::strictAssemblyForEVM(), identifierAccess.resolve ).analyze(*parserResult); if (!parserResult || !errorReporter.errors().empty() || !analyzerResult) |