From c6c1c992e2f7b7084cae6268fb9635f55bd5ecc6 Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Sun, 16 Jun 2024 00:53:00 +0300
Subject: [PATCH] rustc_span: Optimize more hygiene operations using
`Span::map_ctxt`
---
compiler/rustc_span/src/lib.rs | 40 +++++++++++++++++++++-------------
1 file changed, 25 insertions(+), 15 deletions(-)
diff --git a/compiler/rustc_span/src/lib.rs b/compiler/rustc_span/src/lib.rs
index b7ffe6c618a..5c63e6b8649 100644
--- a/compiler/rustc_span/src/lib.rs
+++ b/compiler/rustc_span/src/lib.rs
@@ -1065,33 +1065,41 @@ impl Span {
#[inline]
pub fn remove_mark(&mut self) -> ExpnId {
- let mut span = self.data();
- let mark = span.ctxt.remove_mark();
- *self = Span::new(span.lo, span.hi, span.ctxt, span.parent);
+ let mut mark = ExpnId::root();
+ *self = self.map_ctxt(|mut ctxt| {
+ mark = ctxt.remove_mark();
+ ctxt
+ });
mark
}
#[inline]
pub fn adjust(&mut self, expn_id: ExpnId) -> Option<ExpnId> {
- let mut span = self.data();
- let mark = span.ctxt.adjust(expn_id);
- *self = Span::new(span.lo, span.hi, span.ctxt, span.parent);
+ let mut mark = None;
+ *self = self.map_ctxt(|mut ctxt| {
+ mark = ctxt.adjust(expn_id);
+ ctxt
+ });
mark
}
#[inline]
pub fn normalize_to_macros_2_0_and_adjust(&mut self, expn_id: ExpnId) -> Option<ExpnId> {
- let mut span = self.data();
- let mark = span.ctxt.normalize_to_macros_2_0_and_adjust(expn_id);
- *self = Span::new(span.lo, span.hi, span.ctxt, span.parent);
+ let mut mark = None;
+ *self = self.map_ctxt(|mut ctxt| {
+ mark = ctxt.normalize_to_macros_2_0_and_adjust(expn_id);
+ ctxt
+ });
mark
}
#[inline]
pub fn glob_adjust(&mut self, expn_id: ExpnId, glob_span: Span) -> Option<Option<ExpnId>> {
- let mut span = self.data();
- let mark = span.ctxt.glob_adjust(expn_id, glob_span);
- *self = Span::new(span.lo, span.hi, span.ctxt, span.parent);
+ let mut mark = None;
+ *self = self.map_ctxt(|mut ctxt| {
+ mark = ctxt.glob_adjust(expn_id, glob_span);
+ ctxt
+ });
mark
}
@@ -1101,9 +1109,11 @@ impl Span {
expn_id: ExpnId,
glob_span: Span,
) -> Option<Option<ExpnId>> {
- let mut span = self.data();
- let mark = span.ctxt.reverse_glob_adjust(expn_id, glob_span);
- *self = Span::new(span.lo, span.hi, span.ctxt, span.parent);
+ let mut mark = None;
+ *self = self.map_ctxt(|mut ctxt| {
+ mark = ctxt.reverse_glob_adjust(expn_id, glob_span);
+ ctxt
+ });
mark
}