Skip to content

miri subtree update #145632

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

Closed
wants to merge 43 commits into from
Closed

miri subtree update #145632

wants to merge 43 commits into from

Conversation

RalfJung
Copy link
Member

Subtree update of miri to rust-lang/miri@c304485.

Created using https://github.com/rust-lang/josh-sync.

r? @ghost

Kobzol and others added 30 commits July 29, 2025 10:16
Use GH app for authenticating pull PRs
rely on preinstalled rustup on windows-arm
This updates the rust-version file to adcb3d3.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: adcb3d3
Filtered ref: 5825740f16c56a1dac078765954330b987825b73

This merge was created using https://github.com/rust-lang/josh-sync.
This updates the rust-version file to 07b7dc9.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 07b7dc9
Filtered ref: 3785af8cd0fe0eeb48a0f920ca3fae973cf842d7

This merge was created using https://github.com/rust-lang/josh-sync.
This updates the rust-version file to 4c7749e.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 4c7749e
Filtered ref: 9742b5940dcb4aea810f9ce020a92b3f72ed7bb4

This merge was created using https://github.com/rust-lang/josh-sync.
This updates the rust-version file to 1553adf.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 1553adf
Filtered ref: e5ee70aa5f36dacdc6df9490e867c45aa4e51c18

This merge was created using https://github.com/rust-lang/josh-sync.
This updates the rust-version file to 3507a74.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 3507a74
Filtered ref: 67f9124a1e199effc310447c1c1f9548093bd8f9

This merge was created using https://github.com/rust-lang/josh-sync.
The Miri Cronjob Bot and others added 12 commits August 18, 2025 04:59
This updates the rust-version file to 425a9c0.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 425a9c0
Filtered ref: 7e955d5a6c676a099595bdfaec0705d3703e7a3c

This merge was created using https://github.com/rust-lang/josh-sync.
…awesomeness

triagebot: Show range-diff links on force pushes
When a symbol only has a weak definition, this definition will be
picked. When a symbol has both a weak and a regular definition, the
regular definition will be picked instead.
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 19, 2025
@rustbot
Copy link
Collaborator

rustbot commented Aug 19, 2025

The Miri subtree was changed

cc @rust-lang/miri

@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 19, 2025

📌 Commit f9d08d9 has been approved by RalfJung

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 Aug 19, 2025
@rust-log-analyzer

This comment has been minimized.

jhpratt added a commit to jhpratt/rust that referenced this pull request Aug 19, 2025
@@ -1,4 +1,3 @@
#![cfg_attr(bootstrap, feature(strict_overflow_ops))]
Copy link
Member

Choose a reason for hiding this comment

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

Looks like this is premature given the CI failure both here and #145636 (comment)

Copy link
Member Author

@RalfJung RalfJung Aug 20, 2025

Choose a reason for hiding this comment

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

Hm... @saethlin you removed this, any idea what's happening here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Seems like there's a warning/error complaining about bootstrap being an unknown-cfg in Miri. I guess we'll have to add it to the list.

Copy link
Member

Choose a reason for hiding this comment

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

🤔 yeah, I thought since it was unknown it couldn't be set anymore

@jhpratt
Copy link
Member

jhpratt commented Aug 19, 2025

@bors r- (failing CI)

@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 Aug 19, 2025
@RalfJung RalfJung closed this Aug 20, 2025
@RalfJung RalfJung deleted the miri branch August 20, 2025 07:35
@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 20, 2025
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
tests/fail/tree_borrows/reserved/cell-protected-write.rs ... ok
tests/fail/tree_borrows/reserved/int-protected-write.rs ... ok

