diff options
| author | bors <bors@rust-lang.org> | 2021-01-13 23:24:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-01-13 23:24:31 +0000 |
| commit | 180fdffa17e5598d31eb1eaa2697bd57ef1b8a29 (patch) | |
| tree | 5387ea7dd3ef91e4cd98fa204fb4b44fe6e2f9e4 /compiler/rustc_span/src | |
| parent | a62a76047ea24aad7639f14eb3ce0e620b77bdb7 (diff) | |
| parent | 482a67d20f3c7059c33368df424f781585ead7cc (diff) | |
| download | rust-180fdffa17e5598d31eb1eaa2697bd57ef1b8a29.tar.gz rust-180fdffa17e5598d31eb1eaa2697bd57ef1b8a29.zip | |
Auto merge of #80654 - Aaron1011:fix/dummy-span-ctxt, r=wesleywiser
Properly handle `SyntaxContext` of dummy spans in incr comp Fixes #80336 Due to macro expansion, we may end up with spans with an invalid location and non-root `SyntaxContext`. This commits preserves the `SyntaxContext` of such spans in the incremental cache, and ensures that we always hash the `SyntaxContext` when computing the `Fingerprint` of a `Span` Previously, we would discard the `SyntaxContext` during serialization to the incremental cache, causing the span's `Fingerprint` to change across compilation sessions.
Diffstat (limited to 'compiler/rustc_span/src')
| -rw-r--r-- | compiler/rustc_span/src/lib.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_span/src/lib.rs b/compiler/rustc_span/src/lib.rs index f0f9f940446..50cb1555486 100644 --- a/compiler/rustc_span/src/lib.rs +++ b/compiler/rustc_span/src/lib.rs @@ -1899,8 +1899,9 @@ where return; } - if *self == DUMMY_SP { + if self.is_dummy() { Hash::hash(&TAG_INVALID_SPAN, hasher); + self.ctxt().hash_stable(ctx, hasher); return; } |
