Fix issue w/ get_body_with_borrowck_facts. Release v0.14.2

willcrichton · willcrichton · commit 9e6e7c5b85cf · 2025-09-22T18:52:38.000-04:00
diff --git a/crates/rustc_plugin/Cargo.toml b/crates/rustc_plugin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rustc_plugin"
-version = "0.14.1-nightly-2025-08-20"
+version = "0.14.2-nightly-2025-08-20"
 edition = "2024"
 authors = ["Will Crichton <crichton.will@gmail.com>"]
 description = "A framework for writing plugins that integrate with the Rust compiler"
diff --git a/crates/rustc_plugin/src/driver.rs b/crates/rustc_plugin/src/driver.rs
@@ -2,13 +2,13 @@ use std::{
   env,
   ops::Deref,
   path::{Path, PathBuf},
-  process::{exit, Command},
+  process::{Command, exit},
 };
 
-use rustc_session::{config::ErrorOutputType, EarlyDiagCtxt};
+use rustc_session::{EarlyDiagCtxt, config::ErrorOutputType};
 use rustc_tools_util::VersionInfo;
 
-use super::plugin::{RustcPlugin, PLUGIN_ARGS};
+use super::plugin::{PLUGIN_ARGS, RustcPlugin};
 use crate::cli::{RUN_ON_ALL_CRATES, SPECIFIC_CRATE, SPECIFIC_TARGET};
 
 /// If a command-line option matches `find_arg`, then apply the predicate `pred` on its value. If
diff --git a/crates/rustc_plugin/src/plugin.rs b/crates/rustc_plugin/src/plugin.rs
@@ -1,7 +1,7 @@
 use std::{borrow::Cow, path::PathBuf, process::Command};
 
 use cargo_metadata::camino::Utf8Path;
-use serde::{de::DeserializeOwned, Serialize};
+use serde::{Serialize, de::DeserializeOwned};
 
 /// Specification of a set of crates.
 pub enum CrateFilter {
diff --git a/crates/rustc_plugin/tests/test_example.rs b/crates/rustc_plugin/tests/test_example.rs
@@ -1,6 +1,6 @@
 use std::{env, fs, path::Path, process::Command, sync::Once};
 
-use anyhow::{ensure, Context, Result};
+use anyhow::{Context, Result, ensure};
 
 static SETUP: Once = Once::new();
 
diff --git a/crates/rustc_utils/Cargo.toml b/crates/rustc_utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rustc_utils"
-version = "0.14.1-nightly-2025-08-20"
+version = "0.14.2-nightly-2025-08-20"
 edition = "2024"
 authors = ["Will Crichton <crichton.will@gmail.com>"]
 description = "Utilities for working with the Rust compiler"
@@ -27,7 +27,7 @@ serde = { version = "1", features = ["derive"], optional = true }
 textwrap = { version = "0.16", optional = true }
 regex = { version = "1", optional = true }
 ts-rs = { version = "7", optional = true }
-indexical = { version = "0.9.0", default-features = false, features = ["rustc"], optional = true }
+indexical = { version = "0.9.3", default-features = false, features = ["rustc"], optional = true }
 
 [dev-dependencies]
 rustc_utils = { path = ".", features = ["test"] }
diff --git a/crates/rustc_utils/src/cache.rs b/crates/rustc_utils/src/cache.rs
@@ -73,6 +73,12 @@ where
   pub fn len(&self) -> usize {
     self.0.borrow().len()
   }
+
+  /// Returns true if the cache contains the key.
+  pub fn contains_key(&self, key: &In) -> bool {
+    self.0.borrow().contains_key(key)
+  }
+
   /// Returns the cached value for the given key, or runs `compute` if
   /// the value is not in cache.
   ///
@@ -84,6 +90,7 @@ where
       .get_maybe_recursive(key, compute)
       .unwrap_or_else(recursion_panic)
   }
+
   /// Returns the cached value for the given key, or runs `compute` if
   /// the value is not in cache.
   ///