FAILED TEST: tests/fail/function_calls/arg_inplace_locals_alias.rs (revision `tree`)
command: MIRI_ENV_VAR_TEST="0" MIRI_TEMP="/tmp/miri-uitest-AFe5EE" RUST_BACKTRACE="1" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/miri" "--error-format=json" "--sysroot=/checkout/obj/build/x86_64-unknown-linux-gnu/miri-sysroot" "-Dwarnings" "-Dunused" "-Ainternal_features" "-Zui-testing" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/tests/fail/function_calls" "tests/fail/function_calls/arg_inplace_locals_alias.rs" "-Zmiri-disable-validation" "-Zmiri-tree-borrows" "--edition" "2021" "--cfg=tree" "-Cextra-filename=tree"

error: actual output differed from expected
Execute `./miri test --bless` to update `tests/fail/function_calls/arg_inplace_locals_alias.tree.stderr` to the actual output
--- tests/fail/function_calls/arg_inplace_locals_alias.tree.stderr
+++ <stderr output>
 error: Undefined Behavior: read access through <TAG> (root of the allocation) at ALLOC[0x0] is forbidden
   --> tests/fail/function_calls/arg_inplace_locals_alias.rs:LL:CC
... 3 lines skipped ...
    |
    = help: this indicates a potential bug in the program: it performed an invalid operation, but the Tree Borrows rules it violated are still experimental
+   = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/tree-borrows.md for further information
    = help: the accessed tag <TAG> (root of the allocation) is foreign to the protected tag <TAG> (i.e., it is not a child)
    = help: this foreign read access would cause the protected tag <TAG> (currently Active) to become Disabled
... 22 lines skipped ...
 error: aborting due to 1 previous error
 

Full unnormalized output:
error: Undefined Behavior: read access through <176> (root of the allocation) at alloc84[0x0] is forbidden
##[error]  --> tests/fail/function_calls/arg_inplace_locals_alias.rs:19:13
   |
LL |             Call(_unit = callee(Move(non_copy), Move(non_copy)), ReturnTo(after_call), UnwindContinue())
   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Undefined Behavior occurred here
   |
   = help: this indicates a potential bug in the program: it performed an invalid operation, but the Tree Borrows rules it violated are still experimental
   = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/tree-borrows.md for further information
   = help: the accessed tag <176> (root of the allocation) is foreign to the protected tag <177> (i.e., it is not a child)
   = help: this foreign read access would cause the protected tag <177> (currently Active) to become Disabled
   = help: protected tags must never be Disabled
help: the accessed tag <176> was created here
  --> tests/fail/function_calls/arg_inplace_locals_alias.rs:19:13
   |
LL |             Call(_unit = callee(Move(non_copy), Move(non_copy)), ReturnTo(after_call), UnwindContinue())
   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
help: the protected tag <177> was created here, in the initial state Reserved
  --> tests/fail/function_calls/arg_inplace_locals_alias.rs:32:5
   |
LL |     y.0 = 0;
   |     ^^^^^^^
help: the protected tag <177> later transitioned to Active due to a child write access at offsets [0x0..0x4]
  --> tests/fail/function_calls/arg_inplace_locals_alias.rs:32:5
   |
LL |     y.0 = 0;
   |     ^^^^^^^
   = help: this transition corresponds to the first write to a 2-phase borrowed mutable reference
---



full stderr:
error: Undefined Behavior: read access through <176> (root of the allocation) at alloc84[0x0] is forbidden
##[error]  --> tests/fail/function_calls/arg_inplace_locals_alias.rs:19:13
   |
LL |             Call(_unit = callee(Move(non_copy), Move(non_copy)), ReturnTo(after_call), UnwindContinue())
   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Undefined Behavior occurred here
   |
   = help: this indicates a potential bug in the program: it performed an invalid operation, but the Tree Borrows rules it violated are still experimental
   = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/tree-borrows.md for further information
   = help: the accessed tag <176> (root of the allocation) is foreign to the protected tag <177> (i.e., it is not a child)
   = help: this foreign read access would cause the protected tag <177> (currently Active) to become Disabled
   = help: protected tags must never be Disabled
help: the accessed tag <176> was created here
  --> tests/fail/function_calls/arg_inplace_locals_alias.rs:19:13
   |
