diff options
| author | chriseth <chris@ethereum.org> | 2018-03-08 03:20:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-08 03:20:57 +0800 |
| commit | dfe3193c7382c80f1814247a162663a97c3f5e67 (patch) | |
| tree | d0540c2dfc43a76f0add46840f60ff2e28604a19 /libsolidity/codegen/CompilerContext.cpp | |
| parent | 3155dd8058672ce8f04bc2c0f2536cb549067d0a (diff) | |
| parent | 15920dc75dd5a46a036d5ff16fb8eee0534be6e1 (diff) | |
| download | dexon-solidity-dfe3193c7382c80f1814247a162663a97c3f5e67.tar dexon-solidity-dfe3193c7382c80f1814247a162663a97c3f5e67.tar.gz dexon-solidity-dfe3193c7382c80f1814247a162663a97c3f5e67.tar.bz2 dexon-solidity-dfe3193c7382c80f1814247a162663a97c3f5e67.tar.lz dexon-solidity-dfe3193c7382c80f1814247a162663a97c3f5e67.tar.xz dexon-solidity-dfe3193c7382c80f1814247a162663a97c3f5e67.tar.zst dexon-solidity-dfe3193c7382c80f1814247a162663a97c3f5e67.zip | |
Merge pull request #3678 from ethereum/develop
Merge develop into release.
Diffstat (limited to 'libsolidity/codegen/CompilerContext.cpp')
| -rw-r--r-- | libsolidity/codegen/CompilerContext.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp index 7a88475a..0bf88267 100644 --- a/libsolidity/codegen/CompilerContext.cpp +++ b/libsolidity/codegen/CompilerContext.cpp @@ -319,7 +319,7 @@ void CompilerContext::appendInlineAssembly( ErrorList errors; ErrorReporter errorReporter(errors); auto scanner = make_shared<Scanner>(CharStream(_assembly), "--CODEGEN--"); - auto parserResult = assembly::Parser(errorReporter, assembly::AsmFlavour::Strict).parse(scanner); + auto parserResult = assembly::Parser(errorReporter, assembly::AsmFlavour::Strict).parse(scanner, false); #ifdef SOL_OUTPUT_ASM cout << assembly::AsmPrinter()(*parserResult) << endl; #endif @@ -329,6 +329,8 @@ void CompilerContext::appendInlineAssembly( analyzerResult = assembly::AsmAnalyzer( analysisInfo, errorReporter, + m_evmVersion, + boost::none, assembly::AsmFlavour::Strict, identifierAccess.resolve ).analyze(*parserResult); |