Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 21fc882

Browse files
committedJan 21, 2024
Auto merge of #120206 - petrochenkov:somehir, r=<try>
hir: Make sure all `HirId`s have corresponding HIR `Node`s And then remove `tcx.opt_hir_node(hir_id)` in favor of `tcx.hir_node(hir_id)`.
2 parents ef71f10 + f26f870 commit 21fc882

File tree

52 files changed

+352
-367
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+352
-367
lines changed
 

‎compiler/rustc_ast_lowering/src/index.rs

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pub(super) fn index_hir<'hir>(
2929
tcx: TyCtxt<'hir>,
3030
item: hir::OwnerNode<'hir>,
3131
bodies: &SortedMap<ItemLocalId, &'hir Body<'hir>>,
32-
) -> (IndexVec<ItemLocalId, Option<ParentedNode<'hir>>>, LocalDefIdMap<ItemLocalId>) {
32+
) -> (IndexVec<ItemLocalId, ParentedNode<'hir>>, LocalDefIdMap<ItemLocalId>) {
3333
let mut nodes = IndexVec::new();
3434
// This node's parent should never be accessed: the owner's parent is computed by the
3535
// hir_owner_parent query. Make it invalid (= ItemLocalId::MAX) to force an ICE whenever it is
@@ -54,7 +54,18 @@ pub(super) fn index_hir<'hir>(
5454
OwnerNode::ForeignItem(item) => collector.visit_foreign_item(item),
5555
};
5656

57-
(collector.nodes, collector.parenting)
57+
let err = || {
58+
let span = item.span();
59+
tcx.dcx().span_delayed_bug(*span, "ID not encountered when visiting item HIR");
60+
ParentedNode { parent: ItemLocalId::new(0), node: Node::Err(span) }
61+
};
62+
let nodes = collector
63+
.nodes
64+
.into_iter()
65+
.map(|parented_node| parented_node.unwrap_or_else(err))
66+
.collect();
67+
68+
(nodes, collector.parenting)
5869
}
5970

6071
impl<'a, 'hir> NodeCollector<'a, 'hir> {
@@ -348,4 +359,28 @@ impl<'a, 'hir> Visitor<'hir> for NodeCollector<'a, 'hir> {
348359

349360
self.visit_nested_foreign_item(id);
350361
}
362+
363+
fn visit_where_predicate(&mut self, predicate: &'hir WherePredicate<'hir>) {
364+
match predicate {
365+
WherePredicate::BoundPredicate(pred) => {
366+
self.insert(pred.span, pred.hir_id, Node::WhereBoundPredicate(pred));
367+
self.with_parent(pred.hir_id, |this| {
368+
intravisit::walk_where_predicate(this, predicate)
369+
})
370+
}
371+
_ => intravisit::walk_where_predicate(self, predicate),
372+
}
373+
}
374+
375+
fn visit_let_expr(&mut self, lex: &'hir Let<'hir>) {
376+
self.insert(lex.span, lex.hir_id, Node::Let(lex));
377+
self.with_parent(lex.hir_id, |this| intravisit::walk_let_expr(this, lex))
378+
}
379+
380+
fn visit_array_length(&mut self, len: &'hir ArrayLen) {
381+
match len {
382+
ArrayLen::Infer(hir_id, span) => self.insert(*span, *hir_id, Node::ArrayLenInfer(span)),
383+
ArrayLen::Body(..) => intravisit::walk_array_len(self, len),
384+
}
385+
}
351386
}

‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

