add test + small fix

Author: Bryanskiy

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -2391,21 +2391,23 @@ fn add_upstream_rust_crates<'a, B: ArchiveBuilder<'a>>(
                                 } else {
                                     cmd.link_rlib(&bundle_lib);
                                 }
+
+                                continue;
                             }
-                        } else {
-                            if let NativeLibKind::Static { bundle: Some(false), whole_archive } =
-                                lib.kind
-                            {
-                                let verbatim = lib.verbatim.unwrap_or(false);
-                                if whole_archive == Some(true) {
-                                    cmd.link_whole_staticlib(
-                                        name,
-                                        verbatim,
-                                        search_path.get_or_init(|| archive_search_paths(sess)),
-                                    );
-                                } else {
-                                    cmd.link_staticlib(name, verbatim);
-                                }
+                        }
+
+                        if let NativeLibKind::Static { bundle: Some(false), whole_archive } =
+                            lib.kind
+                        {
+                            let verbatim = lib.verbatim.unwrap_or(false);
+                            if whole_archive == Some(true) {
+                                cmd.link_whole_staticlib(
+                                    name,
+                                    verbatim,
+                                    search_path.get_or_init(|| archive_search_paths(sess)),
+                                );
+                            } else {
+                                cmd.link_staticlib(name, verbatim);
                             }
                         }
                     }

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

@@ -0,0 +1,35 @@
+# ignore-cross-compile
+# ignore-windows-msvc
+
+-include ../../run-make-fulldeps/tools.mk
+
+# 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 only into staticlib
+	$(RUSTC) bundled.rs --crate-type=staticlib --crate-type=rlib $(SPLIT)
+	$(NM) $(TMPDIR)/libbundled.a | $(CGREP) -e "T _*native_func"
+	$(NM) $(TMPDIR)/libbundled.a | $(CGREP) -e "U _*native_func"
+	$(NM) $(TMPDIR)/libbundled.rlib | $(CGREP) -ve "T _*native_func"
+	$(NM) $(TMPDIR)/libbundled.rlib | $(CGREP) -e "U _*native_func"
+
+	# Build a staticlib and a rlib, the `native_func` symbol will not be bundled into it
+	$(RUSTC) non-bundled.rs --crate-type=staticlib --crate-type=rlib $(SPLIT)
+	$(NM) $(TMPDIR)/libnon_bundled.a | $(CGREP) -ve "T _*native_func"
+	$(NM) $(TMPDIR)/libnon_bundled.a | $(CGREP) -e "U _*native_func"
+	$(NM) $(TMPDIR)/libnon_bundled.rlib | $(CGREP) -ve "T _*native_func"
+	$(NM) $(TMPDIR)/libnon_bundled.rlib | $(CGREP) -e "U _*native_func"
+
+	# Build a cdylib, 'BUNDLED_LIB' will appear on the linker line
+	# The cdylib will contain the `native_func` symbol in the end
+	$(RUSTC) cdylib-bundled.rs --crate-type=cdylib --print link-args $(SPLIT) | $(CGREP) -e $(BUNDLED_LIB)
+	$(NM) $(call DYLIB,cdylib_bundled) | $(CGREP) -e "[Tt] _*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) > $(TMPDIR)/tmp
+	$(NM) $(call DYLIB,cdylib_non_bundled) | $(CGREP) -e "[Tt] _*native_func"

src/test/run-make/native-link-modifier-bundle-split/bundled.rs

@@ -0,0 +1,11 @@
+#[link(name = "native-staticlib", kind = "static", modifiers = "+bundle")]
+extern "C" {
+    pub fn native_func();
+}
+
+#[no_mangle]
+pub extern "C" fn wrapped_func() {
+    unsafe {
+        native_func();
+    }
+}

src/test/run-make/native-link-modifier-bundle-split/cdylib-bundled.rs

@@ -0,0 +1 @@
+extern crate bundled;

src/test/run-make/native-link-modifier-bundle-split/cdylib-non-bundled.rs

@@ -0,0 +1 @@
+extern crate non_bundled;

src/test/run-make/native-link-modifier-bundle-split/native-staticlib.c

@@ -0,0 +1 @@
+void native_func() {}

src/test/run-make/native-link-modifier-bundle-split/non-bundled.rs

@@ -0,0 +1,11 @@
+#[link(name = "native-staticlib", kind = "static", modifiers = "-bundle")]
+extern "C" {
+    pub fn native_func();
+}
+
+#[no_mangle]
+pub extern "C" fn wrapped_func() {
+    unsafe {
+        native_func();
+    }
+}