merge tests + cleanup

Author: Bryanskiy

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -347,11 +347,11 @@ fn link_rlib<'a, B: ArchiveBuilder<'a>>(
 
                 if flavor == RlibFlavor::Normal && sess.opts.unstable_opts.split_bundled_libs {
                     let suffix = &sess.target.staticlib_suffix;
-                    let bundle_lib = PathBuf::from(format!("{}.bundle.{name}{suffix}", out_filename.display()));
-                    match fs::copy(location, bundle_lib) {
-                        Ok(_) => {}, 
-                        Err(_) => sess.fatal("unable to create file for bundle lib"),
-                    }
+                    let bundle_lib =
+                        PathBuf::from(format!("{}.bundle.{name}{suffix}", out_filename.display()));
+                    fs::copy(location, bundle_lib).unwrap_or_else(|e| {
+                        sess.fatal(format!("Unable to create bundle lib: {}", e));
+                    });
                 } else {
                     ab.add_archive(&location, |_| false).unwrap_or_else(|e| {
                         sess.fatal(&format!(
@@ -2387,8 +2387,10 @@ fn add_upstream_rust_crates<'a, B: ArchiveBuilder<'a>>(
                             {
                                 let suffix = &sess.target.staticlib_suffix;
                                 let cratepath = &src.rlib.as_ref().unwrap().0;
-                                let bundle_lib =
-                                    PathBuf::from(format!("{}.bundle.{name}{suffix}", cratepath.display()));
+                                let bundle_lib = PathBuf::from(format!(
+                                    "{}.bundle.{name}{suffix}",
+                                    cratepath.display()
+                                ));
                                 if whole_archive == Some(true) {
                                     cmd.link_whole_rlib(&fix_windows_verbatim_for_gcc(&bundle_lib));
                                 } else {

src/test/run-make/native-link-modifier-bundle-split/Makefile

@@ -6,6 +6,9 @@
 # We're using the llvm-nm instead of the system nm to ensure it is compatible
 # with the LLVM bitcode generated by rustc.
 NM = "$(LLVM_BIN_DIR)"/llvm-nm
+SPLIT = "-Zsplit-bundled-libs"
+BUNDLED_LIB = "libbundled.rlib.bundle.native-staticlib.a"
+
 
 all: $(call NATIVE_STATICLIB,native-staticlib)
 	# Build a staticlib and a rlib, the `native_func` symbol will be bundled into them
@@ -31,3 +34,15 @@ all: $(call NATIVE_STATICLIB,native-staticlib)
 	# The cdylib will contain the `native_func` symbol in the end
 	$(RUSTC) cdylib-non-bundled.rs --crate-type=cdylib --print link-args | $(CGREP) -e '-l[" ]*native-staticlib'
 	$(NM) $(call DYLIB,cdylib_non_bundled) | $(CGREP) -e "[Tt] _*native_func"
+
+	# Build a staticlib and a rlib, the `native_func` symbol will be bundled only into staticlib
+	$(RUSTC) bundled.rs --crate-type=staticlib --crate-type=rlib $(SPLIT) --crate-name=bundled_split
+	$(NM) $(TMPDIR)/libbundled_split.a | $(CGREP) -e "T _*native_func"
+	$(NM) $(TMPDIR)/libbundled_split.a | $(CGREP) -e "U _*native_func"
+	$(NM) $(TMPDIR)/libbundled_split.rlib | $(CGREP) -ve "T _*native_func"
+	$(NM) $(TMPDIR)/libbundled_split.rlib | $(CGREP) -e "U _*native_func"
+
+	# Build a cdylib, `native-staticlib` will appear on the linker line because it was not bundled previously
+	# The cdylib will contain the `native_func` symbol in the end
+	$(RUSTC) cdylib-non-bundled.rs --crate-type=cdylib --print link-args $(SPLIT) --crate-name=cdylib_non_bundled_split | $(CGREP) -e '-l[" ]*native-staticlib'
+	$(NM) $(call DYLIB,cdylib_non_bundled_split) | $(CGREP) -e "[Tt] _*native_func"