mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hygiene: Tweak naming some more

Browse Source
This commit is contained in:
Vadim Petrochenkov 2019-07-16 02:59:53 +03:00
parent 09703e3843
commit 8f30d26030
7 changed files with 65 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustc/ich/hcx.rs
View File

@ -363,17 +363,17 @@ impl<'a> HashStable<StableHashingContext<'a>> for Span {
}
let sub_hash: u64 = CACHE.with(|cache| {
let mark = span.ctxt.outer();
let expn_id = span.ctxt.outer_expn();
if let Some(&sub_hash) = cache.borrow().get(&mark) {
if let Some(&sub_hash) = cache.borrow().get(&expn_id) {
return sub_hash;
}
let mut hasher = StableHasher::new();
mark.expn_info().hash_stable(hcx, &mut hasher);
expn_id.expn_info().hash_stable(hcx, &mut hasher);
let sub_hash: Fingerprint = hasher.finish();
let sub_hash = sub_hash.to_smaller_hash();
cache.borrow_mut().insert(mark, sub_hash);
cache.borrow_mut().insert(expn_id, sub_hash);
sub_hash
});

6
src/librustc/ty/query/on_disk_cache.rs
View File

@ -819,15 +819,15 @@ where
if span_data.ctxt == SyntaxContext::empty() {
TAG_NO_EXPANSION_INFO.encode(self)
} else {
let (mark, expn_info) = span_data.ctxt.outer_and_expn_info();
let (expn_id, expn_info) = span_data.ctxt.outer_expn_with_info();
if let Some(expn_info) = expn_info {
if let Some(pos) = self.expn_info_shorthands.get(&mark).cloned() {
if let Some(pos) = self.expn_info_shorthands.get(&expn_id).cloned() {
TAG_EXPANSION_INFO_SHORTHAND.encode(self)?;
pos.encode(self)
} else {
TAG_EXPANSION_INFO_INLINE.encode(self)?;
let pos = AbsoluteBytePos::new(self.position());
self.expn_info_shorthands.insert(mark, pos);
self.expn_info_shorthands.insert(expn_id, pos);
expn_info.encode(self)
}
} else {

2
src/librustc_codegen_llvm/asm.rs
View File

@ -102,7 +102,7 @@ impl AsmBuilderMethods<'tcx> for Builder<'a, 'll, 'tcx> {
let kind = llvm::LLVMGetMDKindIDInContext(self.llcx,
key.as_ptr() as *const c_char, key.len() as c_uint);
let val: &'ll Value = self.const_i32(ia.ctxt.outer().as_u32() as i32);
let val: &'ll Value = self.const_i32(ia.ctxt.outer_expn().as_u32() as i32);
llvm::LLVMSetMetadata(r, kind,
llvm::LLVMMDNodeInContext(self.llcx, &val, 1));

2
src/librustc_interface/passes.rs
View File

@ -572,7 +572,7 @@ pub fn lower_to_hir(
// Discard hygiene data, which isn't required after lowering to HIR.
if !sess.opts.debugging_opts.keep_hygiene_data {
syntax::ext::hygiene::syntax_context_map();
syntax::ext::hygiene::clear_syntax_context_map();
}
Ok(hir_forest)

6
src/librustc_resolve/lib.rs
View File

@ -2070,7 +2070,7 @@ impl<'a> Resolver<'a> {
fn macro_def(&self, mut ctxt: SyntaxContext) -> DefId {
loop {
match self.macro_defs.get(&ctxt.outer()) {
match self.macro_defs.get(&ctxt.outer_expn()) {
Some(&def_id) => return def_id,
None => ctxt.remove_mark(),
};
@ -2428,7 +2428,7 @@ impl<'a> Resolver<'a> {
fn hygienic_lexical_parent(&mut self, module: Module<'a>, span: &mut Span)
-> Option<Module<'a>> {
if !module.expansion.outer_is_descendant_of(span.ctxt()) {
if !module.expansion.outer_expn_is_descendant_of(span.ctxt()) {
return Some(self.macro_def_scope(span.remove_mark()));
}
@ -2464,7 +2464,7 @@ impl<'a> Resolver<'a> {
module.expansion.is_descendant_of(parent.expansion) {
// The macro is a proc macro derive
if module.expansion.looks_like_proc_macro_derive() {
if parent.expansion.outer_is_descendant_of(span.ctxt()) {
if parent.expansion.outer_expn_is_descendant_of(span.ctxt()) {
*poisoned = Some(node_id);
return module.parent;
}

8
src/librustc_resolve/macros.rs
View File

@ -139,15 +139,15 @@ impl<'a> base::Resolver for Resolver<'a> {
let span = DUMMY_SP.fresh_expansion(ExpnId::root(), ExpnInfo::default(
ExpnKind::Macro(MacroKind::Attr, sym::test_case), DUMMY_SP, self.session.edition()
));
let mark = span.ctxt().outer();
let expn_id = span.ctxt().outer_expn();
let module = self.module_map[&self.definitions.local_def_id(id)];
self.definitions.set_invocation_parent(mark, module.def_id().unwrap().index);
self.invocations.insert(mark, self.arenas.alloc_invocation_data(InvocationData {
self.definitions.set_invocation_parent(expn_id, module.def_id().unwrap().index);
self.invocations.insert(expn_id, self.arenas.alloc_invocation_data(InvocationData {
module,
parent_legacy_scope: LegacyScope::Empty,
output_legacy_scope: Cell::new(None),
}));
mark
expn_id
}
fn resolve_dollar_crates(&mut self) {

97
src/libsyntax_pos/hygiene.rs
View File

@ -42,8 +42,8 @@ pub struct SyntaxContext(u32);
#[derive(Debug)]
struct SyntaxContextData {
outer_expn: ExpnId,
transparency: Transparency,
prev_ctxt: SyntaxContext,
outer_transparency: Transparency,
parent: SyntaxContext,
/// This context, but with all transparent and semi-transparent expansions filtered away.
opaque: SyntaxContext,
/// This context, but with all transparent expansions filtered away.
@ -108,7 +108,7 @@ impl ExpnId {
#[inline]
pub fn parent(self) -> ExpnId {
HygieneData::with(|data| data.expn_data[self.0 as usize].parent)
HygieneData::with(|data| data.parent_expn(self))
}
#[inline]
@ -129,10 +129,10 @@ impl ExpnId {
HygieneData::with(|data| data.is_descendant_of(self, ancestor))
}
/// `expn_id.outer_is_descendant_of(ctxt)` is equivalent to but faster than
/// `expn_id.is_descendant_of(ctxt.outer())`.
pub fn outer_is_descendant_of(self, ctxt: SyntaxContext) -> bool {
HygieneData::with(|data| data.is_descendant_of(self, data.outer(ctxt)))
/// `expn_id.outer_expn_is_descendant_of(ctxt)` is equivalent to but faster than
/// `expn_id.is_descendant_of(ctxt.outer_expn())`.
pub fn outer_expn_is_descendant_of(self, ctxt: SyntaxContext) -> bool {
HygieneData::with(|data| data.is_descendant_of(self, data.outer_expn(ctxt)))
}
// Used for enabling some compatibility fallback in resolve.
@ -167,8 +167,8 @@ impl HygieneData {
}],
syntax_context_data: vec![SyntaxContextData {
outer_expn: ExpnId::root(),
transparency: Transparency::Opaque,
prev_ctxt: SyntaxContext(0),
outer_transparency: Transparency::Opaque,
parent: SyntaxContext(0),
opaque: SyntaxContext(0),
opaque_and_semitransparent: SyntaxContext(0),
dollar_crate_name: kw::DollarCrate,
@ -186,6 +186,10 @@ impl HygieneData {
ExpnId(self.expn_data.len() as u32 - 1)
}
fn parent_expn(&self, expn_id: ExpnId) -> ExpnId {
self.expn_data[expn_id.0 as usize].parent
}
fn expn_info(&self, expn_id: ExpnId) -> Option<&ExpnInfo> {
if expn_id != ExpnId::root() {
Some(self.expn_data[expn_id.0 as usize].expn_info.as_ref()
@ -203,7 +207,7 @@ impl HygieneData {
if expn_id == ExpnId::root() {
return false;
}
expn_id = self.expn_data[expn_id.0 as usize].parent;
expn_id = self.parent_expn(expn_id);
}
true
}
@ -222,32 +226,29 @@ impl HygieneData {
self.syntax_context_data[ctxt.0 as usize].opaque_and_semitransparent
}
fn outer(&self, ctxt: SyntaxContext) -> ExpnId {
fn outer_expn(&self, ctxt: SyntaxContext) -> ExpnId {
self.syntax_context_data[ctxt.0 as usize].outer_expn
}
fn transparency(&self, ctxt: SyntaxContext) -> Transparency {
self.syntax_context_data[ctxt.0 as usize].transparency
fn outer_transparency(&self, ctxt: SyntaxContext) -> Transparency {
self.syntax_context_data[ctxt.0 as usize].outer_transparency
}
fn prev_ctxt(&self, ctxt: SyntaxContext) -> SyntaxContext {
self.syntax_context_data[ctxt.0 as usize].prev_ctxt
fn parent_ctxt(&self, ctxt: SyntaxContext) -> SyntaxContext {
self.syntax_context_data[ctxt.0 as usize].parent
}
fn remove_mark(&self, ctxt: &mut SyntaxContext) -> ExpnId {
let outer_expn = self.syntax_context_data[ctxt.0 as usize].outer_expn;
*ctxt = self.prev_ctxt(*ctxt);
let outer_expn = self.outer_expn(*ctxt);
*ctxt = self.parent_ctxt(*ctxt);
outer_expn
}
fn marks(&self, mut ctxt: SyntaxContext) -> Vec<(ExpnId, Transparency)> {
let mut marks = Vec::new();
while ctxt != SyntaxContext::empty() {
let outer_expn = self.outer(ctxt);
let transparency = self.transparency(ctxt);
let prev_ctxt = self.prev_ctxt(ctxt);
marks.push((outer_expn, transparency));
ctxt = prev_ctxt;
marks.push((self.outer_expn(ctxt), self.outer_transparency(ctxt)));
ctxt = self.parent_ctxt(ctxt);
}
marks.reverse();
marks
@ -255,7 +256,7 @@ impl HygieneData {
fn walk_chain(&self, mut span: Span, to: SyntaxContext) -> Span {
while span.ctxt() != crate::NO_EXPANSION && span.ctxt() != to {
if let Some(info) = self.expn_info(self.outer(span.ctxt())) {
if let Some(info) = self.expn_info(self.outer_expn(span.ctxt())) {
span = info.call_site;
} else {
break;
@ -266,7 +267,7 @@ impl HygieneData {
fn adjust(&self, ctxt: &mut SyntaxContext, expn_id: ExpnId) -> Option<ExpnId> {
let mut scope = None;
while !self.is_descendant_of(expn_id, self.outer(*ctxt)) {
while !self.is_descendant_of(expn_id, self.outer_expn(*ctxt)) {
scope = Some(self.remove_mark(ctxt));
}
scope
@ -320,14 +321,14 @@ impl HygieneData {
syntax_context_data[ctxt.0 as usize].opaque_and_semitransparent;
if transparency >= Transparency::Opaque {
let prev_ctxt = opaque;
opaque = *self.syntax_context_map.entry((prev_ctxt, expn_id, transparency))
let parent = opaque;
opaque = *self.syntax_context_map.entry((parent, expn_id, transparency))
.or_insert_with(|| {
let new_opaque = SyntaxContext(syntax_context_data.len() as u32);
syntax_context_data.push(SyntaxContextData {
outer_expn: expn_id,
transparency,
prev_ctxt,
outer_transparency: transparency,
parent,
opaque: new_opaque,
opaque_and_semitransparent: new_opaque,
dollar_crate_name: kw::DollarCrate,
@ -337,16 +338,16 @@ impl HygieneData {
}
if transparency >= Transparency::SemiTransparent {
let prev_ctxt = opaque_and_semitransparent;
let parent = opaque_and_semitransparent;
opaque_and_semitransparent =
*self.syntax_context_map.entry((prev_ctxt, expn_id, transparency))
*self.syntax_context_map.entry((parent, expn_id, transparency))
.or_insert_with(|| {
let new_opaque_and_semitransparent =
SyntaxContext(syntax_context_data.len() as u32);
syntax_context_data.push(SyntaxContextData {
outer_expn: expn_id,
transparency,
prev_ctxt,
outer_transparency: transparency,
parent,
opaque,
opaque_and_semitransparent: new_opaque_and_semitransparent,
dollar_crate_name: kw::DollarCrate,
@ -355,14 +356,14 @@ impl HygieneData {
});
}
let prev_ctxt = ctxt;
*self.syntax_context_map.entry((prev_ctxt, expn_id, transparency)).or_insert_with(|| {
let parent = ctxt;
*self.syntax_context_map.entry((parent, expn_id, transparency)).or_insert_with(|| {
let new_opaque_and_semitransparent_and_transparent =
SyntaxContext(syntax_context_data.len() as u32);
syntax_context_data.push(SyntaxContextData {
outer_expn: expn_id,
transparency,
prev_ctxt,
outer_transparency: transparency,
parent,
opaque,
opaque_and_semitransparent,
dollar_crate_name: kw::DollarCrate,
@ -372,7 +373,7 @@ impl HygieneData {
}
}
pub fn syntax_context_map() {
pub fn clear_syntax_context_map() {
HygieneData::with(|data| data.syntax_context_map = FxHashMap::default());
}
@ -513,7 +514,7 @@ impl SyntaxContext {
HygieneData::with(|data| {
let mut scope = None;
let mut glob_ctxt = data.modern(glob_span.ctxt());
while !data.is_descendant_of(expn_id, data.outer(glob_ctxt)) {
while !data.is_descendant_of(expn_id, data.outer_expn(glob_ctxt)) {
scope = Some(data.remove_mark(&mut glob_ctxt));
if data.remove_mark(self) != scope.unwrap() {
return None;
@ -542,7 +543,7 @@ impl SyntaxContext {
let mut glob_ctxt = data.modern(glob_span.ctxt());
let mut marks = Vec::new();
while !data.is_descendant_of(expn_id, data.outer(glob_ctxt)) {
while !data.is_descendant_of(expn_id, data.outer_expn(glob_ctxt)) {
marks.push(data.remove_mark(&mut glob_ctxt));
}
@ -573,23 +574,23 @@ impl SyntaxContext {
}
#[inline]
pub fn outer(self) -> ExpnId {
HygieneData::with(|data| data.outer(self))
pub fn outer_expn(self) -> ExpnId {
HygieneData::with(|data| data.outer_expn(self))
}
/// `ctxt.outer_expn_info()` is equivalent to but faster than
/// `ctxt.outer().expn_info()`.
/// `ctxt.outer_expn().expn_info()`.
#[inline]
pub fn outer_expn_info(self) -> Option<ExpnInfo> {
HygieneData::with(|data| data.expn_info(data.outer(self)).cloned())
HygieneData::with(|data| data.expn_info(data.outer_expn(self)).cloned())
}
/// `ctxt.outer_and_expn_info()` is equivalent to but faster than
/// `{ let outer = ctxt.outer(); (outer, outer.expn_info()) }`.
/// `ctxt.outer_expn_with_info()` is equivalent to but faster than
/// `{ let outer = ctxt.outer_expn(); (outer, outer.expn_info()) }`.
#[inline]
pub fn outer_and_expn_info(self) -> (ExpnId, Option<ExpnInfo>) {
pub fn outer_expn_with_info(self) -> (ExpnId, Option<ExpnInfo>) {
HygieneData::with(|data| {
let outer = data.outer(self);
let outer = data.outer_expn(self);
(outer, data.expn_info(outer).cloned())
})
}
@ -613,7 +614,7 @@ impl Span {
/// but its location is inherited from the current span.
pub fn fresh_expansion(self, parent: ExpnId, expn_info: ExpnInfo) -> Span {
HygieneData::with(|data| {
let expn_id = data.fresh_expn_id(parent, Some(expn_info));
let expn_id = data.fresh_expn(parent, Some(expn_info));
self.with_ctxt(data.apply_mark(SyntaxContext::empty(), expn_id))
})
}