stabilize combining +bundle and +whole-archive link modifiers #113301

Be-ing · 2023-07-03T19:29:42Z

Per discussion on #108081 combining +bundle and +whole-archive already works and can be stabilized independently of other aspects of the packed_bundled_libs feature. There is no risk of regression because this was not previously allowed.

r? @petrochenkov

compiler/rustc_codegen_ssa/src/back/link.rs

petrochenkov · 2023-07-04T13:17:20Z

Could you remove all uses of feature(packed_bundled_libs) from tests?
(This one, for example - tests\run-make\rlib-format-packed-bundled-libs-3\rust_dep.rs.)

petrochenkov · 2023-07-04T13:20:37Z

The packed_bundled_libs feature should also be stabilized (moved from compiler\rustc_feature\src\active.rs to compiler\rustc_feature\src\accepted.rs).

Be-ing · 2023-07-04T16:27:06Z

The packed_bundled_libs feature should also be stabilized (moved from compiler\rustc_feature\src\active.rs to compiler\rustc_feature\src\accepted.rs).

What about the other use of the feature?

petrochenkov · 2023-07-04T16:32:02Z

The packed_bundled_libs feature should also be stabilized (moved from compiler\rustc_feature\src\active.rs to compiler\rustc_feature\src\accepted.rs).

What about the other use of the feature?

That's a command line option, not feature.

Be-ing · 2023-07-04T18:05:07Z

Ah, I didn't realize those were turned on in different ways.

Currently, combining +bundle and +whole-archive works only with #![feature(packed_bundled_libs)] This crate feature is independent of the -Zpacked-bundled-libs command line option. This commit stabilizes the #![feature(packed_bundled_libs)] crate feature and implicitly enables it only when the +bundle and +whole-archive link modifiers are combined. This allows rlib crates to use the +whole-archive link modifier with native libraries and have all symbols included in the linked library to be included in downstream staticlib crates that use the rlib as a dependency. Other cases requiring the packed_bundled_libs behavior still require the -Zpacked-bundled-libs command line option, which can be stabilized independently in the future. Per discussion on rust-lang#108081 there is no risk of regression stabilizing the crate feature in this way because the combination of +bundle,+whole-archive link modifiers was previously not allowed.

Be-ing · 2023-08-15T20:57:27Z

Sorry for letting this sit for a while. @petrochenkov I have rebased it and addressed review comments.

Brief summary

Currently, combining +bundle and +whole-archive works only with #![feature(packed_bundled_libs)]. This crate feature is independent of the -Zpacked-bundled-libs command line option.

This commit stabilizes the #![feature(packed_bundled_libs)] crate feature and implicitly enables it only when the +bundle and +whole-archive link modifiers are combined. This allows rlib crates to use the +whole-archive link modifier with native libraries and have all symbols included in the linked library to be included in downstream staticlib crates that use the rlib as a dependency. Other cases requiring the packed_bundled_libs behavior still require the -Zpacked-bundled-libs command line option, which can be stabilized independently in the future.

Per discussion on #108081 there is no risk of regression stabilizing the crate feature in this way because the combination of +bundle,+whole-archive link modifiers was previously not allowed.

Documentation

I don't think anything needs to be updated for this? From users' perspective it's merely allowing a combination of existing link modifiers that previously failed with an error.

Tests

tests/run-make/rlib-format-packed-bundled-libs-3/rust_dep.rs

Real world example of Rust code requiring this feature: KDAB/cxx-qt#598

Unresolved questions

The -Zpacked-bundled-libs command line option is still unstable.

petrochenkov · 2023-08-16T03:26:28Z

