Still debugging race condition

.github/workflows/rust.yml

@@ -35,6 +35,10 @@ jobs:
           key: ${{ runner.os }}-rust-deps-${{ hashFiles('Cargo.lock', 'rust-toolchain.toml') }}
       - name: Flowistry Tests
         run: cargo test -p flowistry_pdg -p flowistry_pdg_construction
+      - name: Async through another layer standalone
+        run: cargo test --test async_tests -- selector_async_through_another_layer
+      - name: Racing tests together
+        run: cargo test --test async_tests -- selector
       - name: Paralegal flow tests
         run: cargo test -p paralegal-flow -p paralegal-spdg
       - name: Paralegal Policy Tests

Cargo.toml

@@ -29,9 +29,9 @@ debug = true
 [replace."rustc_utils:0.7.4-nightly-2023-08-25"]
 # path = "../rustc_plugin/crates/rustc_utils"
 git = "https://github.com/JustusAdam/rustc_plugin"
-rev = "da742667ec1c62e85fab41fb15634f648345469c"
+rev = "6dcee5d8758f8ac456209e95dfa25e03142295f1"
 
 [replace."rustc_plugin:0.7.4-nightly-2023-08-25"]
 # path = "../rustc_plugin/crates/rustc_plugin"
 git = "https://github.com/JustusAdam/rustc_plugin"
-rev = "da742667ec1c62e85fab41fb15634f648345469c"
+rev = "6dcee5d8758f8ac456209e95dfa25e03142295f1"

crates/paralegal-flow/src/test_utils.rs

@@ -5,6 +5,7 @@ extern crate rustc_middle;
 extern crate rustc_span;
 
 use hir::def_id::DefId;
+use rustc_utils::mir::borrowck_facts;
 
 use crate::{
     desc::{Identifier, ProgramDescription},
@@ -241,12 +242,20 @@ impl InlineTestBuilder {
                 .map(ToOwned::to_owned),
             )
             .compile(move |result| {
+                println!(
+                    "MIR cache before test has {} entries",
+                    borrowck_facts::MIR_BODIES.with(|b| b.len())
+                );
                 let tcx = result.tcx;
                 let memo = crate::Callbacks::new(Box::leak(Box::new(args)));
                 let pdg = memo.run(tcx).unwrap();
                 let graph = PreFrg::from_description(pdg);
                 let cref = graph.ctrl(&self.ctrl_name);
-                check(cref)
+                check(cref);
+                println!(
+                    "MIR cache after test has {} entries",
+                    borrowck_facts::MIR_BODIES.with(|b| b.len())
+                );
             });
     }
 }

crates/paralegal-flow/tests/async_tests.rs

@@ -261,7 +261,7 @@ define_test!(markers: graph -> {
 });
 
 #[test]
-fn await_on_generic() {
+fn selector_await_on_generic() {
     InlineTestBuilder::new(stringify!(
         use std::{
             future::{Future},
@@ -354,7 +354,7 @@ fn await_with_inner_generic_constrained() {
 }
 
 #[test]
-fn async_through_another_layer() {
+fn selector_async_through_another_layer() {
     InlineTestBuilder::new(stringify!(
         async fn maker(x: u32, y: u32) -> u32 {
             x