Skip to content

Stage0 bootstrap update #140887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 13, 2025
Merged

Conversation

pietroalbini
Copy link
Member

This PR follows the release process to update the stage0 compiler.

The only thing of note is 58651d1, which was flagged by clippy as a correctness fix. I think allowing that lint in our case makes sense, but it's worth to have a second pair of eyes on it.

r? @Mark-Simulacrum

@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-testsuite Area: The testsuite used to check the correctness of rustc PG-exploit-mitigations Project group: Exploit mitigations S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels May 10, 2025
@rustbot
Copy link
Collaborator

rustbot commented May 10, 2025

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred to the CTFE machinery

cc @RalfJung, @oli-obk, @lcnr

Some changes occurred in compiler/rustc_attr_data_structures

cc @jdonszelmann

Some changes occurred in library/core/src/fmt/rt.rs

cc @m-ou-se

This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp.

Some changes occurred in compiler/rustc_sanitizers

cc @rcvalle

Some changes occurred in compiler/rustc_codegen_ssa

cc @WaffleLapkin

Some changes occurred to the intrinsics. Make sure the CTFE / Miri interpreter
gets adapted for the changes, if necessary.

cc @rust-lang/miri, @RalfJung, @oli-obk, @lcnr

Some changes occurred in compiler/rustc_attr_parsing

cc @jdonszelmann

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

Some changes occurred to the platform-builtins intrinsics. Make sure the
LLVM backend as well as portable-simd gets adapted for the changes.

cc @antoyo, @GuillaumeGomez, @bjorn3, @calebzulawski, @programmerjake

@rust-log-analyzer

This comment has been minimized.

@jieyouxu
Copy link
Member

jieyouxu commented May 10, 2025

cc @azhogin @oli-obk is there anyway we can unblock the stage 0 bootstrap bump? #123948 is kinda massive, and there's been more PRs over that...

@Noratrieb
Copy link
Member

also @zetanumbers @petrochenkov since you were also involved with async drop. for some reason there is an ICE when compiling the standard library after the bootstrap bump, could you take a look at it? ideally there's some small bugfix that can be backported to beta

#140887 (comment)

@moxian
Copy link
Contributor

moxian commented May 10, 2025

Minimized repro, in case it helps: #140423 (comment)

@oli-obk
Copy link
Contributor

oli-obk commented May 10, 2025

On mobile for the next 6h, so I cant provide PRs, but just early return from the async mir shim code to produce a dummy mir body. Not dropping anything isn't worse than before the PR and we'll fix it on nightly again. No stable code is affected by essentially disabling the feature on beta

@est31
Copy link
Member

est31 commented May 10, 2025

The only thing of note is 58651d1, which was flagged by clippy as a correctness fix. I think allowing that lint in our case makes sense

I'd say the code is sound, as a Cell is involved. So it's a false positive of the mut_from_ref lint. In fact memory allocators are listed in the known problems section.

@oli-obk
Copy link
Contributor

oli-obk commented May 11, 2025

you can take the fix from #140902 it's hacky but it does the job with no risk and we'll fix it cleanly on master

@pietroalbini
Copy link
Member Author

Prepared the backport PR.

@pietroalbini pietroalbini force-pushed the pa-bootstrap-update branch from 58651d1 to 779dd35 Compare May 12, 2025 13:33
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

Copy link
Member

@compiler-errors compiler-errors left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me

@compiler-errors
Copy link
Member

@bors r+ rollup=never p=1

@bors
Copy link
Collaborator

bors commented May 13, 2025

📌 Commit 6f6a9a5 has been approved by compiler-errors

It is now in the queue for this repository.

@bors 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 May 13, 2025
@compiler-errors
Copy link
Member

@bors r-

squash pls :>

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 13, 2025
@pietroalbini pietroalbini force-pushed the pa-bootstrap-update branch from 6f6a9a5 to 8ce7783 Compare May 13, 2025 09:30
@pietroalbini
Copy link
Member Author

@bors r=compiler-errors p=1 rollup=never

@bors
Copy link
Collaborator

bors commented May 13, 2025

📌 Commit 8ce7783 has been approved by compiler-errors

It is now in the queue for this repository.

@bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 13, 2025
@bors
Copy link
Collaborator

bors commented May 13, 2025

⌛ Testing commit 8ce7783 with merge 4eca99a...

@bors
Copy link
Collaborator

bors commented May 13, 2025

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 4eca99a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 13, 2025
@bors bors merged commit 4eca99a into rust-lang:master May 13, 2025
7 checks passed
@rustbot rustbot added this to the 1.89.0 milestone May 13, 2025
Copy link

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing f6b5da7 (parent) -> 4eca99a (this PR)

Test differences

Show 33577 test diffs

Stage 0

  • f16::test_neg_infinity: [missing] -> pass (J4)

