user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixup! Don't visit foreign function bodies when lowering ast to hir

Browse source
This commit is contained in:
Ayaz Hafiz 2020-07-09 22:32:49 -07:00
parent 230393993f
commit ab4275cddc
No known key found for this signature in database
GPG key ID: B443F7A3030C9AED
1 changed files with 12 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/librustc_ast_lowering/item.rs
View file

@ -77,39 +77,20 @@ impl<'a> Visitor<'a> for ItemLowerer<'a, '_, '_> {
}
}
// Forked from the original method because we don't want to descend into foreign function
// blocks. Such blocks are semantically invalid and the hir does not preserve them, so lowering
// items contained in them may be unexpected by later passes.
fn visit_foreign_item(&mut self, item: &'a ForeignItem) {
let Item { id: _, span: _, ident, ref vis, ref attrs, ref kind, tokens: _ } = *item;
self.visit_vis(vis);
self.visit_ident(ident);
walk_list!(self, visit_attribute, attrs);
match kind {
ForeignItemKind::Static(ty, _, expr) => {
self.visit_ty(ty);
walk_list!(self, visit_expr, expr);
fn visit_fn(&mut self, fk: FnKind<'a>, _: Span, _: NodeId) {
match fk {
FnKind::Fn(FnCtxt::Foreign, _, sig, _, _) => {
self.visit_fn_header(&sig.header);
visit::walk_fn_decl(self, &sig.decl);
}
ForeignItemKind::Fn(_, sig, generics, body) => {
self.visit_generics(generics);
let kind = FnKind::Fn(FnCtxt::Foreign, ident, sig, vis, body.as_deref());
match kind {
FnKind::Fn(_, _, sig, _, _) => {
self.visit_fn_header(&sig.header);
visit::walk_fn_decl(self, &sig.decl);
}
FnKind::Closure(decl, _) => {
visit::walk_fn_decl(self, decl);
}
}
FnKind::Fn(_, _, sig, _, body) => {
self.visit_fn_header(&sig.header);
visit::walk_fn_decl(self, &sig.decl);
walk_list!(self, visit_block, body);
}
ForeignItemKind::TyAlias(_, generics, bounds, ty) => {
self.visit_generics(generics);
walk_list!(self, visit_param_bound, bounds);
walk_list!(self, visit_ty, ty);
}
ForeignItemKind::MacCall(mac) => {
self.visit_mac(mac);
FnKind::Closure(decl, body) => {
visit::walk_fn_decl(self, decl);
self.visit_expr(body);
}
}
}