bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

[perf] More span update benchmarking

Browse source
This commit is contained in:
Vadim Petrochenkov 2024-06-17 15:28:24 +03:00
parent 3baa20b783
commit 91d05ba557
1 changed files with 11 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

41
compiler/rustc_span/src/span_encoding.rs
View file

@ -327,43 +327,24 @@ impl Span {
// interner and can fall back to `Span::new`. // interner and can fall back to `Span::new`.
#[inline] #[inline]
pub fn map_ctxt(self, update: impl FnOnce(SyntaxContext) -> SyntaxContext) -> Span { pub fn map_ctxt(self, update: impl FnOnce(SyntaxContext) -> SyntaxContext) -> Span {
let (updated_ctxt32, data);
match_span_kind! { match_span_kind! {
self, self,
InlineCtxt(span) => { InlineCtxt(span) => {
updated_ctxt32 = update(SyntaxContext::from_u16(span.ctxt)).as_u32(); let updated_ctxt32 = update(SyntaxContext::from_u16(span.ctxt)).as_u32();
// Any small new context including zero will preserve the format. // Any small new context including zero will preserve the format.
if updated_ctxt32 <= MAX_CTXT { return if updated_ctxt32 <= MAX_CTXT {
return InlineCtxt::span(span.lo, span.len, updated_ctxt32 as u16); InlineCtxt::span(span.lo, span.len, updated_ctxt32 as u16)
} } else {
data = span.data(); span.data().with_ctxt(SyntaxContext::from_u32(updated_ctxt32))
}, };
InlineParent(span) => {
updated_ctxt32 = update(SyntaxContext::root()).as_u32();
// Only if the new context is zero the format will be preserved.
if updated_ctxt32 == 0 {
// Do nothing.
return self;
}
data = span.data();
},
PartiallyInterned(span) => {
updated_ctxt32 = update(SyntaxContext::from_u16(span.ctxt)).as_u32();
// Any small new context excluding zero will preserve the format.
// Zero may change the format to `InlineParent` if parent and len are small enough.
if updated_ctxt32 <= MAX_CTXT && updated_ctxt32 != 0 {
return PartiallyInterned::span(span.index, updated_ctxt32 as u16);
}
data = span.data();
},
Interned(span) => {
data = span.data();
updated_ctxt32 = update(data.ctxt).as_u32();
}, },
InlineParent(_span) => {},
PartiallyInterned(_span) => {},
Interned(_span) => {},
} }
// We could not keep the span in the same inline format, fall back to the complete logic. let data = self.data_untracked();
data.with_ctxt(SyntaxContext::from_u32(updated_ctxt32)) data.with_ctxt(update(data.ctxt))
} }
// Returns either syntactic context, if it can be retrieved without taking the interner lock, // Returns either syntactic context, if it can be retrieved without taking the interner lock,