Skip to content

Commit fb65274

Browse files
committed
Auto merge of rust-lang#140485 - Jarcho:from_expansion_opt, r=<try>
Optimize the codegen for `Span::from_expansion` See https://godbolt.org/z/bq65Y6bc4 for the difference. the new version is less than half the number of instructions. Also tried fully writing the function by hand: ```rust sp.ctxt_or_parent_or_marker != 0 && ( sp.len_with_tag_or_marker == BASE_LEN_INTERNED_MARKER || sp.len_with_tag_or_marker & PARENT_TAG == 0 ) ``` But that was no better than this PR's current use of `match_span_kind`.
2 parents d2eadb7 + 761d0ec commit fb65274

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

compiler/rustc_span/src/span_encoding.rs

+10-2
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,16 @@ impl Span {
306306
/// Returns `true` if this span comes from any kind of macro, desugaring or inlining.
307307
#[inline]
308308
pub fn from_expansion(self) -> bool {
309-
// If the span is fully inferred then ctxt > MAX_CTXT
310-
self.inline_ctxt().map_or(true, |ctxt| !ctxt.is_root())
309+
// Optimizes much better than `inline_ctxt` since it avoids comparing against `lo_or_index`.
310+
let ctxt = match_span_kind! {
311+
self,
312+
InlineCtxt(span) => SyntaxContext::from_u16(span.ctxt),
313+
InlineParent(_span) => SyntaxContext::root(),
314+
PartiallyInterned(span) => SyntaxContext::from_u16(span.ctxt),
315+
// Must be the value stored in `ctxt_or_parent_or_marker` to optimize properly.
316+
Interned(_span) => SyntaxContext::from_u16(CTXT_INTERNED_MARKER),
317+
};
318+
!ctxt.is_root()
311319
}
312320

313321
/// Returns `true` if this is a dummy span with any hygienic context.

0 commit comments

Comments
 (0)