Auto merge of #95818 - petrochenkov:stabundle, r=wesleywiser

Stabilize the `bundle` native library modifier

And remove the legacy `static-nobundle` linking kind.

Stabilization report - #95818 (comment).

cc #81490
Closes #37403

Author: bors

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -1952,7 +1952,7 @@ fn linker_with_args<'a, B: ArchiveBuilder<'a>>(
         add_local_native_libraries(cmd, sess, codegen_results);
     }
 
-    // Upstream rust libraries and their nobundle static libraries
+    // Upstream rust libraries and their non-bundled static libraries
     add_upstream_rust_crates::<B>(cmd, sess, codegen_results, crate_type, tmpdir);
 
     // Upstream dynamic native libraries linked with `#[link]` attributes at and `-l`
@@ -2237,7 +2237,7 @@ fn add_local_native_libraries(
     }
 }
 
-/// # Linking Rust crates and their nobundle static libraries
+/// # Linking Rust crates and their non-bundled static libraries
 ///
 /// Rust crates are not considered at all when creating an rlib output. All dependencies will be
 /// linked when producing the final output (instead of the intermediate rlib version).

compiler/rustc_error_codes/src/error_codes/E0060.md

@@ -16,10 +16,10 @@ Using this declaration, it must be called with at least one argument, so
 simply calling `printf()` is invalid. But the following uses are allowed:
 
 ```
-# #![feature(static_nobundle)]
 # use std::os::raw::{c_char, c_int};
 # #[cfg_attr(all(windows, target_env = "msvc"),
-#            link(name = "legacy_stdio_definitions", kind = "static-nobundle"))]
+#            link(name = "legacy_stdio_definitions",
+#                 kind = "static", modifiers = "-bundle"))]
 # extern "C" { fn printf(_: *const c_char, ...) -> c_int; }
 # fn main() {
 unsafe {

compiler/rustc_feature/src/accepted.rs

@@ -219,6 +219,8 @@ declare_features! (
     (accepted, move_ref_pattern, "1.49.0", Some(68354), None),
     /// Allows specifying modifiers in the link attribute: `#[link(modifiers = "...")]`
     (accepted, native_link_modifiers, "1.61.0", Some(81490), None),
+    /// Allows specifying the bundle link modifier
+    (accepted, native_link_modifiers_bundle, "1.63.0", Some(81490), None),
     /// Allows specifying the whole-archive link modifier
     (accepted, native_link_modifiers_whole_archive, "1.61.0", Some(81490), None),
     /// Allows using non lexical lifetimes (RFC 2094).

compiler/rustc_feature/src/active.rs

