Rollup of 5 pull requests #117354

GuillaumeGomez · 2023-10-29T11:35:02Z

Successful merges:

Don't use LFS64 symbols on musl #115968 (Don't use LFS64 symbols on musl)
add bootstrap flag --skip-stage0-validation #117043 (add bootstrap flag --skip-stage0-validation)
Fix closure-inherit-target-feature test for SGX platform #117082 (Fix closure-inherit-target-feature test for SGX platform)
memcpy assumptions: link to source showing that GCC makes the same assumption #117312 (memcpy assumptions: link to source showing that GCC makes the same assumption)
rustdoc: Use ThinVec in GenericParamDefKind #117337 (rustdoc: Use ThinVec in GenericParamDefKind)

r? @ghost
@rustbot modify labels: rollup

Signed-off-by: onur-ozkan <work@onurozkan.dev>

This change introduces the --skip-stage0-validation flag, which permits the use of any desired version of the stage0 compiler without verifying its version. Signed-off-by: onur-ozkan <work@onurozkan.dev>

…sumption

Simplify #[cfg] blocks fmt don't try to use the more appropriate direntry on musl

This should hopefully reduce memory usage and improve performance since these vectors are often empty (and `GenericParamDefKind` is constructed *a lot*).

Don't use LFS64 symbols on musl Supersedes rust-lang#106246 ~~Note to packagers: If your distro's musl package has already been updated, then you won't be able to build a newer version of rust until a new rust release is made with these changes merged (which can be used to bootstrap). I'm using a super hacky method to bypass this by creating a stub library with LFS64 symbols and building a patched rust, so the symbols satisfy the build requirements while the final compiler build has no references to LFS64 symbols, example: https://codeberg.org/kiss-community/repo/pulls/160/files~~ Doesn't seem to be necessary with new rustup nightly builds, likely due to updates to vendored crates cc ```@alyssais```

… r=Mark-Simulacrum add bootstrap flag `--skip-stage0-validation` This change introduces the `--skip-stage0-validation` flag, which permits the use of any desired version of the stage0 compiler without verifying its version. Additionally, stage0 compiler validation check is reverted(rust-lang#115103) to its default enabled state. Helps to rust-lang#115065 r? Mark-Simulacrum

…_target_feature_sgx, r=Mark-Simulacrum Fix closure-inherit-target-feature test for SGX platform PR rust-lang#116078 adds the `closure-inherit-target-feature.rs` test that checks the generated assembly code for closures. These checks explicitly check the presence of `ret` instructions. This is incompatible with the SGX target as it explicitly rewrites all `ret` instructions to mitigate LVI vulnerabilities of certain processors. This PR simply ignores these tests for the SGX platform. cc: ```@jethrogb```

…k-Simulacrum memcpy assumptions: link to source showing that GCC makes the same assumption I finally stumbled upon a source showing that GCC also generates overlapping `memcpy`. So if we're linking major C compilers making such assumptions here, let's have both clang and GCC.

…=GuillaumeGomez rustdoc: Use `ThinVec` in `GenericParamDefKind` This should hopefully reduce memory usage and improve performance since these vectors are often empty (and `GenericParamDefKind` is constructed *a lot*).

GuillaumeGomez · 2023-10-29T11:35:12Z

@bors r+ p=5 rollup=never

bors · 2023-10-29T11:35:13Z

📌 Commit 8b461d0 has been approved by GuillaumeGomez

It is now in the queue for this repository.

bors · 2023-10-29T12:56:43Z

⌛ Testing commit 8b461d0 with merge 160fd3c...

bors · 2023-10-29T14:50:20Z

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 160fd3c to master...

rust-timer · 2023-10-29T14:51:44Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#115968	Don't use LFS64 symbols on musl	`5af596c34587aa5c79b4e6c2010c88d286e0ae9f` (link)
#117043	add bootstrap flag `--skip-stage0-validation`	`858c73c3b3b06648b61de3295cce67de7d225ffd` (link)
#117082	Fix closure-inherit-target-feature test for SGX platform	`65d5affb558bb82507857f39044d275d88cdda5f` (link)
#117312	memcpy assumptions: link to source showing that GCC makes t…	`9ffd8f7da0ba41544bf2e81c97aa490eedd0a370` (link)
#117337	rustdoc: Use `ThinVec` in `GenericParamDefKind`	`000eb4e546b39cedb2cac6c4eec8ab5a5373287b` (link)

previous master: bbcc1691a4

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2023-10-29T16:13:13Z

Finished benchmarking commit (160fd3c): 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)	-3.7%	[-3.7%, -3.7%]	1
Improvements ✅ (secondary)	-2.5%	[-4.2%, -0.5%]	3
All ❌✅ (primary)	-3.7%	[-3.7%, -3.7%]	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: 636.381s -> 635.492s (-0.14%)
Artifact size: 304.39 MiB -> 304.42 MiB (0.01%)

onur-ozkan and others added 11 commits October 22, 2023 10:30

re-enable stage0 compiler version check

a63624a

Signed-off-by: onur-ozkan <work@onurozkan.dev>

add bootstrap flag --skip-stage0-validation

9586bb8

This change introduces the --skip-stage0-validation flag, which permits the use of any desired version of the stage0 compiler without verifying its version. Signed-off-by: onur-ozkan <work@onurozkan.dev>

Fix closure-inherit-target-feature test for SGX platform

c094ba0

memcpy assumptions: link to source showing that GCC makes the same as…

b329c69

…sumption

Don't use LFS64 symbols on musl

7a504cc

Simplify #[cfg] blocks fmt don't try to use the more appropriate direntry on musl

rustdoc: Use ThinVec in GenericParamDefKind

3784adc

This should hopefully reduce memory usage and improve performance since these vectors are often empty (and `GenericParamDefKind` is constructed *a lot*).

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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 29, 2023

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

bors merged commit 160fd3c into rust-lang:master Oct 29, 2023

rustbot added this to the 1.75.0 milestone Oct 29, 2023

GuillaumeGomez deleted the rollup-k9xtq0g branch October 29, 2023 16:47

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 5 pull requests #117354

Rollup of 5 pull requests #117354

Uh oh!

GuillaumeGomez commented Oct 29, 2023

Uh oh!

GuillaumeGomez commented Oct 29, 2023

Uh oh!

bors commented Oct 29, 2023

Uh oh!

bors commented Oct 29, 2023

Uh oh!

bors commented Oct 29, 2023

Uh oh!

rust-timer commented Oct 29, 2023

Uh oh!

rust-timer commented Oct 29, 2023

Uh oh!

Uh oh!

Rollup of 5 pull requests #117354

Rollup of 5 pull requests #117354

Uh oh!

Conversation

GuillaumeGomez commented Oct 29, 2023

Uh oh!

GuillaumeGomez commented Oct 29, 2023

Uh oh!

bors commented Oct 29, 2023

Uh oh!

bors commented Oct 29, 2023

Uh oh!

bors commented Oct 29, 2023

Uh oh!

rust-timer commented Oct 29, 2023

Uh oh!

rust-timer commented Oct 29, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!