LL |             Call(_unit = callee(Move(non_copy), Move(non_copy)), ReturnTo(after_call), UnwindContinue())
   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
help: the protected tag <177> was created here, in the initial state Reserved
  --> tests/fail/function_calls/arg_inplace_locals_alias.rs:32:5
   |
LL |     y.0 = 0;
   |     ^^^^^^^
help: the protected tag <177> later transitioned to Active due to a child write access at offsets [0x0..0x4]
  --> tests/fail/function_calls/arg_inplace_locals_alias.rs:32:5
   |
LL |     y.0 = 0;
   |     ^^^^^^^
   = help: this transition corresponds to the first write to a 2-phase borrowed mutable reference
---
Location:
   /cargo/registry/src/index.crates.io-1949cf8c6b5b557f/ui_test-0.30.2/src/lib.rs:365

  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ BACKTRACE ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
   1: <color_eyre[128627c0e79b299e]::config::EyreHook>::into_eyre_hook::{closure#0}<unknown>
      at <unknown source file>:<unknown line>
   2: eyre[cb433822f7a17f0a]::private::format_err<unknown>
      at <unknown source file>:<unknown line>
   3: ui_test[f377b2388d5ab037]::run_tests_generic::<ui_test[f377b2388d5ab037]::default_file_filter, ui[f9a0506aa3a53468]::run_tests::{closure#1}, alloc[60beba520d8f5ae6]::boxed::Box<dyn ui_test[f377b2388d5ab037]::status_emitter::StatusEmitter>><unknown>
      at <unknown source file>:<unknown line>
   4: ui[f9a0506aa3a53468]::ui<unknown>
      at <unknown source file>:<unknown line>
   5: ui[f9a0506aa3a53468]::main<unknown>
      at <unknown source file>:<unknown line>
   6: std[2e3bb9c95d0dfd15]::sys::backtrace::__rust_begin_short_backtrace::<fn() -> core[d626bdad7866ce30]::result::Result<(), eyre[cb433822f7a17f0a]::Report>, core[d626bdad7866ce30]::result::Result<(), eyre[cb433822f7a17f0a]::Report>><unknown>
      at <unknown source file>:<unknown line>
   7: std[2e3bb9c95d0dfd15]::rt::lang_start::<core[d626bdad7866ce30]::result::Result<(), eyre[cb433822f7a17f0a]::Report>>::{closure#0}<unknown>
      at <unknown source file>:<unknown line>
   8: std[2e3bb9c95d0dfd15]::rt::lang_start_internal<unknown>
      at <unknown source file>:<unknown line>
   9: main<unknown>
      at <unknown source file>:<unknown line>
  10: __libc_start_main<unknown>
      at <unknown source file>:<unknown line>
  11: _start<unknown>
      at <unknown source file>:<unknown line>

Run with COLORBT_SHOW_HIDDEN=1 environment variable to disable frame filtering.
Run with RUST_BACKTRACE=full to include source snippets.
error: test failed, to rerun pass `--test ui`

Caused by:
  process didn't exit successfully: `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/ui-de637b1a885c82e4` (exit status: 1)
Command `/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo test --target x86_64-unknown-linux-gnu -Zbinary-dep-depinfo -j 4 -Zroot-dir=/checkout --locked --color always --release --manifest-path /checkout/src/tools/miri/Cargo.toml -- [workdir=/checkout]` failed with exit code 1
Created at: src/bootstrap/src/core/build_steps/tool.rs:189:21
Executed at: src/bootstrap/src/core/build_steps/test.rs:644:19

Command has failed. Rerun with -v to see more details.
Bootstrap failed while executing `test --stage 2 src/tools/miri src/tools/miri/cargo-miri`
Build completed unsuccessfully in 0:39:58
  local time: Wed Aug 20 08:12:54 UTC 2025
  network time: Wed, 20 Aug 2025 08:12:54 GMT
##[error]Process completed with exit code 1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.