Lines changed: 57 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -399,66 +399,60 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
399399
}
400400
let typeck = self.infcx.tcx.typeck(self.mir_def_id());
401401
let hir_id = hir.parent_id(expr.hir_id);
402-
if let Some(parent) = self.infcx.tcx.opt_hir_node(hir_id) {
403-
let (def_id, args, offset) = if let hir::Node::Expr(parent_expr) = parent
404-
&& let hir::ExprKind::MethodCall(_, _, args, _) = parent_expr.kind
405-
&& let Some(def_id) = typeck.type_dependent_def_id(parent_expr.hir_id)
406-
{
407-
(def_id.as_local(), args, 1)
408-
} else if let hir::Node::Expr(parent_expr) = parent
409-
&& let hir::ExprKind::Call(call, args) = parent_expr.kind
410-
&& let ty::FnDef(def_id, _) = typeck.node_type(call.hir_id).kind()
411-
{
412-
(def_id.as_local(), args, 0)
413-
} else {
414-
(None, &[][..], 0)
402+
let parent = self.infcx.tcx.hir_node(hir_id);
403+
let (def_id, args, offset) = if let hir::Node::Expr(parent_expr) = parent
404+
&& let hir::ExprKind::MethodCall(_, _, args, _) = parent_expr.kind
405+
&& let Some(def_id) = typeck.type_dependent_def_id(parent_expr.hir_id)
406+
{
407+
(def_id.as_local(), args, 1)
408+
} else if let hir::Node::Expr(parent_expr) = parent
409+
&& let hir::ExprKind::Call(call, args) = parent_expr.kind
410+
&& let ty::FnDef(def_id, _) = typeck.node_type(call.hir_id).kind()
411+
{
412+
(def_id.as_local(), args, 0)
413+
} else {
414+
(None, &[][..], 0)
415+
};
416+
if let Some(def_id) = def_id
417+
&& let node =
418+
self.infcx.tcx.hir_node(self.infcx.tcx.local_def_id_to_hir_id(def_id))
419+
&& let Some(fn_sig) = node.fn_sig()
420+
&& let Some(ident) = node.ident()
421+
&& let Some(pos) = args.iter().position(|arg| arg.hir_id == expr.hir_id)
422+
&& let Some(arg) = fn_sig.decl.inputs.get(pos + offset)
423+
{
424+
let mut span: MultiSpan = arg.span.into();
425+
span.push_span_label(
426+
arg.span,
427+
"this parameter takes ownership of the value".to_string(),
428+
);
429+
let descr = match node.fn_kind() {
430+
Some(hir::intravisit::FnKind::ItemFn(..)) | None => "function",
431+
Some(hir::intravisit::FnKind::Method(..)) => "method",
432+
Some(hir::intravisit::FnKind::Closure) => "closure",
415433
};
416-
if let Some(def_id) = def_id
417-
&& let Some(node) = self
418-
.infcx
419-
.tcx
420-
.opt_hir_node(self.infcx.tcx.local_def_id_to_hir_id(def_id))
421-
&& let Some(fn_sig) = node.fn_sig()
422-
&& let Some(ident) = node.ident()
423-
&& let Some(pos) = args.iter().position(|arg| arg.hir_id == expr.hir_id)
424-
&& let Some(arg) = fn_sig.decl.inputs.get(pos + offset)
425-
{
426-
let mut span: MultiSpan = arg.span.into();
427-
span.push_span_label(
428-
arg.span,
429-
"this parameter takes ownership of the value".to_string(),
430-
);
431-
let descr = match node.fn_kind() {
432-
Some(hir::intravisit::FnKind::ItemFn(..)) | None => "function",
433-
Some(hir::intravisit::FnKind::Method(..)) => "method",
434-
Some(hir::intravisit::FnKind::Closure) => "closure",
435-
};
436-
span.push_span_label(ident.span, format!("in this {descr}"));
437-
err.span_note(
438-
span,
439-
format!(
440-
"consider changing this parameter type in {descr} `{ident}` to \
434+
span.push_span_label(ident.span, format!("in this {descr}"));
435+
err.span_note(
436+
span,
437+
format!(
438+
"consider changing this parameter type in {descr} `{ident}` to \
441439
borrow instead if owning the value isn't necessary",
442-
),
443-
);
444-
}
445-
let place = &self.move_data.move_paths[mpi].place;
446-
let ty = place.ty(self.body, self.infcx.tcx).ty;
447-
if let hir::Node::Expr(parent_expr) = parent
448-
&& let hir::ExprKind::Call(call_expr, _) = parent_expr.kind
449-
&& let hir::ExprKind::Path(hir::QPath::LangItem(
450-
LangItem::IntoIterIntoIter,
451-
_,
452-
)) = call_expr.kind
453-
{
454-
// Do not suggest `.clone()` in a `for` loop, we already suggest borrowing.
455-
} else if let UseSpans::FnSelfUse { kind: CallKind::Normal { .. }, .. } =
456-
move_spans
457-
{
458-
// We already suggest cloning for these cases in `explain_captures`.
459-
} else {
460-
self.suggest_cloning(err, ty, expr, move_span);
461-
}
440+
),
441+
);
442+
}
443+
let place = &self.move_data.move_paths[mpi].place;
444+
let ty = place.ty(self.body, self.infcx.tcx).ty;
445+
if let hir::Node::Expr(parent_expr) = parent
446+
&& let hir::ExprKind::Call(call_expr, _) = parent_expr.kind
447+
&& let hir::ExprKind::Path(hir::QPath::LangItem(LangItem::IntoIterIntoIter, _)) =
448+
call_expr.kind
449+
{
450+
// Do not suggest `.clone()` in a `for` loop, we already suggest borrowing.
451+
} else if let UseSpans::FnSelfUse { kind: CallKind::Normal { .. }, .. } = move_spans
452+
{
453+
// We already suggest cloning for these cases in `explain_captures`.
454+
} else {
455+
self.suggest_cloning(err, ty, expr, move_span);
462456
}
463457
}
464458
if let Some(pat) = finder.pat {
@@ -1757,7 +1751,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
17571751
fn_decl: hir::FnDecl { inputs, .. },
17581752
..
17591753
}) = e.kind
1760-
&& let Some(hir::Node::Expr(body)) = self.tcx.opt_hir_node(body.hir_id)
1754+
&& let hir::Node::Expr(body) = self.tcx.hir_node(body.hir_id)
17611755
{
17621756
self.suggest_arg = "this: &Self".to_string();
17631757
if inputs.len() > 0 {
@@ -1823,11 +1817,11 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
18231817
}
18241818
}
18251819

