rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Optimize the codegen for Span::from_expansion

Browse Source
This commit is contained in:
Jason Newcomb
2025-04-29 15:39:33 -04:00
parent 25cdf1f674
commit d9c060b88b
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
compiler/rustc_span/src/span_encoding.rs
View File

@@ -306,8 +306,21 @@ impl Span {
/// Returns `true` if this span comes from any kind of macro, desugaring or inlining. /// Returns `true` if this span comes from any kind of macro, desugaring or inlining.
#[inline] #[inline]
pub fn from_expansion(self) -> bool { pub fn from_expansion(self) -> bool {
// If the span is fully inferred then ctxt > MAX_CTXT let ctxt = match_span_kind! {
self.inline_ctxt().map_or(true, |ctxt| !ctxt.is_root()) self,
// All branches here, except `InlineParent`, actually return `span.ctxt_or_parent_or_marker`.
// Since `Interned` is selected if the field contains `CTXT_INTERNED_MARKER` returning that value
// as the context allows the compiler to optimize out the branch that selects between either
// `Interned` and `PartiallyInterned`.
//
// Interned contexts can never be the root context and `CTXT_INTERNED_MARKER` has a different value
// than the root context so this works for checking is this is an expansion.
InlineCtxt(span) => SyntaxContext::from_u16(span.ctxt),
InlineParent(_span) => SyntaxContext::root(),
PartiallyInterned(span) => SyntaxContext::from_u16(span.ctxt),
Interned(_span) => SyntaxContext::from_u16(CTXT_INTERNED_MARKER),
};
!ctxt.is_root()
} }
/// Returns `true` if this is a dummy span with any hygienic context. /// Returns `true` if this is a dummy span with any hygienic context.