Single-compile testing framework

Cargo.toml

@@ -29,7 +29,5 @@ debug = true
 # "rustc_utils:0.7.4-nightly-2023-08-25" = { path = "../rustc_plugin/crates/rustc_utils" }
 # "rustc_plugin:0.7.4-nightly-2023-08-25" = { path = "../rustc_plugin/crates/rustc_plugin" }
 
-"rustc_utils:0.7.4-nightly-2023-08-25" = { git = "https://github.com/JustusAdam/rustc_plugin", rev = "aa83f5740fa7eb5b8e3e1ee417b29536e87cc864", features = [
-    "indexical",
-] }
-"rustc_plugin:0.7.4-nightly-2023-08-25" = { git = "https://github.com/JustusAdam/rustc_plugin", rev = "aa83f5740fa7eb5b8e3e1ee417b29536e87cc864" }
+"rustc_utils:0.7.4-nightly-2023-08-25" = { git = "https://github.com/JustusAdam/rustc_plugin", rev = "d4fefb5c0344cdf4812b4877d5b03cb19a2c4672" }
+"rustc_plugin:0.7.4-nightly-2023-08-25" = { git = "https://github.com/JustusAdam/rustc_plugin", rev = "d4fefb5c0344cdf4812b4877d5b03cb19a2c4672" }

crates/flowistry_pdg_construction/tests/pdg.rs

@@ -17,7 +17,9 @@ use rustc_middle::{
     mir::{Terminator, TerminatorKind},
     ty::TyCtxt,
 };
