bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #85834 - cjgillot:save-sbi, r=michaelwoerister

Browse source 
Encode CrateNum using the StableCrateId for incr. comp.
This commit is contained in:
bors 2021-06-17 09:03:58 +00:00
commit b17d9c1332
4 changed files with 40 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_metadata/src/rmeta/decoder.rs
View file

@ -252,6 +252,10 @@ impl<'a, 'tcx> DecodeContext<'a, 'tcx> {
self.cdata.expect("missing CrateMetadata in DecodeContext")
}
fn map_encoded_cnum_to_current(&self, cnum: CrateNum) -> CrateNum {
if cnum == LOCAL_CRATE { self.cdata().cnum } else { self.cdata().cnum_map[cnum] }
}
fn read_lazy_with_meta<T: ?Sized + LazyMeta>(
&mut self,
meta: T::Meta,
@ -324,10 +328,6 @@ impl<'a, 'tcx> TyDecoder<'tcx> for DecodeContext<'a, 'tcx> {
r
}
fn map_encoded_cnum_to_current(&self, cnum: CrateNum) -> CrateNum {
if cnum == LOCAL_CRATE { self.cdata().cnum } else { self.cdata().cnum_map[cnum] }
}
fn decode_alloc_id(&mut self) -> Result<rustc_middle::mir::interpret::AllocId, Self::Error> {
if let Some(alloc_decoding_session) = self.alloc_decoding_session {
alloc_decoding_session.decode_alloc_id(self)