bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Avoid specialization for AttrId deserialization

Browse source
This commit is contained in:
bjorn3 2023-12-31 20:40:09 +00:00
parent 8d598b0d58
commit 47936b4813
4 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

22
compiler/rustc_span/src/lib.rs
View file

@ -1019,6 +1019,12 @@ impl Default for Span {
}
}
rustc_index::newtype_index! {
#[orderable]
#[debug_format = "AttrId({})"]
pub struct AttrId {}
}
pub trait SpanEncoder: Encoder {
fn encode_span(&mut self, span: Span);
fn encode_symbol(&mut self, symbol: Symbol);
@ -1106,6 +1112,11 @@ impl<E: SpanEncoder> Encodable<E> for DefId {
}
}
impl<E: SpanEncoder> Encodable<E> for AttrId {
fn encode(&self, _s: &mut E) {
// A fresh id will be generated when decoding
}
}
pub trait SpanDecoder: Decoder {
fn decode_span(&mut self) -> Span;
fn decode_symbol(&mut self) -> Symbol;
@ -1114,6 +1125,7 @@ pub trait SpanDecoder: Decoder {
fn decode_crate_num(&mut self) -> CrateNum;
fn decode_def_index(&mut self) -> DefIndex;
fn decode_def_id(&mut self) -> DefId;
fn decode_attr_id(&mut self) -> AttrId;
}
impl SpanDecoder for MemDecoder<'_> {
@ -1147,6 +1159,10 @@ impl SpanDecoder for MemDecoder<'_> {
fn decode_def_id(&mut self) -> DefId {
DefId { krate: Decodable::decode(self), index: Decodable::decode(self) }
}
fn decode_attr_id(&mut self) -> AttrId {
panic!("cannot decode `AttrId` with `MemDecoder`");
}
}
impl<D: SpanDecoder> Decodable<D> for Span {
@ -1191,6 +1207,12 @@ impl<D: SpanDecoder> Decodable<D> for DefId {
}
}
impl<D: SpanDecoder> Decodable<D> for AttrId {
fn decode(s: &mut D) -> AttrId {
s.decode_attr_id()
}
}
/// Insert `source_map` into the session globals for the duration of the
/// closure's execution.
pub fn set_source_map<T, F: FnOnce() -> T>(source_map: Lrc<SourceMap>, f: F) -> T {