diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-01-04 22:30:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 22:30:59 +0800 |
| commit | ef356905ff1742257cec19523f0a9616977d961e (patch) | |
| tree | 667735a6921b8e11de55a36715cc0bf15ccdb70c /libsolidity | |
| parent | 2cdd789b5d371de6612dadb4ae9a18359cf150df (diff) | |
| parent | 7f4cf00f1b6a41c1fd409dbca329d7bc17f4fd56 (diff) | |
| download | dexon-solidity-ef356905ff1742257cec19523f0a9616977d961e.tar dexon-solidity-ef356905ff1742257cec19523f0a9616977d961e.tar.gz dexon-solidity-ef356905ff1742257cec19523f0a9616977d961e.tar.bz2 dexon-solidity-ef356905ff1742257cec19523f0a9616977d961e.tar.lz dexon-solidity-ef356905ff1742257cec19523f0a9616977d961e.tar.xz dexon-solidity-ef356905ff1742257cec19523f0a9616977d961e.tar.zst dexon-solidity-ef356905ff1742257cec19523f0a9616977d961e.zip | |
Merge pull request #3373 from ethereum/sourceLocation
Reset source location after inline assembly and mechanism to update expectation in test.
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/codegen/CompilerContext.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp index ce9c3b7f..ab10d7dd 100644 --- a/libsolidity/codegen/CompilerContext.cpp +++ b/libsolidity/codegen/CompilerContext.cpp @@ -347,6 +347,9 @@ void CompilerContext::appendInlineAssembly( solAssert(errorReporter.errors().empty(), "Failed to analyze inline assembly block."); assembly::CodeGenerator::assemble(*parserResult, analysisInfo, *m_asm, identifierAccess, _system); + + // Reset the source location to the one of the node (instead of the CODEGEN source location) + updateSourceLocation(); } FunctionDefinition const& CompilerContext::resolveVirtualFunction( |