Update to nightly-2024-01-06

Cargo.toml

@@ -4,8 +4,8 @@ exclude = ["ide/src/tests/mock_project"]
 resolver = "2"
 
 [workspace.dependencies]
-rustc_plugin = "=0.7.3-nightly-2023-08-25"
-rustc_utils = {version = "=0.7.3-nightly-2023-08-25", features = ["indexical"]}
+rustc_plugin = "=0.8.0-nightly-2024-01-06"
+rustc_utils = {version = "=0.8.0-nightly-2024-01-06", features = ["indexical"]}
 indexical = {version = "0.3.1", default-features = false, features = ["rustc"]}
 
 [profile.bench]

crates/flowistry/examples/example.rs

@@ -96,7 +96,7 @@ impl rustc_driver::Callbacks for Callbacks {
     config.override_queries = Some(borrowck_facts::override_queries);
   }
 
-  fn after_parsing<'tcx>(
+  fn after_crate_root_parsing<'tcx>(
     &mut self,
     _compiler: &rustc_interface::interface::Compiler,
     queries: &'tcx rustc_interface::Queries<'tcx>,

crates/flowistry/src/infoflow/analysis.rs

@@ -8,7 +8,7 @@ use rustc_middle::{
   mir::{visit::Visitor, *},
   ty::TyCtxt,
 };