@@ -112,7 +119,9 @@ where
 }
 
 fn recursion_panic<A>() -> A {
-  panic!("Recursion detected! The computation of a value tried to retrieve the same from the cache. Using `get_maybe_recursive` to handle this case gracefully.")
+  panic!(
+    "Recursion detected! The computation of a value tried to retrieve the same from the cache. Using `get_maybe_recursive` to handle this case gracefully."
+  )
 }
 
 impl<In, Out> Default for Cache<In, Out> {
diff --git a/crates/rustc_utils/src/hir/ty.rs b/crates/rustc_utils/src/hir/ty.rs
@@ -60,7 +60,7 @@ mod test {
   use rustc_middle::ty::TypingEnv;
 
   use super::TyExt;
-  use crate::{test_utils, BodyExt};
+  use crate::{BodyExt, test_utils};
 
   #[test]
   fn test_ty_ext() {
diff --git a/crates/rustc_utils/src/mir/body.rs b/crates/rustc_utils/src/mir/body.rs
@@ -6,14 +6,14 @@ use std::{
   process::{Command, Stdio},
 };
 
-use anyhow::{ensure, Result};
+use anyhow::{Result, ensure};
 use pretty::PrettyPrintMirOptions;
 use rustc_data_structures::fx::FxHashMap as HashMap;
-use rustc_hir::{def_id::DefId, CoroutineDesugaring, CoroutineKind, HirId};
+use rustc_hir::{CoroutineDesugaring, CoroutineKind, HirId, def_id::DefId};
 use rustc_middle::{
   mir::{
-    pretty, pretty::write_mir_fn, BasicBlock, Body, Local, Location, Place, SourceInfo,
-    TerminatorKind, VarDebugInfoContents,
+    BasicBlock, Body, Local, Location, Place, SourceInfo, TerminatorKind,
+    VarDebugInfoContents, pretty, pretty::write_mir_fn,
   },
   ty::{Region, Ty, TyCtxt},
 };
diff --git a/crates/rustc_utils/src/mir/borrowck_facts.rs b/crates/rustc_utils/src/mir/borrowck_facts.rs
@@ -112,18 +112,23 @@ fn mir_borrowck(
 ///
 /// Note that as of May 2022, Polonius can be *very* slow for large functions.
 /// It may take up to 30 seconds to analyze a single body with a large CFG.
-#[allow(clippy::needless_lifetimes)]
-pub fn get_body_with_borrowck_facts(
-  tcx: TyCtxt<'_>,
+pub fn get_body_with_borrowck_facts<'tcx>(
+  tcx: TyCtxt<'tcx>,
   def_id: LocalDefId,
-) -> &BodyWithBorrowckFacts<'_> {
-  let _ = tcx.mir_borrowck(def_id);
+) -> &'tcx BodyWithBorrowckFacts<'tcx> {
   MIR_BODIES.with(|cache| {
+    // Note: as of nightly-2025-08-20, get_bodies_with_borrowck_facts also returns the bodies for children
+    // of a checked body. We have to handle the case where the parent of the current `def_id` was checked,
+    // or else rustc panics about a stolen body. Hence, we check for whether the cache contains the key already.
+    if !cache.contains_key(&def_id) {
+      let _ = tcx.mir_borrowck(def_id);
+    }
+
     let body = cache.get(&def_id, |_| panic!("mir_borrowck override should have stored body for item: {def_id:?}. Are you sure you registered borrowck_facts::override_queries?"));
     unsafe {
       std::mem::transmute::<
-        &BodyWithBorrowckFacts<'static>,
-        &BodyWithBorrowckFacts<'_>,
+        &'_ BodyWithBorrowckFacts<'static>,
+        &'tcx BodyWithBorrowckFacts<'tcx>,
       >(body)
     }
   })
diff --git a/crates/rustc_utils/src/mir/control_dependencies.rs b/crates/rustc_utils/src/mir/control_dependencies.rs
@@ -9,12 +9,12 @@
 use std::fmt;
 
 use rustc_data_structures::graph::{
-  dominators, dominators::Dominators, iterate, vec_graph::VecGraph, ControlFlowGraph,
-  DirectedGraph, Predecessors, StartNode, Successors,
+  ControlFlowGraph, DirectedGraph, Predecessors, StartNode, Successors, dominators,
+  dominators::Dominators, iterate, vec_graph::VecGraph,
 };
 use rustc_index::{
-  bit_set::{DenseBitSet, MixedBitSet, SparseBitMatrix},
   Idx,
+  bit_set::{DenseBitSet, MixedBitSet, SparseBitMatrix},
 };
 use smallvec::SmallVec;
 
@@ -206,7 +206,7 @@ mod test {
   use rustc_middle::mir::Location;
   use test_log::test;
 
-  use crate::{test_utils, BodyExt};
+  use crate::{BodyExt, test_utils};
 
   #[test]
   fn test_control_dependencies() {
diff --git a/crates/rustc_utils/src/mir/location_or_arg.rs b/crates/rustc_utils/src/mir/location_or_arg.rs
@@ -42,7 +42,7 @@ impl From<Local> for LocationOrArg {
 
 #[cfg(feature = "indexical")]
 pub mod index {
-  use indexical::{bitset::rustc::IndexSet, define_index_type, IndexedDomain, ToIndex};
+  use indexical::{IndexedDomain, ToIndex, bitset::rustc::IndexSet, define_index_type};
 
   use super::*;
 
diff --git a/crates/rustc_utils/src/mir/place.rs b/crates/rustc_utils/src/mir/place.rs
@@ -9,9 +9,9 @@ use rustc_hir::def_id::DefId;
 use rustc_infer::infer::TyCtxtInferExt;
 use rustc_middle::{
   mir::{
-    visit::{PlaceContext, Visitor},
     Body, HasLocalDecls, Local, Location, Mutability, Place, PlaceElem, PlaceRef,
-    ProjectionElem, VarDebugInfo, VarDebugInfoContents, RETURN_PLACE,
+    ProjectionElem, RETURN_PLACE, VarDebugInfo, VarDebugInfoContents,
+    visit::{PlaceContext, Visitor},
   },
   traits::ObligationCause,
   ty::{self, AdtKind, Region, RegionKind, RegionVid, Ty, TyCtxt, TyKind, TypeVisitor},
@@ -643,8 +643,8 @@ mod test {
   };
 
   use crate::{
-    test_utils::{self, compare_sets, Placer},
     BodyExt, PlaceExt,
+    test_utils::{self, Placer, compare_sets},
   };
 
   #[test]
diff --git a/crates/rustc_utils/src/source_map/find_bodies.rs b/crates/rustc_utils/src/source_map/find_bodies.rs
@@ -1,9 +1,9 @@
 use log::trace;
-use rustc_hir::{intravisit::Visitor, BodyId};
+use rustc_hir::{BodyId, intravisit::Visitor};
 use rustc_middle::{hir::nested_filter::OnlyBodies, ty::TyCtxt};
 use rustc_span::Span;
 
-use crate::{block_timer, SpanExt};
+use crate::{SpanExt, block_timer};
 
 struct BodyFinder<'tcx> {
   tcx: TyCtxt<'tcx>,
diff --git a/crates/rustc_utils/src/source_map/range.rs b/crates/rustc_utils/src/source_map/range.rs
@@ -3,15 +3,15 @@ use std::{
   path::PathBuf, sync::Arc,
 };
 
-use anyhow::{bail, ensure, Context, Result};
+use anyhow::{Context, Result, bail, ensure};
 use rustc_data_structures::fx::FxHashMap as HashMap;
 use rustc_hir::{
-  intravisit::{self, Visitor},
   BodyId,
+  intravisit::{self, Visitor},
 };
 use rustc_index::IndexVec;
 use rustc_middle::ty::TyCtxt;
-use rustc_span::{source_map::SourceMap, FileName, RealFileName, SourceFile, Span};
+use rustc_span::{FileName, RealFileName, SourceFile, Span, source_map::SourceMap};
 #[cfg(feature = "serde")]
 use serde::Serialize;
 #[cfg(feature = "ts-rs")]
diff --git a/crates/rustc_utils/src/source_map/span.rs b/crates/rustc_utils/src/source_map/span.rs
@@ -2,7 +2,7 @@ use std::cmp;
 
 use log::trace;
 use rustc_middle::ty::TyCtxt;
-use rustc_span::{source_map::SourceMap, BytePos, Pos, Span, SpanData, SyntaxContext};
+use rustc_span::{BytePos, Pos, Span, SpanData, SyntaxContext, source_map::SourceMap};
 
 /// Extension trait for [`Span`].
 pub trait SpanExt {
diff --git a/crates/rustc_utils/src/source_map/spanner/hir_span.rs b/crates/rustc_utils/src/source_map/spanner/hir_span.rs
@@ -1,8 +1,7 @@
 use hir::{HirId, LoopSource};
 use rustc_hir::{
-  self as hir,
+  self as hir, ExprKind, MatchSource, Node,
   intravisit::{self, Visitor as HirVisitor},
-  ExprKind, MatchSource, Node,
 };
 use rustc_span::{BytePos, Span};
 
diff --git a/crates/rustc_utils/src/source_map/spanner/mir_span.rs b/crates/rustc_utils/src/source_map/spanner/mir_span.rs
@@ -1,19 +1,18 @@
 use either::Either;
 use log::trace;
 use rustc_middle::mir::{
-  self,
+  self, Body, FakeReadCause, HasLocalDecls, Place, RETURN_PLACE, Statement,
+  StatementKind, Terminator, TerminatorKind,
   visit::{
     MutatingUseContext, NonMutatingUseContext, NonUseContext, PlaceContext,
     Visitor as MirVisitor,
   },
-  Body, FakeReadCause, HasLocalDecls, Place, Statement, StatementKind, Terminator,
-  TerminatorKind, RETURN_PLACE,
 };
 use rustc_span::SpanData;
-use smallvec::{smallvec, SmallVec};
+use smallvec::{SmallVec, smallvec};
 
 use super::Spanner;
-use crate::{mir::location_or_arg::LocationOrArg, BodyExt, PlaceExt, SpanExt};
+use crate::{BodyExt, PlaceExt, SpanExt, mir::location_or_arg::LocationOrArg};
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct MirSpannedPlace<'tcx> {
diff --git a/crates/rustc_utils/src/source_map/spanner/span_tree.rs b/crates/rustc_utils/src/source_map/spanner/span_tree.rs
@@ -1,5 +1,5 @@
 use intervaltree::IntervalTree;
-use rustc_span::{source_map::Spanned, BytePos, SpanData};
+use rustc_span::{BytePos, SpanData, source_map::Spanned};
 
 /// Interval tree data structure specialized to spans.
 pub struct SpanTree<T> {
diff --git a/crates/rustc_utils/src/test_utils.rs b/crates/rustc_utils/src/test_utils.rs
@@ -10,7 +10,7 @@ use std::{
   sync::{Arc, LazyLock},
 };
 
-use anyhow::{anyhow, ensure, Context, Result};
+use anyhow::{Context, Result, anyhow, ensure};
 use log::debug;
 use rustc_abi::{FieldIdx, VariantIdx};
 use rustc_borrowck::consumers::BodyWithBorrowckFacts;
@@ -24,13 +24,13 @@ use rustc_middle::{
 use rustc_span::source_map::FileLoader;
 
 use crate::{
+  BodyExt, PlaceExt,
   mir::borrowck_facts,
   source_map::{
     filename::{Filename, FilenameIndex},
     find_bodies::{find_bodies, find_enclosing_bodies},
     range::{BytePos, ByteRange, CharPos, CharRange, ToSpan},
   },
-  BodyExt, PlaceExt,
 };
 
 pub struct StringLoader(pub String);
@@ -132,7 +132,7 @@ impl CompileBuilder {
 pub fn compile_body(
   input: impl Into<String>,
   callback: impl for<'tcx> FnOnce(TyCtxt<'tcx>, BodyId, &'tcx BodyWithBorrowckFacts<'tcx>)
-    + Send,
+  + Send,
 ) {
   CompileBuilder::new(input).compile(|result| {
     let (body_id, body_with_facts) = result.as_body();
@@ -376,8 +376,8 @@ impl<'tcx> PlaceBuilder<'_, 'tcx> {
 }
 
 pub fn compare_sets<T: PartialEq + Eq + Clone + Hash + Debug>(
-  expected: impl IntoIterator<Item = T>,
   actual: impl IntoIterator<Item = T>,
+  expected: impl IntoIterator<Item = T>,
 ) {
   let expected = expected.into_iter().collect::<HashSet<_>>();
   let actual = actual.into_iter().collect::<HashSet<_>>();
