bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

rmeta/query cache: don't write string values of preinterned symbols

Browse source
This commit is contained in:
klensy 2022-08-20 15:39:21 +03:00
parent 0016356f2b
commit f6329485a8
5 changed files with 51 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -631,6 +631,10 @@ impl<'a, 'tcx> Decodable<DecodeContext<'a, 'tcx>> for Symbol {
sym sym
} }
SYMBOL_PREINTERNED => {
let symbol_index = d.read_u32();
Symbol::new_from_decoded(symbol_index)
}
_ => unreachable!(), _ => unreachable!(),
} }
} }

29
compiler/rustc_metadata/src/rmeta/encoder.rs
View file

@ -317,17 +317,24 @@ impl<'a, 'tcx> Encodable<EncodeContext<'a, 'tcx>> for Span {
impl<'a, 'tcx> Encodable<EncodeContext<'a, 'tcx>> for Symbol { impl<'a, 'tcx> Encodable<EncodeContext<'a, 'tcx>> for Symbol {
fn encode(&self, s: &mut EncodeContext<'a, 'tcx>) { fn encode(&self, s: &mut EncodeContext<'a, 'tcx>) {
match s.symbol_table.entry(*self) { // if symbol preinterned, emit tag and symbol index
Entry::Vacant(o) => { if self.is_preinterned() {
s.opaque.emit_u8(SYMBOL_STR); s.opaque.emit_u8(SYMBOL_PREINTERNED);
let pos = s.opaque.position(); s.opaque.emit_u32(self.as_u32());
o.insert(pos); } else {
s.emit_str(self.as_str()); // otherwise write it as string or as offset to it
} match s.symbol_table.entry(*self) {
Entry::Occupied(o) => { Entry::Vacant(o) => {
let x = o.get().clone(); s.opaque.emit_u8(SYMBOL_STR);
s.emit_u8(SYMBOL_OFFSET); let pos = s.opaque.position();
s.emit_usize(x); o.insert(pos);
s.emit_str(self.as_str());
}
Entry::Occupied(o) => {
let x = o.get().clone();
s.emit_u8(SYMBOL_OFFSET);
s.emit_usize(x);
}
} }
} }
} }

1
compiler/rustc_metadata/src/rmeta/mod.rs
View file

@ -448,6 +448,7 @@ const TAG_PARTIAL_SPAN: u8 = 2;
// Tags for encoding Symbol's // Tags for encoding Symbol's
const SYMBOL_STR: u8 = 0; const SYMBOL_STR: u8 = 0;
const SYMBOL_OFFSET: u8 = 1; const SYMBOL_OFFSET: u8 = 1;
const SYMBOL_PREINTERNED: u8 = 2;
pub fn provide(providers: &mut Providers) { pub fn provide(providers: &mut Providers) {
encoder::provide(providers); encoder::provide(providers);

34
compiler/rustc_query_impl/src/on_disk_cache.rs
View file

@ -42,6 +42,7 @@ const TAG_EXPN_DATA: u8 = 1;
// Tags for encoding Symbol's // Tags for encoding Symbol's
const SYMBOL_STR: u8 = 0; const SYMBOL_STR: u8 = 0;
const SYMBOL_OFFSET: u8 = 1; const SYMBOL_OFFSET: u8 = 1;
const SYMBOL_PREINTERNED: u8 = 2;
/// Provides an interface to incremental compilation data cached from the /// Provides an interface to incremental compilation data cached from the
/// previous compilation session. This data will eventually include the results /// previous compilation session. This data will eventually include the results
@ -745,6 +746,10 @@ impl<'a, 'tcx> Decodable<CacheDecoder<'a, 'tcx>> for Symbol {
sym sym
} }
SYMBOL_PREINTERNED => {
let symbol_index = d.read_u32();
Symbol::new_from_decoded(symbol_index)
}
_ => unreachable!(), _ => unreachable!(),
} }
} }
@ -939,17 +944,24 @@ impl<'a, 'tcx> Encodable<CacheEncoder<'a, 'tcx>> for Span {
// copy&paste impl from rustc_metadata // copy&paste impl from rustc_metadata
impl<'a, 'tcx> Encodable<CacheEncoder<'a, 'tcx>> for Symbol { impl<'a, 'tcx> Encodable<CacheEncoder<'a, 'tcx>> for Symbol {
fn encode(&self, s: &mut CacheEncoder<'a, 'tcx>) { fn encode(&self, s: &mut CacheEncoder<'a, 'tcx>) {
match s.symbol_table.entry(*self) { // if symbol preinterned, emit tag and symbol index
Entry::Vacant(o) => { if self.is_preinterned() {
s.encoder.emit_u8(SYMBOL_STR); s.encoder.emit_u8(SYMBOL_PREINTERNED);
let pos = s.encoder.position(); s.encoder.emit_u32(self.as_u32());
o.insert(pos); } else {
s.emit_str(self.as_str()); // otherwise write it as string or as offset to it
} match s.symbol_table.entry(*self) {
Entry::Occupied(o) => { Entry::Vacant(o) => {
let x = o.get().clone(); s.encoder.emit_u8(SYMBOL_STR);
s.emit_u8(SYMBOL_OFFSET); let pos = s.encoder.position();
s.emit_usize(x); o.insert(pos);
s.emit_str(self.as_str());
}
Entry::Occupied(o) => {
let x = o.get().clone();
s.emit_u8(SYMBOL_OFFSET);
s.emit_usize(x);
}
} }
} }
} }

5
compiler/rustc_span/src/symbol.rs
View file

@ -1803,6 +1803,11 @@ impl Symbol {
Symbol(SymbolIndex::from_u32(n)) Symbol(SymbolIndex::from_u32(n))
} }
/// for use in Decoder only
pub fn new_from_decoded(n: u32) -> Self {
Self::new(n)
}
/// Maps a string to its interned representation. /// Maps a string to its interned representation.
pub fn intern(string: &str) -> Self { pub fn intern(string: &str) -> Self {
with_session_globals(|session_globals| session_globals.symbol_interner.intern(string)) with_session_globals(|session_globals| session_globals.symbol_interner.intern(string))