1826-
if let Some(hir::Node::ImplItem(hir::ImplItem {
1820+
if let hir::Node::ImplItem(hir::ImplItem {
18271821
kind: hir::ImplItemKind::Fn(_fn_sig, body_id),
18281822
..
1829-
})) = self.infcx.tcx.opt_hir_node(self.mir_hir_id())
1830-
&& let Some(hir::Node::Expr(expr)) = self.infcx.tcx.opt_hir_node(body_id.hir_id)
1823+
}) = self.infcx.tcx.hir_node(self.mir_hir_id())
1824+
&& let hir::Node::Expr(expr) = self.infcx.tcx.hir_node(body_id.hir_id)
18311825
{
18321826
let mut finder = ExpressionFinder {
18331827
capture_span: *capture_kind_span,
@@ -2395,8 +2389,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
23952389
let proper_span = proper_span.source_callsite();
23962390
if let Some(scope) = self.body.source_scopes.get(source_info.scope)
23972391
&& let ClearCrossCrate::Set(scope_data) = &scope.local_data
2398-
&& let Some(node) = self.infcx.tcx.opt_hir_node(scope_data.lint_root)
2399-
&& let Some(id) = node.body_id()
2392+
&& let Some(id) = self.infcx.tcx.hir_node(scope_data.lint_root).body_id()
24002393
&& let hir::ExprKind::Block(block, _) = self.infcx.tcx.hir().body(id).value.kind
24012394
{
24022395
for stmt in block.stmts {

0 commit comments

Comments
 (0)
Please sign in to comment.