about summary refs log tree commit diff
path: root/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
diff options
context:
space:
mode:
authorAaron Hill <aa1ronham@gmail.com>2021-01-31 15:21:28 -0500
committerAaron Hill <aa1ronham@gmail.com>2021-01-31 15:24:34 -0500
commit6c14aad58e65c9c50faa45ed88369c5c72d6d0d7 (patch)
tree4556d6d03bc8729cdd8c38d57bbfe2d48c75e386 /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
parent04caa632dd10c2bf64b69524c7f9c4c30a436877 (diff)
downloadrust-6c14aad58e65c9c50faa45ed88369c5c72d6d0d7.tar.gz
rust-6c14aad58e65c9c50faa45ed88369c5c72d6d0d7.zip
Improve handling of spans around macro result parse errors
Fixes #81543

After we expand a macro, we try to parse the resulting tokens as a AST
node. This commit makes several improvements to how we handle spans when
an error occurs:

* Only ovewrite the original `Span` if it's a dummy span. This preserves
  a more-specific span if one is available.
* Use `self.prev_token` instead of `self.token` when emitting an error
  message after encountering EOF, since an EOF token always has a dummy
  span
* Make `SourceMap::next_point` leave dummy spans unused. A dummy span
  does not have a logical 'next point', since it's a zero-length span.
  Re-using the span span preserves its 'dummy-ness' for other checks
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions