diff options
| author | bors <bors@rust-lang.org> | 2018-09-28 06:40:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-28 06:40:32 +0000 |
| commit | bd8d030d014a4aa13b9b02b0ce98e2de2a2c54be (patch) | |
| tree | f9073c5d1269b2c8c372857159d5e59b9e5808c1 /src/librustc/ty | |
| parent | c222479c6feb036e5e5198e068aa9824d855ffa4 (diff) | |
| parent | 2d7edf908d5767567d20bec2440099b317169d8d (diff) | |
| download | rust-bd8d030d014a4aa13b9b02b0ce98e2de2a2c54be.tar.gz rust-bd8d030d014a4aa13b9b02b0ce98e2de2a2c54be.zip | |
Auto merge of #54338 - orium:fix-macro-inc-comp, r=nrc
Use full name to identify a macro in a `FileName`. Before this two macros with same name would be indistinguishable inside a `FileName`. This caused a bug in incremental compilation (see #53097) since two different macros would map out to the same `StableFilemapId`. Fixes #53097. r? @nrc
Diffstat (limited to 'src/librustc/ty')
| -rw-r--r-- | src/librustc/ty/query/on_disk_cache.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/librustc/ty/query/on_disk_cache.rs b/src/librustc/ty/query/on_disk_cache.rs index 0e4d2f1f647..296602e21ba 100644 --- a/src/librustc/ty/query/on_disk_cache.rs +++ b/src/librustc/ty/query/on_disk_cache.rs @@ -606,6 +606,7 @@ impl<'a, 'tcx, 'x> SpecializedDecoder<interpret::AllocId> for CacheDecoder<'a, ' alloc_decoding_session.decode_alloc_id(self) } } + impl<'a, 'tcx, 'x> SpecializedDecoder<Span> for CacheDecoder<'a, 'tcx, 'x> { fn specialized_decode(&mut self) -> Result<Span, Self::Error> { let tag: u8 = Decodable::decode(self)?; |