Stage 1

  • boxed::box_clone_from_ptr_stability: [missing] -> pass (J0)
  • btree_set_hash::test_hash: [missing] -> pass (J0)
  • cell::ref_map_does_not_update_flag: [missing] -> pass (J0)
  • collections::hash::map::tests::test_iter_len: [missing] -> pass (J0)
  • collections::linked_list::tests::test_append: [missing] -> pass (J0)
  • env_home_dir: [missing] -> pass (J0)
  • ffi::os_str::tests::slice_invalid_data: [missing] -> pass (J0)
  • fmt::builders::debug_list::test_multiple: [missing] -> pass (J0)
  • io::borrowed_buf::set_init: [missing] -> pass (J0)
  • iter::range::test_range_inclusive_len: [missing] -> pass (J0)
  • mpmc::smoke_receiver_clone: [missing] -> pass (J0)
  • num::bignum::test_fmt: [missing] -> pass (J0)
  • num::i16::test_carrying_mul_add: [missing] -> pass (J0)
  • num::i16::test_le: [missing] -> pass (J0)
  • num::i32::test_rotate: [missing] -> pass (J0)
  • num::i32::test_signum: [missing] -> pass (J0)
  • num::test_try_u64u16: [missing] -> pass (J0)
  • num::test_u8i32: [missing] -> pass (J0)
  • ptr::align_offset_issue_103361: [missing] -> pass (J0)
  • slice::slice_index::boundpair_overflow_end::pass: [missing] -> pass (J0)
  • slice::test_chunks_mut_count: [missing] -> pass (J0)
  • slice::test_iter_size_hints: [missing] -> pass (J0)
  • sort::tests::stable::deterministic_cell_i32_random_z1: [missing] -> pass (J0)
  • sort::tests::unstable::correct_u64_random_z1: [missing] -> pass (J0)
  • system_time_elapsed: [missing] -> pass (J0)
  • test_boxed_hasher: [missing] -> pass (J0)
  • vec::max_insert: [missing] -> pass (J0)
  • vec::test_drain_keep_rest_none: [missing] -> pass (J0)
  • ascii::is_ascii::unaligned_head_long::case02_align_to: [missing] -> pass (J1)
  • btree::set::is_subset_100_vs_10k: [missing] -> pass (J1)
  • char::methods::bench_to_digit_radix_var: [missing] -> pass (J1)
  • num::int_pow::overflowing_pow_variable: [missing] -> pass (J1)
  • num::int_sqrt::u16::isqrt_extended: [missing] -> pass (J1)
  • os::unix::net::tests::vectored: [missing] -> pass (J1)
  • sort::tests::stable::correct_i32_narrow: [missing] -> pass (J1)
  • sort::tests::stable::deterministic_i32_descending: [missing] -> pass (J1)
  • str::char_count::ru_tiny::case01_filter_count_cont_bytes: [missing] -> pass (J1)
  • string::from_utf8_lossy_100_multibyte: [missing] -> pass (J1)
  • time::instant_contention_08_threads: [missing] -> pass (J1)
  • vec::bench_extend_from_slice_0000_0100: [missing] -> pass (J1)
  • vec::bench_in_place_u128_1000_i0: [missing] -> pass (J1)
  • sort::tests::unstable::correct_i32_random_d8: [missing] -> ignore (J2)
  • errors::verify_ast_passes_auto_generic_29: [missing] -> pass (J3)
  • errors::verify_builtin_macros_non_unit_default_48: [missing] -> pass (J3)
  • errors::verify_codegen_ssa_invalid_monomorphization_unsupported_symbol_of_size_117: [missing] -> pass (J3)
  • errors::verify_codegen_ssa_rlib_incompatible_dependency_formats_43: [missing] -> pass (J3)
  • errors::verify_codegen_ssa_xcrun_unsuccessful_140: [missing] -> pass (J3)
  • errors::verify_metadata_import_name_type_form_72: [missing] -> pass (J3)
  • errors::verify_mir_build_leading_irrefutable_let_patterns_8: [missing] -> pass (J3)
  • errors::verify_mir_transform_ffi_unwind_call_6: [missing] -> pass (J3)
  • errors::verify_passes_macro_use_93: [missing] -> pass (J3)
  • markdown::parse::tests::test_list_with_space: [missing] -> pass (J3)
  • spec::tests::i586_unknown_redox: [missing] -> pass (J3)
  • spec::tests::x86_64_unknown_fuchsia: [missing] -> pass (J3)
  • spec::tests::x86_64_win7_windows_gnu: [missing] -> pass (J3)
  • tests::format_align_fill: [missing] -> pass (J3)
  • tests::parse_lint_multiple_path: [missing] -> pass (J3)
  • tests::test_typed_arena_clear: [missing] -> pass (J3)