-use rustc_utils::{mir::borrowck_facts, source_map::find_bodies::find_bodies};
+use rustc_utils::{
+    mir::borrowck_facts, source_map::find_bodies::find_bodies, test_utils::CompileResult,
+};
 
 fn get_main(tcx: TyCtxt<'_>) -> LocalDefId {
     find_bodies(tcx)
@@ -36,7 +38,7 @@ fn pdg(
     tests: impl for<'tcx> FnOnce(TyCtxt<'tcx>, DepGraph<'tcx>) + Send,
 ) {
     let _ = env_logger::try_init();
-    rustc_utils::test_utils::compile(input, move |tcx| {
+    rustc_utils::test_utils::CompileBuilder::new(input).compile(move |CompileResult { tcx }| {
         let def_id = get_main(tcx);
         let params = configure(tcx, PdgParams::new(tcx, def_id).unwrap());
         let pdg = flowistry_pdg_construction::compute_pdg(params);

crates/paralegal-flow/Cargo.toml

@@ -9,7 +9,7 @@ description = "Extractor for precise semantic PDGs from rust code."
 rustc_private = true
 
 [features]
-test = []
+test = ["rustc_utils/test"]
 
 [dependencies]
 paralegal-spdg = { path = "../paralegal-spdg", features = ["rustc"] }

crates/paralegal-flow/src/args.rs

@@ -374,6 +374,22 @@ impl Args {
     pub fn attach_to_debugger(&self) -> Option<Debugger> {
         self.attach_to_debugger
     }
+
+    pub fn setup_logging(&self) {
+        let lvl = self.verbosity();
+        // //let lvl = log::LevelFilter::Debug;
+        if simple_logger::SimpleLogger::new()
+            .with_level(lvl)
+            .with_module_level("flowistry", lvl)
+            .with_module_level("rustc_utils", log::LevelFilter::Error)
+            .without_timestamps()
+            .init()
+            .is_ok()
+            && matches!(*self.direct_debug(), LogLevelConfig::Targeted(..))
+        {
+            log::set_max_level(log::LevelFilter::Warn);
+        }
+    }
 }
 
 #[derive(serde::Serialize, serde::Deserialize, clap::Args, Default)]

crates/paralegal-flow/src/lib.rs

@@ -350,17 +350,8 @@ impl rustc_plugin::RustcPlugin for DfppPlugin {
             return rustc_driver::RunCompiler::new(&compiler_args, &mut NoopCallbacks {}).run();
         }
 
-        let lvl = plugin_args.verbosity();
-        // //let lvl = log::LevelFilter::Debug;
-        simple_logger::SimpleLogger::new()
-            .with_level(lvl)
-            //.with_module_level("flowistry", lvl)
-            .with_module_level("rustc_utils", log::LevelFilter::Error)
-            .init()
-            .unwrap();
-        if matches!(*plugin_args.direct_debug(), LogLevelConfig::Targeted(..)) {
-            log::set_max_level(log::LevelFilter::Warn);
-        }
+        plugin_args.setup_logging();
+
         let opts = Box::leak(Box::new(plugin_args));
 
         const RERUN_VAR: &str = "RERUN_WITH_PROFILER";

crates/paralegal-flow/src/test_utils.rs

@@ -167,6 +167,89 @@ macro_rules! define_flow_test_template {
     };
 }
 
+/// Builder for running test cases against a string of source code.
+///
+/// Start with [`InlineTestBuilder::new`], compile and run the test case with
+/// [`InlineTestBuilder::check`].
+pub struct InlineTestBuilder {
+    ctrl_name: String,
+    input: String,
+}
+
+impl InlineTestBuilder {
+    /// Constructor.
+    ///
+    /// Note that this test builder does not support specifying dependencies,
+    /// including the `paralegal` library. As such use raw annotations like
+    /// `#[paralegal_flow::marker(...)]`.
+    ///
+    /// By default a `main` function is used as the analysis target (even
+    /// without an `analyze` annotation). Use
+    /// [`InlineTestBuilder::with_entrypoint`] to use a different function.
+    pub fn new(input: impl Into<String>) -> Self {
+        Self {
+            input: input.into(),
+            ctrl_name: "main".into(),
+        }
+    }
+
+    /// Chose a function as analysis entrypoint. Overwrites any previous choice
+    /// without warning.
+    pub fn with_entrypoint(&mut self, name: impl Into<String>) -> &mut Self {
+        self.ctrl_name = name.into();
+        self
+    }
+
+    /// Compile the code, select the [`CtrlRef`] corresponding to the configured
+    /// entrypoint and hand it to the `check` function which should contain the
+    /// test predicate.
+    pub fn check(&self, check: impl FnOnce(CtrlRef) + Send) {
+        use clap::Parser;
+
+        #[derive(clap::Parser)]
+        struct TopLevelArgs {
+            #[clap(flatten)]
+            args: crate::ClapArgs,
+        }
+
+        let args = crate::Args::try_from(
+            TopLevelArgs::parse_from([
+                "".into(),
+                "--analyze".into(),
+                format!(
+                    "{}::{}",
+                    rustc_utils::test_utils::DUMMY_MOD_NAME,
+                    self.ctrl_name
+                ),
+            ])
+            .args,
+        )
+        .unwrap();
+
+        args.setup_logging();
+
+        rustc_utils::test_utils::CompileBuilder::new(&self.input)
+            .with_args(
+                [
+                    "--cfg",
+                    "paralegal",
+                    "-Zcrate-attr=feature(register_tool)",
+                    "-Zcrate-attr=register_tool(paralegal_flow)",
+                ]
+                .into_iter()
+                .map(ToOwned::to_owned),
+            )
+            .compile(move |result| {
+                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)
+            });
+    }
+}
+
 pub trait HasGraph<'g>: Sized + Copy {
     fn graph(self) -> &'g PreFrg;
 
@@ -264,14 +347,18 @@ impl PreFrg {
                 crate::consts::FLOW_GRAPH_OUT_NAME
             ))
             .unwrap();
-            let name_map = desc
-                .def_info
-                .iter()
-                .map(|(def_id, info)| (info.name, *def_id))
-                .into_group_map();
-            Self { desc, name_map }
+            Self::from_description(desc)
         })
     }
+
+    pub fn from_description(desc: ProgramDescription) -> Self {
+        let name_map = desc
+            .def_info
+            .iter()
+            .map(|(def_id, info)| (info.name, *def_id))
+            .into_group_map();
+        Self { desc, name_map }
+    }
 }
 
 #[derive(Clone)]