Rollup of 9 pull requests by JonathanBrouwer · Pull Request #158228 · rust-lang/rust

JonathanBrouwer · 2026-06-21T21:04:36Z

Successful merges:

bootstrap: add bootstrap step to run intrinsic-test in CI #156356 (bootstrap: add bootstrap step to run intrinsic-test in CI)
Move proc-macro dlopen from proc-macro-srv to rustc_metadata #157711 (Move proc-macro dlopen from proc-macro-srv to rustc_metadata)
rebuild LLVM when bootstrap.toml config changes #157836 (rebuild LLVM when bootstrap.toml config changes)
Don't try to remove assignments in SimplifyComparisonIntegral #158214 (Don't try to remove assignments in SimplifyComparisonIntegral)
miri subtree update #158226 (miri subtree update)
Update actions/download-artifact action to v8.0.1 #158108 (Update actions/download-artifact action to v8.0.1)
Update backtrace submodule to pick up AIX related fixes. #158150 (Update backtrace submodule to pick up AIX related fixes.)
Use the target checking infrastructure for the diagnostic attributes #158178 (Use the target checking infrastructure for the diagnostic attributes)
Add me to some rotation groups #158195 (Add me to some rotation groups)

It doesn't access the Session anyway.

This will make it easier to change how proc-macros are implemented on the rustc side. For example allowing support for wasm proc-macros without duplicating the implementation between proc-macro-srv and rustc.

This updates the rust-version file to 4e391cf.

Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@4e391cf Filtered ref: rust-lang/miri@359bdad Upstream diff: rust-lang/rust@029c9e1...4e391cf This merge was created using https://github.com/rust-lang/josh-sync.

Automatic Rustup

This updates the rust-version file to 3daae5e.

Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@3daae5e Filtered ref: rust-lang/miri@0947a45 Upstream diff: rust-lang/rust@4e391cf...3daae5e This merge was created using https://github.com/rust-lang/josh-sync.

Automatic Rustup

…MIR statements

[Priroda] Add `stepi` and `locals` commands, and handle repeated breakpoint hits on the same source line

This updates the rust-version file to c55fad5.

Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@c55fad5 Filtered ref: rust-lang/miri@1f32359 Upstream diff: rust-lang/rust@3daae5e...c55fad5 This merge was created using https://github.com/rust-lang/josh-sync.

ipc-channel 0.21 switched serialization from bincode to postcard, removing the transitive dependency on the unmaintained bincode 1.x (RUSTSEC-2025-0141). All APIs Miri uses remain unchanged.

ipc-channel 0.22 re-exports `TryRecvError` at the crate root instead of the `ipc` module, where it is now a private import.

Rustup

Update ipc-channel to 0.22 to drop bincode dependency

This updates the rust-version file to 01f54e8.

Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@01f54e8 Filtered ref: rust-lang/miri@009b09c Upstream diff: rust-lang/rust@c55fad5...01f54e8 This merge was created using https://github.com/rust-lang/josh-sync.

JonathanBrouwer · 2026-06-21T21:04:44Z

@bors r+ rollup=never p=5

rust-bors · 2026-06-21T21:04:47Z

📌 Commit 4849b10 has been approved by JonathanBrouwer

It is now in the queue for this repository.

rust-log-analyzer · 2026-06-21T21:59:16Z

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)