Stage 2

  • collections::btree::map::tests::test_append_14: pass -> [missing] (J0)
  • collections::btree::set::tests::test_from_iter: pass -> [missing] (J0)
  • f64::test_classify: pass -> [missing] (J0)
  • io::borrowed_buf::initialize_unfilled: pass -> [missing] (J0)
  • io::cursor::tests::test_eq: pass -> [missing] (J0)
  • io::stdio::tests::stdout_unwind_safe: pass -> [missing] (J0)
  • iter::adapters::flat_map::test_double_ended_flat_map: pass -> [missing] (J0)
  • macros::assert_eq_trailing_comma: pass -> [missing] (J0)
  • mpsc_sync::send2: pass -> [missing] (J0)
  • num::flt2dec::strategy::grisu::test_max_pow10_no_more_than: pass -> [missing] (J0)
  • num::i64::test_count_ones: pass -> [missing] (J0)
  • num::u16::test_isolate_most_significant_one: pass -> [missing] (J0)
  • num::u64::test_unbounded_shl: pass -> [missing] (J0)
  • slice::test_rchunks_nth_back: pass -> [missing] (J0)
  • sort::tests::unstable::stability_string_random_z1: pass -> [missing] (J0)
  • string::test_push_str: pass -> [missing] (J0)
  • vec::test_slice_from_mut: pass -> [missing] (J0)
  • vec_deque::test_collect_from_into_iter_keeps_allocation: pass -> [missing] (J0)
  • net::tcp::tests::connect_error: pass -> [missing] (J1)
  • net::udp::tests::ttl: pass -> [missing] (J1)
  • slice::rotate_tiny_by1: pass -> [missing] (J1)
  • sort::tests::stable::stability_i32_random: pass -> [missing] (J1)
  • sort::tests::unstable::correct_i32_random_d1024: pass -> [missing] (J1)
  • sort::tests::unstable::panic_observable_is_less_random_d20: pass -> [missing] (J1)
  • sort::tests::unstable::stability_string_saw_mixed: pass -> [missing] (J1)
  • str::char_count::emoji_huge::case03_manual_char_len: pass -> [missing] (J1)
  • sort::tests::stable::panic_retain_orig_set_string_random_d20: ignore -> [missing] (J2)
  • sort::tests::stable::violate_ord_retain_orig_set_i32_saw_mixed: ignore -> [missing] (J2)
  • errors::verify_metadata_newer_crate_version_65: pass -> [missing] (J3)
  • errors::verify_parse_async_move_order_incorrect_58: pass -> [missing] (J3)
  • errors::verify_parse_loop_else_23: pass -> [missing] (J3)
  • errors::verify_passes_macro_export_on_decl_macro_95: pass -> [missing] (J3)
  • errors::verify_passes_params_not_allowed_133: pass -> [missing] (J3)
  • errors::verify_passes_unstable_attr_for_already_stable_feature_155: pass -> [missing] (J3)
  • errors::verify_resolve_static_lifetime_is_reserved_48: pass -> [missing] (J3)
  • lints::verify_lint_extern_crate_not_idiomatic_142: pass -> [missing] (J3)
  • maybe_transmutable::tests::nonzero::should_permit_valid_transmutation: pass -> [missing] (J3)
  • parser::tests::multiple_labels_with_message: pass -> [missing] (J3)
  • parser::tokenstream::tests::test_eq_0: pass -> [missing] (J3)
  • spec::tests::x86_64_unknown_fuchsia: pass -> [missing] (J3)
  • transitive_relation::tests::mubs_best_choice2: pass -> [missing] (J3)

(and 16586 additional test diffs)

Additionally, 16891 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 4eca99a18eab3d4e28ed1ce3ee620d442955a470 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. x86_64-apple-2: 1212.7s -> 4990.7s (311.5%)
  2. test-various: 2277.9s -> 4144.4s (81.9%)
  3. x86_64-gnu-aux: 4244.3s -> 6169.7s (45.4%)
  4. dist-aarch64-apple: 4749.3s -> 5825.6s (22.7%)
  5. dist-x86_64-apple: 8384.1s -> 7120.5s (-15.1%)
  6. aarch64-apple: 3648.7s -> 4100.0s (12.4%)
  7. dist-x86_64-mingw: 8662.3s -> 7625.9s (-12.0%)
  8. dist-apple-various: 6212.1s -> 6886.2s (10.9%)
  9. aarch64-gnu-debug: 4410.2s -> 3981.7s (-9.7%)
  10. dist-various-1: 4770.3s -> 4400.0s (-7.8%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (4eca99a): 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 (primary -0.7%, secondary -3.2%)

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.9% [0.5%, 1.4%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.4% [-2.8%, -2.1%] 2
Improvements ✅
(secondary)
-3.2% [-4.2%, -2.2%] 2
All ❌✅ (primary) -0.7% [-2.8%, 1.4%] 4

Cycles

Results (primary -0.4%)

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)
1.3% [1.3%, 1.3%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.2% [-2.2%, -2.2%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.4% [-2.2%, 1.3%] 2

Binary size

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

Bootstrap: 771.902s -> 771.795s (-0.01%)
Artifact size: 365.42 MiB -> 365.42 MiB (0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. PG-exploit-mitigations Project group: Exploit mitigations S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.