From b19ae20aada117a589ec238f97c97a98b483f97d Mon Sep 17 00:00:00 2001 From: Camille GILLOT Date: Tue, 27 Apr 2021 19:24:33 +0200 Subject: Track span dependency using a callback. --- compiler/rustc_query_impl/src/on_disk_cache.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'compiler/rustc_query_impl/src') diff --git a/compiler/rustc_query_impl/src/on_disk_cache.rs b/compiler/rustc_query_impl/src/on_disk_cache.rs index 63000a295f6..08565812278 100644 --- a/compiler/rustc_query_impl/src/on_disk_cache.rs +++ b/compiler/rustc_query_impl/src/on_disk_cache.rs @@ -840,7 +840,7 @@ impl<'a, 'tcx> Decodable> for Span { let dlo = u32::decode(decoder)?; let dto = u32::decode(decoder)?; - let enclosing = decoder.tcx.definitions_untracked().def_span(parent.unwrap()).data(); + let enclosing = decoder.tcx.definitions_untracked().def_span(parent.unwrap()).decode(); let span = Span::new( enclosing.lo + BytePos::from_u32(dlo), enclosing.lo + BytePos::from_u32(dto), @@ -1022,7 +1022,7 @@ where E: 'a + OpaqueEncoder, { fn encode(&self, s: &mut CacheEncoder<'a, 'tcx, E>) -> Result<(), E::Error> { - let span_data = self.data(); + let span_data = self.decode(); span_data.ctxt.encode(s)?; span_data.parent.encode(s)?; @@ -1031,7 +1031,7 @@ where } if let Some(parent) = span_data.parent { - let enclosing = s.tcx.definitions_untracked().def_span(parent).data(); + let enclosing = s.tcx.definitions_untracked().def_span(parent).decode(); if enclosing.contains(span_data) { TAG_RELATIVE_SPAN.encode(s)?; (span_data.lo - enclosing.lo).to_u32().encode(s)?; -- cgit 1.4.1-3-g733a5