-use rustc_mir_dataflow::{Analysis, AnalysisDomain, Forward};
+use rustc_mir_dataflow::{Analysis, AnalysisDomain};
 use rustc_utils::{
   mir::{
     control_dependencies::ControlDependencies,
@@ -233,7 +233,7 @@ impl<'a, 'tcx> FlowAnalysis<'a, 'tcx> {
 
 impl<'a, 'tcx> AnalysisDomain<'tcx> for FlowAnalysis<'a, 'tcx> {
   type Domain = FlowDomain<'tcx>;
-  type Direction = Forward;
+
   const NAME: &'static str = "FlowAnalysis";
 
   fn bottom_value(&self, _body: &Body<'tcx>) -> Self::Domain {

crates/flowistry/src/infoflow/mod.rs

@@ -83,11 +83,6 @@ pub fn compute_flow<'a, 'tcx>(
 ) -> FlowResults<'a, 'tcx> {
   BODY_STACK.with(|body_stack| {
     body_stack.borrow_mut().push(body_id);
-    debug!(
-      "{}",
-      rustc_hir_pretty::to_string(rustc_hir_pretty::NO_ANN, |s| s
-        .print_expr(tcx.hir().body(body_id).value))
-    );
     debug!("{}", body_with_facts.body.to_string(tcx).unwrap());
 
     let def_id = tcx.hir().body_owner_def_id(body_id).to_def_id();

crates/flowistry/src/infoflow/recursive.rs

@@ -43,7 +43,7 @@ impl<'tcx> FlowAnalysis<'_, 'tcx> {
       }
     };
 
-    let def_id = match func.literal.ty().kind() {
+    let def_id = match func.const_.ty().kind() {
       TyKind::FnDef(def_id, _) => def_id,
       _ => {
         debug!("  Func is not a FnDef");
@@ -80,7 +80,7 @@ impl<'tcx> FlowAnalysis<'_, 'tcx> {
       }
     };
 
-    let unsafety = tcx.unsafety_check_result(def_id.expect_local());
+    let unsafety = tcx.mir_unsafety_check_result(def_id.expect_local());
     if !unsafety.used_unsafe_blocks.is_empty() {
       debug!("  Func contains unsafe blocks");
       return false;

crates/flowistry/src/mir/aliases.rs

@@ -63,6 +63,7 @@ pub struct Aliases<'a, 'tcx> {
 }
 
 rustc_index::newtype_index! {
+  #[orderable]
   #[debug_format = "rs{}"]
   struct RegionSccIndex {}
 }
@@ -83,7 +84,7 @@ impl<'a, 'tcx> Aliases<'a, 'tcx> {
   }
 
   /// Alternative constructor if you need to filter out certain borrowck facts.
-  /// 
+  ///
   /// Just use [`Aliases::build`] unless you know what you're doing.
   pub fn build_with_fact_selection(
     tcx: TyCtxt<'tcx>,

crates/flowistry/src/mir/engine.rs

@@ -36,12 +36,12 @@ pub struct AnalysisResults<'tcx, A: Analysis<'tcx>> {
   /// The underlying analysis that was used to generate the results.
   pub analysis: A,
   location_domain: Rc<LocationOrArgDomain>,
-  state: IndexVec<LocationOrArgIndex, A::Domain>,
+  state: IndexVec<LocationOrArgIndex, Rc<A::Domain>>,
 }
 
 impl<'tcx, A: Analysis<'tcx>> AnalysisResults<'tcx, A> {
   /// Same as [`rustc_mir_dataflow::Results::visit_reachable_with`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_mir_dataflow/struct.Results.html#method.visit_reachable_with).
-  pub fn visit_reachable_with<'mir, V>(&self, body: &'mir Body<'tcx>, visitor: &mut V)
+  pub fn visit_reachable_with<'mir, V>(&mut self, body: &'mir Body<'tcx>, visitor: &mut V)
   where
     V: ResultsVisitor<'mir, 'tcx, Self, FlowState = A::Domain>,
   {
@@ -52,23 +52,23 @@ impl<'tcx, A: Analysis<'tcx>> AnalysisResults<'tcx, A> {
           statement_index,
         };
         let loc_index = location.to_index(&self.location_domain);
-        let state = &self.state[loc_index];
+        let state = Rc::clone(&self.state[loc_index]);
 
         if statement_index == 0 {
-          visitor.visit_block_start(self, state, data, block);
+          visitor.visit_block_start(&state);
         }
 
         if statement_index == data.statements.len() {
           visitor.visit_terminator_after_primary_effect(
             self,
-            state,
+            &state,
             data.terminator(),
             location,
           )
         } else {
           visitor.visit_statement_after_primary_effect(
             self,
-            state,
+            &state,
             &data.statements[statement_index],
             location,
           )
@@ -148,6 +148,8 @@ pub fn iterate_to_fixpoint<'tcx, A: Analysis<'tcx>>(
     }
   }
 
+  let state = state.into_iter().map(Rc::new).collect();
+
   AnalysisResults {
     analysis,
     location_domain,

crates/flowistry/src/mir/placeinfo.rs

@@ -227,7 +227,7 @@ impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for LoanCollector<'_, 'tcx> {
       RegionKind::ReStatic => RegionVid::from_usize(0),
       // TODO: do we need to handle bound regions?
       // e.g. shows up with closures, for<'a> ...
-      RegionKind::ReErased | RegionKind::ReLateBound(_, _) => {
+      RegionKind::ReErased | RegionKind::ReBound(..) => {
         return ControlFlow::Continue(());
       }
       _ => unreachable!("{region:?}"),

crates/flowistry_ide/src/spans.rs

@@ -18,24 +18,24 @@ struct Callbacks {
 }
 
 impl rustc_driver::Callbacks for Callbacks {
-  fn after_parsing<'tcx>(
+  fn after_crate_root_parsing<'tcx>(
     &mut self,
-    compiler: &rustc_interface::interface::Compiler,
+    _compiler: &rustc_interface::interface::Compiler,
     queries: &'tcx rustc_interface::Queries<'tcx>,
   ) -> rustc_driver::Compilation {
     queries.global_ctxt().unwrap().enter(|tcx| {
       let spans = find_bodies(tcx).into_iter().map(|(span, _)| span);
 
       self.output = Some((|| {
-        let source_map = compiler.session().source_map();
+        let source_map = tcx.sess.source_map();
         let source_file = Filename::intern(&self.filename)
           .find_source_file(source_map)
           .map_err(|_| FlowistryError::FileNotFound)?;
 
         let spans = spans
           .into_iter()
           .filter(|span| {
-            source_map.lookup_source_file(span.lo()).name_hash == source_file.name_hash
+            source_map.lookup_source_file(span.lo()).name == source_file.name
           })
           .filter_map(|span| CharRange::from_span(span, source_map).ok())
           .collect::<Vec<_>>();

crates/flowistry_ifc/src/lib.rs

@@ -86,7 +86,7 @@ impl rustc_driver::Callbacks for Callbacks {
     config.override_queries = Some(borrowck_facts::override_queries);
   }
 
-  fn after_parsing<'tcx>(
+  fn after_crate_root_parsing<'tcx>(
     &mut self,
     _compiler: &rustc_interface::interface::Compiler,
     queries: &'tcx rustc_interface::Queries<'tcx>,

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2023-08-25"
+channel = "nightly-2024-01-06"
 components = ["rust-src", "rustc-dev", "llvm-tools-preview"]