bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Introduce and use Mark::outer_is_descendant_of().

Browse source 
It reduces two `hygiene_data` accesses to one on some hot paths.
This commit is contained in:
Nicholas Nethercote 2019-05-27 13:38:23 +10:00
parent 7212685837
commit 828f6fdbe5
2 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_resolve/lib.rs
View file

@ -2308,7 +2308,7 @@ impl<'a> Resolver<'a> {
fn hygienic_lexical_parent(&mut self, module: Module<'a>, span: &mut Span) fn hygienic_lexical_parent(&mut self, module: Module<'a>, span: &mut Span)
-> Option<Module<'a>> { -> Option<Module<'a>> {
if !module.expansion.is_descendant_of(span.ctxt().outer()) { if !module.expansion.outer_is_descendant_of(span.ctxt()) {
return Some(self.macro_def_scope(span.remove_mark())); return Some(self.macro_def_scope(span.remove_mark()));
} }
@ -2344,7 +2344,7 @@ impl<'a> Resolver<'a> {
module.expansion.is_descendant_of(parent.expansion) { module.expansion.is_descendant_of(parent.expansion) {
// The macro is a proc macro derive // The macro is a proc macro derive
if module.expansion.looks_like_proc_macro_derive() { if module.expansion.looks_like_proc_macro_derive() {
if parent.expansion.is_descendant_of(span.ctxt().outer()) { if parent.expansion.outer_is_descendant_of(span.ctxt()) {
*poisoned = Some(node_id); *poisoned = Some(node_id);
return module.parent; return module.parent;
} }

21
src/libsyntax_pos/hygiene.rs
View file

@ -124,6 +124,21 @@ impl Mark {
}) })
} }
/// `mark.outer_is_descendant_of(ctxt)` is equivalent to but faster than
/// `mark.is_descendant_of(ctxt.outer())`.
pub fn outer_is_descendant_of(mut self, ctxt: SyntaxContext) -> bool {
HygieneData::with(|data| {
let outer = data.syntax_contexts[ctxt.0 as usize].outer_mark;
while self != outer {
if self == Mark::root() {
return false;
}
self = data.marks[self.0 as usize].parent;
}
true
})
}
/// Computes a mark such that both input marks are descendants of (or equal to) the returned /// Computes a mark such that both input marks are descendants of (or equal to) the returned
/// mark. That is, the following holds: /// mark. That is, the following holds:
/// ///
@ -416,7 +431,7 @@ impl SyntaxContext {
/// or `None` if we privacy check as usual (i.e., not w.r.t. a macro definition scope). /// or `None` if we privacy check as usual (i.e., not w.r.t. a macro definition scope).
pub fn adjust(&mut self, expansion: Mark) -> Option<Mark> { pub fn adjust(&mut self, expansion: Mark) -> Option<Mark> {
let mut scope = None; let mut scope = None;
while !expansion.is_descendant_of(self.outer()) { while !expansion.outer_is_descendant_of(*self) {
scope = Some(self.remove_mark()); scope = Some(self.remove_mark());
} }
scope scope
@ -450,7 +465,7 @@ impl SyntaxContext {
pub fn glob_adjust(&mut self, expansion: Mark, mut glob_ctxt: SyntaxContext) pub fn glob_adjust(&mut self, expansion: Mark, mut glob_ctxt: SyntaxContext)
-> Option<Option<Mark>> { -> Option<Option<Mark>> {
let mut scope = None; let mut scope = None;
while !expansion.is_descendant_of(glob_ctxt.outer()) { while !expansion.outer_is_descendant_of(glob_ctxt) {
scope = Some(glob_ctxt.remove_mark()); scope = Some(glob_ctxt.remove_mark());
if self.remove_mark() != scope.unwrap() { if self.remove_mark() != scope.unwrap() {
return None; return None;
@ -476,7 +491,7 @@ impl SyntaxContext {
} }
let mut marks = Vec::new(); let mut marks = Vec::new();
while !expansion.is_descendant_of(glob_ctxt.outer()) { while !expansion.outer_is_descendant_of(glob_ctxt) {
marks.push(glob_ctxt.remove_mark()); marks.push(glob_ctxt.remove_mark());
} }