fixing rebase issues, updating enzyme submodule

Author: ZuseZ4

compiler/rustc_monomorphize/src/partitioning.rs

@@ -1159,9 +1159,10 @@ fn collect_and_partition_mono_items(tcx: TyCtxt<'_>, (): ()) -> (&DefIdSet, &[Au
 
             let target_symbol =
                 symbol_name_for_instance_in_crate(tcx, instance.clone(), LOCAL_CRATE);
-            let range = usage_map.index.get(&item).unwrap();
+            //let range = usage_map.used_map.get(&item).unwrap();
+            //TODO: check if last and next line are correct after rebasing
 
-            let source = usage_map.targets[range.clone()]
+            let source = usage_map.get_user_items(*item)
                 .into_iter()
                 .filter_map(|item| match *item {
                     MonoItem::Fn(ref instance_s) => {

src/bootstrap/src/core/build_steps/compile.rs

@@ -1608,12 +1608,12 @@ impl Step for Assemble {
         };
 
         if let Some(enzyme_install) = enzyme_install {
-            let src_lib = enzyme_install.join("build/Enzyme/LLVMEnzyme-16.so");
+            let src_lib = enzyme_install.join("build/Enzyme/LLVMEnzyme-17.so");
 
             let libdir = builder.sysroot_libdir(build_compiler, build_compiler.host);
             let target_libdir = builder.sysroot_libdir(target_compiler, target_compiler.host);
-            let dst_lib = libdir.join("libLLVMEnzyme-16.so");
-            let target_dst_lib = target_libdir.join("libLLVMEnzyme-16.so");
+            let dst_lib = libdir.join("libLLVMEnzyme-17.so");
+            let target_dst_lib = target_libdir.join("libLLVMEnzyme-17.so");
             builder.copy(&src_lib, &dst_lib);
             builder.copy(&src_lib, &target_dst_lib);
         }

src/bootstrap/src/core/config/config.rs

@@ -174,7 +174,6 @@ pub struct Config {
     pub llvm_assertions: bool,
     pub llvm_tests: bool,
     pub llvm_enzyme: bool,
-    pub llvm_enzyme_build: Option<String>,
     pub llvm_plugins: bool,
     pub llvm_optimize: bool,
     pub llvm_thin_lto: bool,
@@ -678,24 +677,24 @@ macro_rules! define_config {
                         A: serde::de::MapAccess<'de>,
                     {
                         $(let mut $field: Option<$field_ty> = None;)*
-                            while let Some(key) =
-                                match serde::de::MapAccess::next_key::<String>(&mut map) {
-                                    Ok(val) => val,
-                                    Err(err) => {
-                                        return Err(err);
-                                    }
+                        while let Some(key) =
+                            match serde::de::MapAccess::next_key::<String>(&mut map) {
+                                Ok(val) => val,
+                                Err(err) => {
+                                    return Err(err);
                                 }
+                            }
                         {
                             match &*key {
                                 $($field_key => {
                                     if $field.is_some() {
                                         return Err(<A::Error as serde::de::Error>::duplicate_field(
-                                                $field_key,
-                                                ));
+                                            $field_key,
+                                        ));
                                     }
                                     $field = match serde::de::MapAccess::next_value::<$field_ty>(
                                         &mut map,
-                                        ) {
+                                    ) {
                                         Ok(val) => Some(val),
                                         Err(err) => {
                                             return Err(err);