further fixes

Author: ZuseZ4

compiler/rustc_codegen_llvm/src/builder/autodiff.rs

@@ -321,29 +321,29 @@ pub(crate) fn differentiate<'ll>(
 
     // FIXME(ZuseZ4): support SanitizeHWAddress and prevent illegal/unsupported opts
 
-    //if let Some(opt_level) = config.opt_level {
-    //    let opt_stage = match cgcx.lto {
-    //        Lto::Fat => llvm::OptStage::PreLinkFatLTO,
-    //        Lto::Thin | Lto::ThinLocal => llvm::OptStage::PreLinkThinLTO,
-    //        _ if cgcx.opts.cg.linker_plugin_lto.enabled() => llvm::OptStage::PreLinkThinLTO,
-    //        _ => llvm::OptStage::PreLinkNoLTO,
-    //    };
-    //    // This is our second opt call, so now we run all opts,
-    //    // to make sure we get the best performance.
-    //    let skip_size_increasing_opts = false;
-    //    trace!("running Module Optimization after differentiation");
-    //    unsafe {
-    //        llvm_optimize(
-    //            cgcx,
-    //            diag_handler.handle(),
-    //            module,
-    //            config,
-    //            opt_level,
-    //            opt_stage,
-    //            skip_size_increasing_opts,
-    //        )?
-    //    };
-    //}
+    if let Some(opt_level) = config.opt_level {
+        let opt_stage = match cgcx.lto {
+            Lto::Fat => llvm::OptStage::PreLinkFatLTO,
+            Lto::Thin | Lto::ThinLocal => llvm::OptStage::PreLinkThinLTO,
+            _ if cgcx.opts.cg.linker_plugin_lto.enabled() => llvm::OptStage::PreLinkThinLTO,
+            _ => llvm::OptStage::PreLinkNoLTO,
+        };
+        // This is our second opt call, so now we run all opts,
+        // to make sure we get the best performance.
+        let skip_size_increasing_opts = false;
+        trace!("running Module Optimization after differentiation");
+        unsafe {
+            llvm_optimize(
+                cgcx,
+                diag_handler.handle(),
+                module,
+                config,
+                opt_level,
+                opt_stage,
+                skip_size_increasing_opts,
+            )?
+        };
+    }
     trace!("done with differentiate()");
 
     Ok(())

compiler/rustc_codegen_llvm/src/llvm/enzyme_ffi.rs

@@ -12,6 +12,8 @@ extern "C" {
     pub fn LLVMRustDIGetInstMetadata(I: &Value) -> Option<&Metadata>;
     pub fn LLVMRustEraseInstFromParent(V: &Value);
     pub fn LLVMRustGetTerminator<'a>(B: &BasicBlock) -> &'a Value;
+    pub fn LLVMDumpModule(M: &Module);
+    pub fn LLVMDumpValue(V: &Value);
     pub fn LLVMRustVerifyFunction(V: &Value, action: LLVMRustVerifierFailureAction) -> Bool;
 
     pub fn LLVMGetFunctionCallConv(F: &Value) -> c_uint;

compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp

@@ -964,7 +964,7 @@ extern "C" void LLVMRustEraseInstBefore(LLVMBasicBlockRef bb, LLVMValueRef I) {
   // Make sure we found the Instruction.
   assert(It != BB.end());
   // We don't want to erase the instruction itself.
-  It--;
+  //It--;
   // Delete in rev order to ensure no dangling references.
   while (It != BB.begin()) {
     auto Prev = std::prev(It);