Instrument using $RUSTC_WRAPPER and cargo as a subcommand

analysis/test/Cargo.toml

@@ -7,3 +7,4 @@ edition = "2021"
 
 [dependencies]
 libc = "0.2"
+c2rust-analysis-rt = { path = "../../analysis/runtime"}

dynamic_instrumentation/Cargo.toml

@@ -12,6 +12,15 @@ cargo-util = "0.1"
 indexmap = "1.8"
 lazy_static = "1.4"
 log = "0.4"
+env_logger = "0.9"
+color-eyre = "0.6"
+fs-err = "2"
+clap = { version = "3.2", features = ["derive"] }
+cargo_metadata = "0.15"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+camino = "1.0"
+is_executable = "1.0"
 
 [build-dependencies]
 rustc-private-link = { path = "../rustc-private-link" }

dynamic_instrumentation/src/lib.rs

@@ -15,7 +15,7 @@ extern crate rustc_target;
 mod instrument_memory;
 use instrument_memory::InstrumentMemoryOps;
 
-use cargo::core::compiler::{CompileMode, Context, DefaultExecutor, Executor, Unit};
+use cargo::core::compiler::{CompileMode, Context, Executor, Unit};
 use cargo::core::{PackageId, Target, Verbosity, Workspace};
 use cargo::ops;
 use cargo::ops::CompileOptions;
@@ -48,14 +48,14 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex};
 
 lazy_static! {
-    static ref INSTRUMENTER: InstrumentMemoryOps = InstrumentMemoryOps::new();
+    pub static ref INSTRUMENTER: InstrumentMemoryOps = InstrumentMemoryOps::new();
 }
 
-struct NullCallbacks;
+pub struct NullCallbacks;
 
 impl rustc_driver::Callbacks for NullCallbacks {}
 
-struct MirTransformCallbacks;
+pub struct MirTransformCallbacks;
 
 impl rustc_driver::Callbacks for MirTransformCallbacks {
     fn config(&mut self, config: &mut rustc_interface::Config) {
@@ -132,7 +132,6 @@ pub fn instrument(
     rt_ws.set_target_dir(ws.target_dir());
 
     let exec = Arc::new(InstrumentationExecutor {
-        default: DefaultExecutor,
         target_pkg: ws.current().unwrap().package_id(),
         rt_crate_path: Mutex::new(String::new()),
         building_rt: AtomicBool::new(true),
@@ -151,7 +150,6 @@ pub fn instrument(
     INSTRUMENTER.finalize(metadata_file_path)
 }
 struct InstrumentationExecutor {
-    default: DefaultExecutor,
     target_pkg: PackageId,
     rt_crate_path: Mutex<String>,
     building_rt: AtomicBool,
@@ -166,7 +164,6 @@ impl Executor for InstrumentationExecutor {
                 .unwrap()
                 .to_owned();
         }
-        self.default.init(cx, unit);
     }
 
     fn exec(
@@ -208,7 +205,7 @@ impl Executor for InstrumentationExecutor {
         }
     }
 
-    fn force_rebuild(&self, unit: &Unit) -> bool {
-        self.building_rt.load(Ordering::Relaxed) || self.default.force_rebuild(unit)
+    fn force_rebuild(&self, _unit: &Unit) -> bool {
+        self.building_rt.load(Ordering::Relaxed)
     }
 }