@@ -451,8 +451,6 @@ declare_features! (
     (active, naked_functions, "1.9.0", Some(32408), None),
     /// Allows specifying the as-needed link modifier
     (active, native_link_modifiers_as_needed, "1.53.0", Some(81490), None),
-    /// Allows specifying the bundle link modifier
-    (active, native_link_modifiers_bundle, "1.53.0", Some(81490), None),
     /// Allows specifying the verbatim link modifier
     (active, native_link_modifiers_verbatim, "1.53.0", Some(81490), None),
     /// Allow negative trait implementations.
@@ -502,8 +500,6 @@ declare_features! (
     (active, simd_ffi, "1.0.0", Some(27731), None),
     /// Allows specialization of implementations (RFC 1210).
     (incomplete, specialization, "1.7.0", Some(31844), None),
-    /// Allows `#[link(kind="static-nobundle"...)]`.
-    (active, static_nobundle, "1.16.0", Some(37403), None),
     /// Allows attributes on expressions and non-item statements.
     (active, stmt_expr_attributes, "1.6.0", Some(15701), None),
     /// Allows lints part of the strict provenance effort.

compiler/rustc_feature/src/removed.rs

@@ -169,6 +169,9 @@ declare_features! (
     (removed, sanitizer_runtime, "1.17.0", None, None, None),
     (removed, simd, "1.0.0", Some(27731), None,
      Some("removed in favor of `#[repr(simd)]`")),
+    /// Allows `#[link(kind = "static-nobundle", ...)]`.
+    (removed, static_nobundle, "1.16.0", Some(37403), None,
+     Some(r#"subsumed by `#[link(kind = "static", modifiers = "-bundle", ...)]`"#)),
     (removed, struct_inherit, "1.0.0", None, None, None),
     (removed, test_removed_feature, "1.0.0", None, None, None),
     /// Allows using items which are missing stability attributes

compiler/rustc_metadata/src/native_libs.rs

@@ -97,24 +97,6 @@ impl<'tcx> Collector<'tcx> {
                         let span = item.name_value_literal_span().unwrap();
                         let link_kind = match link_kind.as_str() {
                             "static" => NativeLibKind::Static { bundle: None, whole_archive: None },
-                            "static-nobundle" => {
-                                sess.struct_span_warn(
-                                    span,
-                                    "link kind `static-nobundle` has been superseded by specifying \
-                                     modifier `-bundle` with link kind `static`",
-                                )
-                                .emit();
-                                if !features.static_nobundle {
-                                    feature_err(
-                                        &sess.parse_sess,
-                                        sym::static_nobundle,
-                                        span,
-                                        "link kind `static-nobundle` is unstable",
-                                    )
-                                    .emit();
-                                }
-                                NativeLibKind::Static { bundle: Some(false), whole_archive: None }
-                            }
                             "dylib" => NativeLibKind::Dylib { as_needed: None },
                             "framework" => {
                                 if !sess.target.is_like_osx {
@@ -264,7 +246,6 @@ impl<'tcx> Collector<'tcx> {
                     };
                     match (modifier, &mut kind) {
                         ("bundle", Some(NativeLibKind::Static { bundle, .. })) => {
-                            report_unstable_modifier!(native_link_modifiers_bundle);
                             assign_modifier(bundle)
                         }
                         ("bundle", _) => {

compiler/rustc_session/src/config.rs

@@ -1920,21 +1920,6 @@ fn parse_native_lib_kind(
 
     let kind = match kind {
         "static" => NativeLibKind::Static { bundle: None, whole_archive: None },
-        "static-nobundle" => {
-            early_warn(
-                error_format,
-                "library kind `static-nobundle` has been superseded by specifying \
-                 modifier `-bundle` with library kind `static`. Try `static:-bundle`",
-            );
-            if !nightly_options::match_is_nightly_build(matches) {
-                early_error(
-                    error_format,
-                    "library kind `static-nobundle` is unstable \
-                     and only accepted on the nightly compiler",
-                );
-            }
-            NativeLibKind::Static { bundle: Some(false), whole_archive: None }
-        }
         "dylib" => NativeLibKind::Dylib { as_needed: None },
         "framework" => NativeLibKind::Framework { as_needed: None },
         _ => early_error(
@@ -1987,10 +1972,7 @@ fn parse_native_lib_modifiers(
             }
         };
         match (modifier, &mut kind) {
-            ("bundle", NativeLibKind::Static { bundle, .. }) => {
-                report_unstable_modifier();
-                assign_modifier(bundle)
-            }
+            ("bundle", NativeLibKind::Static { bundle, .. }) => assign_modifier(bundle),
             ("bundle", _) => early_error(
                 error_format,
                 "linking modifier `bundle` is only compatible with `static` linking kind",

library/unwind/src/lib.rs

@@ -1,7 +1,7 @@
 #![no_std]
 #![unstable(feature = "panic_unwind", issue = "32837")]
 #![feature(link_cfg)]
-#![feature(native_link_modifiers_bundle)]
+#![cfg_attr(bootstrap, feature(native_link_modifiers_bundle))]
 #![feature(staged_api)]
 #![feature(c_unwind)]
 #![feature(cfg_target_abi)]

src/doc/rustc/src/command-line-arguments.md

@@ -84,6 +84,26 @@ The default for this modifier is `-whole-archive`. \
 NOTE: The default may currently be different in some cases for backward compatibility,
 but it is not guaranteed. If you need whole archive semantics use `+whole-archive` explicitly.
 
+### Linking modifiers: `bundle`
+
+This modifier is only compatible with the `static` linking kind.
+Using any other kind will result in a compiler error.
+
+When building a rlib or staticlib `+bundle` means that all object files from the native static
+library will be added to the rlib or staticlib archive, and then used from it during linking of
+the final binary.
+
+When building a rlib `-bundle` means that the native static library is registered as a dependency
+of that rlib "by name", and object files from it are included only during linking of the final
+binary, the file search by that name is also performed during final linking. \
+When building a staticlib `-bundle` means that the native static library is simply not included
+into the archive and some higher level build system will need to add it later during linking of
+the final binary.
+
+This modifier has no effect when building other targets like executables or dynamic libraries.
+
+The default for this modifier is `+bundle`.
+
 <a id="option-crate-type"></a>
 ## `--crate-type`: a list of types of crates for the compiler to emit
 

src/doc/unstable-book/src/language-features/native-link-modifiers-bundle.md

@@ -120,7 +120,7 @@ else
 	# So we end up with the following hack: we link use static:-bundle to only
 	# link the parts of libstdc++ that we actually use, which doesn't include
 	# the dependency on the pthreads DLL.
-	EXTRARSCXXFLAGS := -l static:-bundle=stdc++ -Z unstable-options
+	EXTRARSCXXFLAGS := -l static:-bundle=stdc++
 endif
 else
 ifeq ($(UNAME),Darwin)

src/test/run-make-fulldeps/static-nobundle/Makefile

@@ -0,0 +1,29 @@
+# ignore-cross-compile
+# ignore-windows-msvc
+
+-include ../../run-make-fulldeps/tools.mk
+
+all: $(call NATIVE_STATICLIB,native-staticlib)
+	# Build a staticlib and a rlib, the `native_func` symbol will be bundled into them
+	$(RUSTC) bundled.rs --crate-type=staticlib --crate-type=rlib
+	nm $(TMPDIR)/libbundled.a | $(CGREP) -e "T _*native_func"
+	nm $(TMPDIR)/libbundled.a | $(CGREP) -e "U _*native_func"
+	nm $(TMPDIR)/libbundled.rlib | $(CGREP) -e "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
+	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, `native-staticlib` will not appear on the linker line because it was bundled previously
+	# The cdylib will contain the `native_func` symbol in the end
+	$(RUSTC) cdylib-bundled.rs --crate-type=cdylib --print link-args | $(CGREP) -ve '-l[" ]*native-staticlib'
+	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 | $(CGREP) -e '-l[" ]*native-staticlib'
+	nm $(call DYLIB,cdylib_non_bundled) | $(CGREP) -e "[Tt] _*native_func"

src/test/run-make-fulldeps/static-nobundle/bbb.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-fulldeps/static-nobundle/ccc.rs

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

src/test/run-make-fulldeps/static-nobundle/ddd.rs

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

src/test/run-make-fulldeps/tools.mk

@@ -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/Makefile

@@ -17,7 +17,7 @@ all: $(TMPDIR)/$(call BIN,directly_linked) $(TMPDIR)/$(call BIN,indirectly_linke
 
 # Native lib linked directly into executable
 $(TMPDIR)/$(call BIN,directly_linked): $(call NATIVE_STATICLIB,c_static_lib_with_constructor)
-	$(RUSTC) directly_linked.rs -Z unstable-options -l static:+whole-archive=c_static_lib_with_constructor
+	$(RUSTC) directly_linked.rs -l static:+whole-archive=c_static_lib_with_constructor
 
 # Native lib linked into RLIB via `-l static:-bundle,+whole-archive`, RLIB linked into executable
 $(TMPDIR)/$(call BIN,indirectly_linked): $(TMPDIR)/librlib_with_cmdline_native_lib.rlib
@@ -29,7 +29,7 @@ $(TMPDIR)/$(call BIN,indirectly_linked_via_attr): $(TMPDIR)/libnative_lib_in_src
 
 # Native lib linked into rlib with via commandline
 $(TMPDIR)/librlib_with_cmdline_native_lib.rlib: $(call NATIVE_STATICLIB,c_static_lib_with_constructor)
-	$(RUSTC) rlib_with_cmdline_native_lib.rs -Z unstable-options --crate-type=rlib -l static:-bundle,+whole-archive=c_static_lib_with_constructor
+	$(RUSTC) rlib_with_cmdline_native_lib.rs --crate-type=rlib -l static:-bundle,+whole-archive=c_static_lib_with_constructor
 
 # Native lib linked into rlib via `#[link()]` attribute on extern block.
 $(TMPDIR)/libnative_lib_in_src.rlib: $(call NATIVE_STATICLIB,c_static_lib_with_constructor)

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

@@ -1,5 +1,3 @@
-#![feature(native_link_modifiers_bundle)]
-
 use std::io::Write;
 
 #[link(name = "c_static_lib_with_constructor",