--- BACKTRACE vvv
   0: <bootstrap::utils::exec::DeferredCommand>::finish_process
             at /checkout/src/bootstrap/src/utils/exec.rs:939:17
   1: <bootstrap::utils::exec::DeferredCommand>::wait_for_output::<&bootstrap::utils::exec::ExecutionContext>
             at /checkout/src/bootstrap/src/utils/exec.rs:831:21
   2: <bootstrap::utils::exec::ExecutionContext>::run
             at /checkout/src/bootstrap/src/utils/exec.rs:741:45
   3: <bootstrap::utils::exec::BootstrapCommand>::run::<&bootstrap::core::builder::Builder>
             at /checkout/src/bootstrap/src/utils/exec.rs:339:27
   4: bootstrap::core::build_steps::toolstate::checkout_toolstate_repo
             at /checkout/src/bootstrap/src/core/build_steps/toolstate.rs:319:10
   5: <bootstrap::core::build_steps::toolstate::ToolStateCheck as bootstrap::core::builder::Step>::run
             at /checkout/src/bootstrap/src/core/build_steps/toolstate.rs:177:9
   6: <bootstrap::core::builder::Builder>::ensure::<bootstrap::core::build_steps::toolstate::ToolStateCheck>
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1597:36
   7: <bootstrap::core::build_steps::toolstate::ToolStateCheck as bootstrap::core::builder::Step>::make_run
             at /checkout/src/bootstrap/src/core/build_steps/toolstate.rs:230:21
   8: <bootstrap::core::builder::StepDescription>::maybe_run
             at /checkout/src/bootstrap/src/core/builder/mod.rs:476:13
   9: bootstrap::core::builder::cli_paths::match_paths_to_steps_and_run
             at /checkout/src/bootstrap/src/core/builder/cli_paths.rs:232:18
  10: <bootstrap::core::builder::Builder>::run_step_descriptions
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1140:9
  11: <bootstrap::core::builder::Builder>::execute_cli
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1119:14
  12: <bootstrap::Build>::build
             at /checkout/src/bootstrap/src/lib.rs:803:25
  13: bootstrap::main
             at /checkout/src/bootstrap/src/bin/main.rs:130:11
  14: <fn() as core::ops::function::FnOnce<()>>::call_once
             at /rustc/0417c25868d6dfbd1c291dfeae950504faa6f790/library/core/src/ops/function.rs:250:5
  15: std::sys::backtrace::__rust_begin_short_backtrace::<fn(), ()>
             at /rustc/0417c25868d6dfbd1c291dfeae950504faa6f790/library/std/src/sys/backtrace.rs:166:18
  16: std::rt::lang_start::<()>::{closure#0}
             at /rustc/0417c25868d6dfbd1c291dfeae950504faa6f790/library/std/src/rt.rs:206:18
  17: <&dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe as core::ops::function::FnOnce<()>>::call_once
             at /rustc/0417c25868d6dfbd1c291dfeae950504faa6f790/library/core/src/ops/function.rs:287:21
  18: std::panicking::catch_unwind::do_call::<&dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe, i32>
             at /rustc/0417c25868d6dfbd1c291dfeae950504faa6f790/library/std/src/panicking.rs:581:40
  19: std::panicking::catch_unwind::<i32, &dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe>
             at /rustc/0417c25868d6dfbd1c291dfeae950504faa6f790/library/std/src/panicking.rs:544:19
  20: std::panic::catch_unwind::<&dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe, i32>
             at /rustc/0417c25868d6dfbd1c291dfeae950504faa6f790/library/std/src/panic.rs:359:14
  21: std::rt::lang_start_internal::{closure#0}
             at /rustc/0417c25868d6dfbd1c291dfeae950504faa6f790/library/std/src/rt.rs:175:24
  22: std::panicking::catch_unwind::do_call::<std::rt::lang_start_internal::{closure#0}, isize>
             at /rustc/0417c25868d6dfbd1c291dfeae950504faa6f790/library/std/src/panicking.rs:581:40
---
  29: __libc_start_main
  30: _start


Command has failed. Rerun with -v to see more details.
Build completed unsuccessfully in 0:02:14
  local time: Sun Jun 21 21:57:47 UTC 2026
  network time: Sun, 21 Jun 2026 21:57:48 GMT
##[error]Process completed with exit code 1.
##[group]Run echo "disk usage:"

rust-bors · 2026-06-22T02:27:52Z

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 28m 2s
Pushing e238223 to main...

rust-timer · 2026-06-22T02:30:36Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#156356	bootstrap: add bootstrap step to run intrinsic-test in CI	`023823f2a92215a5de508aac4685747da7a5773a` (link)
#157711	Move proc-macro dlopen from proc-macro-srv to rustc_metadata	`1dda445326036bc045a8b70b1a8c234abf5bbff6` (link)
#157836	rebuild LLVM when `bootstrap.toml` config changes	`26cf92e4edd4c9096405de2e505fa5a74edf0b5c` (link)
#158108	Update actions/download-artifact action to v8.0.1	`f5f2eaad4da8097ee0b6409b5a40981ba0b4f6fe` (link)
#158150	Update backtrace submodule to pick up AIX related fixes.	`486253948757ff1f96599cbfadb1f5e45058ab89` (link)
#158178	Use the target checking infrastructure for the diagnostic a…	`de4be36e52f23b1651d37ae1f62a539148d87095` (link)
#158195	Add me to some rotation groups	`43a3aaaa1c6e08f54c62df60894dcc8953694073` (link)
#158214	Don't try to remove assignments in SimplifyComparisonIntegr…	`6fd92a3efedde1ce4abf9f9aa076b299f58848a8` (link)
#158226	miri subtree update	`cf5dbc021d2a36cb11d29628e7e058137c9f25d7` (link)

previous master: 91fe22da80

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

github-actions · 2026-06-22T02:30:59Z

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 91fe22d (parent) -> e238223 (this PR)

Test differences

Show 4 test diffs

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

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard e238223b17937be1d3682b7f28eb91945f372ae8 --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

x86_64-gnu-gcc-core-tests: 6m 54s -> 14m 6s (+104.3%)
x86_64-msvc-ext3: 1h 3m -> 1h 51m (+74.9%)
x86_64-gnu: 1h 45m -> 2h 27m (+39.8%)
dist-aarch64-linux: 1h 44m -> 2h 18m (+31.7%)
dist-x86_64-msvc-alt: 2h 44m -> 2h 1m (-26.4%)
i686-gnu-2: 1h 22m -> 1h 41m (+22.8%)
x86_64-gnu-debug: 1h 43m -> 2h 6m (+22.6%)
dist-i686-mingw: 2h 38m -> 2h 4m (-21.7%)
dist-apple-various: 1h 44m -> 2h 5m (+20.1%)
x86_64-rust-for-linux: 43m 44s -> 52m 7s (+19.2%)

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 · 2026-06-22T03:09:51Z

Finished benchmarking commit (e238223): comparison URL.

Overall result: ❌✅ regressions and improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

	mean	range	count
Regressions ❌ (primary)	0.3%	[0.3%, 0.3%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.2%	[-0.2%, -0.2%]	1
All ❌✅ (primary)	0.3%	[0.3%, 0.3%]	2

Max RSS (memory usage)

Results (primary 3.6%, secondary 5.2%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	3.6%	[0.5%, 12.5%]	177
Regressions ❌ (secondary)	5.2%	[0.8%, 11.5%]	277
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	3.6%	[0.5%, 12.5%]	177

Cycles

Results (primary 4.5%, secondary 4.2%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	4.5%	[1.8%, 8.7%]	63
Regressions ❌ (secondary)	4.9%	[1.9%, 9.1%]	47
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.0%	[-6.7%, -2.0%]	4
All ❌✅ (primary)	4.5%	[1.8%, 8.7%]	63

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 480.522s -> 505.375s (5.17%)
Artifact size: 391.37 MiB -> 352.99 MiB (-9.81%)

panstromek · 2026-06-23T06:09:40Z

This is pretty broad regression on Max RSS, wall time and bootstrap. I suspect it's the mir-opt fix from #158214, started a perf run there.

[edit] the artifact improvements are also a bit suspicious. Maybe there's something else weird going on? Could it be that #157836 uncovers some weird behaviour where it introduces a new LLVM rebuild on CI that'll make it smaller?

panstromek · 2026-06-23T08:17:16Z

Yea, so it's #157836 in the end. I'll continue the discussion there.

@rustbot label +perf-regression-triaged

btw. The bot marked this as "no action needed" only based on instruction counts. That's a bit unfortunate

bjorn3 and others added 30 commits June 10, 2026 16:45

Make generate_proc_macro_decls_symbol a standalone function

f80ef13

It doesn't access the Session anyway.

Extract load_symbol_from_dylib and dlsym_proc_macros into a new module

f80c17e

Move proc-macro dlopen from proc-macro-srv to rustc_metadata

88c2f7d

This will make it easier to change how proc-macros are implemented on the rustc side. For example allowing support for wasm proc-macros without duplicating the implementation between proc-macro-srv and rustc.

[Priroda] Rename step to stepi for single MIR instruction stepping

d17ba8a

[Priroda] Add step command to step through source lines

bb0a187

Prepare for merging from rust-lang/rust

8a7e1d7

This updates the rust-version file to 4e391cf.

fmt

cf0ea64

Merge pull request rust-lang#5105 from rust-lang/rustup-2026-06-13

72ef4e7

Automatic Rustup

Prepare for merging from rust-lang/rust

fefab0c

This updates the rust-version file to 3daae5e.

Merge pull request rust-lang#5108 from rust-lang/rustup-2026-06-15

def508c

Automatic Rustup

[Priroda] avoid repeated stops when one source line maps to multiple …

f87a1ba

…MIR statements

[Priroda] Fix clippy warnings

d97a49f

[Priroda] Add locals command to show variable names in the current frame

a272040

Merge pull request rust-lang#5112 from moabo3li/priroda-commands

d69410b

[Priroda] Add `stepi` and `locals` commands, and handle repeated breakpoint hits on the same source line

Prepare for merging from rust-lang/rust

44bb193

This updates the rust-version file to c55fad5.

Update ipc-channel to 0.22 to drop bincode dependency

d3cb383

ipc-channel 0.21 switched serialization from bincode to postcard, removing the transitive dependency on the unmaintained bincode 1.x (RUSTSEC-2025-0141). All APIs Miri uses remain unchanged.

ipc-channel: Use crate-root TryRecvError path

2f931e2

ipc-channel 0.22 re-exports `TryRecvError` at the crate root instead of the `ipc` module, where it is now a private import.

Merge pull request rust-lang#5117 from RalfJung/rustu

f4d74a1

Rustup

Merge pull request rust-lang#5115 from Turbo87/update-ipc-channel

54c9c72

Update ipc-channel to 0.22 to drop bincode dependency

Update actions/download-artifact action to v8.0.1

48fea62

Update backtrace submodule to pick up AIX related fixes.

d81944d

Adjust InvalidTarget emitting for diagnostic attributes

93741ff

Use the new logic for the diagnostic attributes

9e09aee

Add me to some rotation groups

b9cd5ad

Prepare for merging from rust-lang/rust

35b4396

This updates the rust-version file to 01f54e8.

rebuild LLVM when bootstrap.toml config changes

48e7c28

rust-bors Bot 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 Jun 21, 2026

This comment has been minimized.

Sign in to view

rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 22, 2026

rust-bors Bot merged commit e238223 into rust-lang:main Jun 22, 2026
7 of 14 checks passed

rustbot added this to the 1.98.0 milestone Jun 22, 2026

This was referenced Jun 22, 2026

Add lint againts invalid runtime symbol definitions #155521

Open

Implement support for proc macros on wasm32-wasip2 #157590

Draft

Move target checking for #[lang] to the attribute parser #158223

Open

This was referenced Jun 23, 2026

Don't try to remove assignments in SimplifyComparisonIntegral #158214

Merged

rebuild LLVM when bootstrap.toml config changes #157836

Merged

rustbot added the perf-regression-triaged The performance regression has been triaged. label Jun 23, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 9 pull requests#158228

Rollup of 9 pull requests#158228
rust-bors[bot] merged 45 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-AUgEk0s

JonathanBrouwer commented Jun 21, 2026

Uh oh!

JonathanBrouwer commented Jun 21, 2026

Uh oh!

rust-bors Bot commented Jun 21, 2026

Uh oh!

rust-log-analyzer commented Jun 21, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Jun 22, 2026

Uh oh!

Uh oh!

rust-timer commented Jun 22, 2026

Uh oh!

github-actions Bot commented Jun 22, 2026

Uh oh!

rust-timer commented Jun 22, 2026

Uh oh!

panstromek commented Jun 23, 2026 •

edited

Loading

Uh oh!

panstromek commented Jun 23, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

16 participants

Uh oh!

Conversation

JonathanBrouwer commented Jun 21, 2026

Uh oh!

JonathanBrouwer commented Jun 21, 2026

Uh oh!

rust-bors Bot commented Jun 21, 2026

Uh oh!

rust-log-analyzer commented Jun 21, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Jun 22, 2026

Uh oh!

Uh oh!

rust-timer commented Jun 22, 2026

Uh oh!

github-actions Bot commented Jun 22, 2026

Test differences

Job duration changes

Uh oh!

rust-timer commented Jun 22, 2026

Overall result: ❌✅ regressions and improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

panstromek commented Jun 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

panstromek commented Jun 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

16 participants

panstromek commented Jun 23, 2026 •

edited

Loading

panstromek commented Jun 23, 2026 •

edited

Loading