@rfcbot fcp merge
This PR is a promise that the combination +bundle,+whole-archive in rlibs will be supported in the future in some way (the specific way in which it's supported stays an implementation detail).

rfcbot · 2023-08-16T03:26:29Z

apiraino · 2023-08-18T08:17:27Z

Discussed ion T-compiler meeting on Zulip, acknowledged that it will need sign-off from T-compiler members.

@rustbot label -I-compiler-nominated

rfcbot · 2023-09-18T22:42:40Z

🔔 This is now entering its final comment period, as per the review above. 🔔

rfcbot · 2023-09-28T22:45:30Z

The final comment period, with a disposition to merge, as per the review above, is now complete.

As the automated representative of the governance process, I would like to thank the author for their work and everyone else who contributed.

This will be merged soon.

petrochenkov · 2023-09-29T14:31:50Z

@bors r+

bors · 2023-09-29T14:31:52Z

📌 Commit 72e29da has been approved by petrochenkov

It is now in the queue for this repository.

bors · 2023-09-29T15:51:52Z

⌛ Testing commit 72e29da with merge 56ada88...

bors · 2023-09-29T17:50:45Z

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing 56ada88 to master...

rust-timer · 2023-09-29T19:12:59Z

Finished benchmarking commit (56ada88): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.8%	[-2.8%, -2.8%]	1
Improvements ✅ (secondary)	-3.1%	[-4.4%, -1.8%]	2
All ❌✅ (primary)	-2.8%	[-2.8%, -2.8%]	1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 631.332s -> 630.734s (-0.09%)
Artifact size: 317.36 MiB -> 317.40 MiB (0.01%)

Pkgsrc changes: * Remove NetBSD-8 support (embedded LLVm requires newer C++ than what is in -8; it's conceivable that this could still build with an external LLVM) * undo powerpc 9.0 file naming tweak, since we no longer support -8. * Remove patch to LLVM for powerpc now included by upstream. * Minor adjustments, checksum changes etc. Upstream changes: Version 1.74.1 (2023-12-07) =========================== - [Resolved spurious STATUS_ACCESS_VIOLATIONs in LLVM] (rust-lang/rust#118464) - [Clarify guarantees for std::mem::discriminant] (rust-lang/rust#118006) - [Fix some subtyping-related regressions] (rust-lang/rust#116415) Version 1.74.0 (2023-11-16) ========================== Language -------- - [Codify that `std::mem::Discriminant<T>` does not depend on any lifetimes in T] (rust-lang/rust#104299) - [Replace `private_in_public` lint with `private_interfaces` and `private_bounds` per RFC 2145] (rust-lang/rust#113126) Read more in [RFC 2145](https://rust-lang.github.io/rfcs/2145-type-privacy.html). - [Allow explicit `#[repr(Rust)]`] (rust-lang/rust#114201) - [closure field capturing: don't depend on alignment of packed fields] (rust-lang/rust#115315) - [Enable MIR-based drop-tracking for `async` blocks] (rust-lang/rust#107421) Compiler -------- - [stabilize combining +bundle and +whole-archive link modifiers] (rust-lang/rust#113301) - [Stabilize `PATH` option for `--print KIND=PATH`] (rust-lang/rust#114183) - [Enable ASAN/LSAN/TSAN for `*-apple-ios-macabi`] (rust-lang/rust#115644) - [Promote loongarch64-unknown-none* to Tier 2] (rust-lang/rust#115368) - [Add `i686-pc-windows-gnullvm` as a tier 3 target] (rust-lang/rust#115687) Libraries --------- - [Implement `From<OwnedFd/Handle>` for ChildStdin/out/err] (rust-lang/rust#98704) - [Implement `From<{&,&mut} [T; N]>` for `Vec<T>` where `T: Clone`] (rust-lang/rust#111278) - [impl Step for IP addresses] (rust-lang/rust#113748) - [Implement `From<[T; N]>` for `Rc<[T]>` and `Arc<[T]>`] (rust-lang/rust#114041) - [`impl TryFrom<char> for u16`] (rust-lang/rust#114065) - [Stabilize `io_error_other` feature] (rust-lang/rust#115453) - [Stabilize the `Saturating` type] (rust-lang/rust#115477) - [Stabilize const_transmute_copy] (rust-lang/rust#115520) Stabilized APIs --------------- - [`core::num::Saturating`] (https://doc.rust-lang.org/stable/std/num/struct.Saturating.html) - [`impl From<io::Stdout> for std::process::Stdio`] (https://doc.rust-lang.org/stable/std/process/struct.Stdio.html#impl-From%3CStdout%3E-for-Stdio) - [`impl From<io::Stderr> for std::process::Stdio`] (https://doc.rust-lang.org/stable/std/process/struct.Stdio.html#impl-From%3CStderr%3E-for-Stdio) - [`impl From<OwnedHandle> for std::process::Child{Stdin, Stdout, Stderr}`] (https://doc.rust-lang.org/stable/std/process/struct.Stdio.html#impl-From%3CStderr%3E-for-Stdio) - [`impl From<OwnedFd> for std::process::Child{Stdin, Stdout, Stderr}`] (https://doc.rust-lang.org/stable/std/process/struct.Stdio.html#impl-From%3CStderr%3E-for-Stdio) - [`std::ffi::OsString::from_encoded_bytes_unchecked`] (https://doc.rust-lang.org/stable/std/ffi/struct.OsString.html#method.from_encoded_bytes_unchecked) - [`std::ffi::OsString::into_encoded_bytes`] (https://doc.rust-lang.org/stable/std/ffi/struct.OsString.html#method.into_encoded_bytes) - [`std::ffi::OsStr::from_encoded_bytes_unchecked`] (https://doc.rust-lang.org/stable/std/ffi/struct.OsStr.html#method.from_encoded_bytes_unchecked) - [`std::ffi::OsStr::as_encoded_bytes`] (https://doc.rust-lang.org/stable/std/ffi/struct.OsStr.html#method.as_encoded_bytes) - [`std::io::Error::other`] (https://doc.rust-lang.org/stable/std/io/struct.Error.html#method.other) - [`impl TryFrom<char> for u16`] (https://doc.rust-lang.org/stable/std/primitive.u16.html#impl-TryFrom%3Cchar%3E-for-u16) - [`impl<T: Clone, const N: usize> From<&[T; N]> for Vec<T>`] (https://doc.rust-lang.org/stable/std/vec/struct.Vec.html#impl-From%3C%26%5BT;+N%5D%3E-for-Vec%3CT,+Global%3E) - [`impl<T: Clone, const N: usize> From<&mut [T; N]> for Vec<T>`] (https://doc.rust-lang.org/stable/std/vec/struct.Vec.html#impl-From%3C%26mut+%5BT;+N%5D%3E-for-Vec%3CT,+Global%3E) - [`impl<T, const N: usize> From<[T; N]> for Arc<[T]>`] (https://doc.rust-lang.org/stable/std/sync/struct.Arc.html#impl-From%3C%5BT;+N%5D%3E-for-Arc%3C%5BT%5D,+Global%3E) - [`impl<T, const N: usize> From<[T; N]> for Rc<[T]>`] (https://doc.rust-lang.org/stable/std/rc/struct.Rc.html#impl-From%3C%5BT;+N%5D%3E-for-Rc%3C%5BT%5D,+Global%3E) These APIs are now stable in const contexts: - [`core::mem::transmute_copy`] (https://doc.rust-lang.org/beta/std/mem/fn.transmute_copy.html) - [`str::is_ascii`] (https://doc.rust-lang.org/beta/std/primitive.str.html#method.is_ascii) - [`[u8]::is_ascii`] (https://doc.rust-lang.org/beta/std/primitive.slice.html#method.is_ascii) Cargo ----- - [fix: Set MSRV for internal packages] (rust-lang/cargo#12381) - [config: merge lists in precedence order] (rust-lang/cargo#12515) - [fix(update): Clarify meaning of --aggressive as --recursive] (rust-lang/cargo#12544) - [fix(update): Make `-p` more convenient by being positional] (rust-lang/cargo#12545) - [feat(help): Add styling to help output ] (rust-lang/cargo#12578) - [feat(pkgid): Allow incomplete versions when unambigious] (rust-lang/cargo#12614) - [feat: stabilize credential-process and registry-auth] (rust-lang/cargo#12649) - [feat(cli): Add '-n' to dry-run] (rust-lang/cargo#12660) - [Add support for `target.'cfg(..)'.linker`] (rust-lang/cargo#12535) - [Stabilize `--keep-going`] (rust-lang/cargo#12568) - [feat: Stabilize lints] (rust-lang/cargo#12648) Rustdoc ------- - [Add warning block support in rustdoc] (rust-lang/rust#106561) - [Accept additional user-defined syntax classes in fenced code blocks] (rust-lang/rust#110800) - [rustdoc-search: add support for type parameters] (rust-lang/rust#112725) - [rustdoc: show inner enum and struct in type definition for concrete type] (rust-lang/rust#114855) Compatibility Notes ------------------- - [Raise minimum supported Apple OS versions] (rust-lang/rust#104385) - [make Cell::swap panic if the Cells partially overlap] (rust-lang/rust#114795) - [Reject invalid crate names in `--extern`] (rust-lang/rust#116001) - [Don't resolve generic impls that may be shadowed by dyn built-in impls] (rust-lang/rust#114941) Internal Changes ---------------- These changes do not affect any public interfaces of Rust, but they represent significant improvements to the performance or internals of rustc and related tools. None this cycle.

rustbot assigned petrochenkov Jul 3, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 3, 2023

Be-ing mentioned this pull request Jul 3, 2023

WIP: examples: create a multi project to test multiple crates KDAB/cxx-qt#598

Draft

This comment has been minimized.

Sign in to view

petrochenkov reviewed Jul 4, 2023

View reviewed changes

compiler/rustc_codegen_ssa/src/back/link.rs Show resolved Hide resolved

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 4, 2023

Be-ing force-pushed the stabilize_bundle_whole-archive branch 5 times, most recently from 6df6d02 to 6ecbc30 Compare August 15, 2023 20:51

Be-ing force-pushed the stabilize_bundle_whole-archive branch from 6ecbc30 to 72e29da Compare August 15, 2023 20:51

rfcbot added proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. labels Aug 16, 2023

rustbot removed the I-compiler-nominated Nominated for discussion during a compiler team meeting. label Aug 18, 2023

rfcbot added final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. and removed proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. labels Sep 18, 2023

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). labels Sep 29, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 29, 2023

bors merged commit 56ada88 into rust-lang:master Sep 29, 2023

rustbot added this to the 1.74.0 milestone Sep 29, 2023

Be-ing deleted the stabilize_bundle_whole-archive branch September 29, 2023 18:25

bors mentioned this pull request Sep 29, 2023

Remove cgu_reuse_tracker from Session #115964

Merged

pvdrz mentioned this pull request Oct 4, 2023

Fix divergence from upstream master ferrocene/ferrocene#23

Merged

apiraino removed the to-announce Announce this issue on triage meeting label Oct 12, 2023

petrochenkov mentioned this pull request Oct 19, 2023

rustc --test -l static=somelib.a links with --whole-archive #116910

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

stabilize combining +bundle and +whole-archive link modifiers #113301

stabilize combining +bundle and +whole-archive link modifiers #113301

Be-ing commented Jul 3, 2023 •

edited

Loading

This comment has been minimized.

petrochenkov commented Jul 4, 2023

petrochenkov commented Jul 4, 2023

Be-ing commented Jul 4, 2023

petrochenkov commented Jul 4, 2023

Be-ing commented Jul 4, 2023

Be-ing commented Aug 15, 2023 •

edited

Loading

petrochenkov commented Aug 16, 2023

rfcbot commented Aug 16, 2023 •

edited by compiler-errors

Loading

apiraino commented Aug 18, 2023

rfcbot commented Sep 18, 2023

rfcbot commented Sep 28, 2023

petrochenkov commented Sep 29, 2023

bors commented Sep 29, 2023

bors commented Sep 29, 2023

bors commented Sep 29, 2023

rust-timer commented Sep 29, 2023

stabilize combining +bundle and +whole-archive link modifiers #113301

stabilize combining +bundle and +whole-archive link modifiers #113301

Conversation

Be-ing commented Jul 3, 2023 • edited Loading

This comment has been minimized.

petrochenkov commented Jul 4, 2023

petrochenkov commented Jul 4, 2023

Be-ing commented Jul 4, 2023

petrochenkov commented Jul 4, 2023

Be-ing commented Jul 4, 2023

Be-ing commented Aug 15, 2023 • edited Loading

Brief summary

Documentation

Tests

Unresolved questions

petrochenkov commented Aug 16, 2023

rfcbot commented Aug 16, 2023 • edited by compiler-errors Loading

apiraino commented Aug 18, 2023

rfcbot commented Sep 18, 2023

rfcbot commented Sep 28, 2023

petrochenkov commented Sep 29, 2023

bors commented Sep 29, 2023

bors commented Sep 29, 2023

bors commented Sep 29, 2023

rust-timer commented Sep 29, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Be-ing commented Jul 3, 2023 •

edited

Loading

Be-ing commented Aug 15, 2023 •

edited

Loading

rfcbot commented Aug 16, 2023 •

edited by compiler-errors

Loading