working

Author: ZuseZ4

compiler/rustc_codegen_llvm/src/back/lto.rs

@@ -522,9 +522,9 @@ fn thin_lto(
     }
 }
 
-fn enable_autodiff_settings(ad: &[config::AutoDiff]) {
-    use crate::llvm::EnzymeWrapper;
-    let enzyme = EnzymeWrapper::current();
+fn enable_autodiff_settings(cgcx: &CodegenContext<LlvmCodegenBackend>, ad: &[config::AutoDiff]) {
+    use rustc_codegen_ssa::back::write::EnzymeWrapper;
+    let enzyme = rustc_codegen_ssa::back::write::EnzymeWrapper::current(cgcx);
     for val in ad {
         // We intentionally don't use a wildcard, to not forget handling anything new.
         match val {
@@ -603,7 +603,7 @@ pub(crate) fn run_pass_manager(
     };
 
     if enable_ad {
-        enable_autodiff_settings(&config.autodiff);
+        enable_autodiff_settings(&cgcx, &config.autodiff);
     }
 
     unsafe {

compiler/rustc_codegen_llvm/src/back/write.rs

@@ -665,8 +665,8 @@ pub(crate) unsafe fn llvm_optimize(
 
     let llvm_plugins = config.llvm_plugins.join(",");
 
-    let enzyme_fn = if run_enzyme {
-        let wrapper = crate::llvm::EnzymeWrapper::current();
+    let enzyme_fn = if consider_ad {
+        let wrapper = rustc_codegen_ssa::back::write::EnzymeWrapper::current(cgcx);
         wrapper.lock().unwrap().registerEnzymeAndPassPipeline
     } else {
         //dbg!(run_enzyme);

compiler/rustc_codegen_llvm/src/context.rs

@@ -834,7 +834,6 @@ impl<'ll, 'tcx> MiscCodegenMethods<'tcx> for CodegenCx<'ll, 'tcx> {
     }
 
     fn sess(&self) -> &Session {
-        let _enzyme = crate::llvm::EnzymeWrapper::set_path(self.tcx.sess);
         self.tcx.sess
     }