Rollup of 6 pull requests #142153

GuillaumeGomez · 2025-06-07T10:03:02Z

Successful merges:

Enable Non-determinism of float operations in Miri and change std tests #138062 (Enable Non-determinism of float operations in Miri and change std tests )
Allow #![doc(test(attr(..)))] everywhere #140560 (Allow #![doc(test(attr(..)))] everywhere)
Change __rust_no_alloc_shim_is_unstable to be a function #141061 (Change __rust_no_alloc_shim_is_unstable to be a function)
Add new Tier-3 targets: loongarch32-unknown-none* #142053 (Add new Tier-3 targets: loongarch32-unknown-none*)
Treat normalizing consts like normalizing types in deeply normalize #142126 (Treat normalizing consts like normalizing types in deeply normalize)
compiler: Treat ForceWarning as a Warning for diagnostic level #142148 (compiler: Treat ForceWarning as a Warning for diagnostic level)

r? @ghost
@rustbot modify labels: rollup

change tests in std, core and coretests.

This silences an ICE.

…-nondet, r=RalfJung Enable Non-determinism of float operations in Miri and change std tests Links to [rust-lang#4208](rust-lang/miri#4208) and [rust-lang#3555](rust-lang/miri#3555) in Miri. Non-determinism of floating point operations was disabled in rust-lang#137594 because it breaks the tests and doc-tests in core/coretests and std. This PR enables some of them. This pr includes the following changes: - Enables the float non-determinism but with a lower relative error of 4ULP instead of 16ULP - These operations now have a fixed output based on the C23 standard, except the pow operations, this is tracked in [rust-lang#4286](rust-lang/miri#4286 (comment)) - Changes tests that made incorrect assumptions about the operations, not to make that assumption anymore (from `assert_eq!` to `assert_approx_eq!`. - Changed the doctests of the stdlib of these operations to compare against fixed constants instead of `f*::EPSILON`, which now succeed with Miri and `-Zmiri-many-seeds` - Added a constant `APPROX_DELTA` in `std/tests/floats/f32.rs` which is used for approximation tests, but with a different value when run in Miri. This is to make these tests succeed. - Added tests in the float tests of Miri to test the C23 behaviour. Fixes rust-lang/miri#4208

…illaumeGomez Allow `#![doc(test(attr(..)))]` everywhere This PR adds the ability to specify [`#![doc(test(attr(..)))]`](https://doc.rust-lang.org/nightly/rustdoc/write-documentation/the-doc-attribute.html#testattr) ~~at module level~~ everywhere in addition to allowing it at crate-root. This is motivated by a recent PR rust-lang#140323 (by `@tgross35)` where we have to duplicate 2 attributes to every single `f16` and `f128` doctests, by allowing `#![doc(test(attr(..)))]` at module level (and everywhere else) we can omit them entirely and just have (in both module): ```rust #![doc(test(attr(feature(cfg_target_has_reliable_f16_f128))))] #![doc(test(attr(expect(internal_features))))] ``` Those new attributes are appended to the one found at crate-root or at a previous module. Those "global" attributes are compatible with merged doctests (they already were before). Given the small addition that this is, I'm proposing to insta-stabilize it, but I can feature-gate it if preferred. Best reviewed commit by commit. r? `@GuillaumeGomez`

Change __rust_no_alloc_shim_is_unstable to be a function This fixes a long sequence of issues: 1. A customer reported that building for Arm64EC was broken: rust-lang#138541 2. This was caused by a bug in my original implementation of Arm64EC support, namely that only functions on Arm64EC need to be decorated with `#` but Rust was decorating statics as well. 3. Once I corrected Rust to only decorate functions, I started linking failures where the linker couldn't find statics exported by dylib dependencies. This was caused by the compiler not marking exported statics in the generated DEF file with `DATA`, thus they were being exported as functions not data. 4. Once I corrected the way that the DEF files were being emitted, the linker started failing saying that it couldn't find `__rust_no_alloc_shim_is_unstable`. This is because the MSVC linker requires the declarations of statics imported from other dylibs to be marked with `dllimport` (whereas it will happily link to functions imported from other dylibs whether they are marked `dllimport` or not). 5. I then made a change to ensure that `__rust_no_alloc_shim_is_unstable` was marked as `dllimport`, but the MSVC linker started emitting warnings that `__rust_no_alloc_shim_is_unstable` was marked as `dllimport` but was declared in an obj file. This is a harmless warning which is a performance hint: anything that's marked `dllimport` must be indirected via an `__imp` symbol so I added a linker arg in the target to suppress the warning. 6. A customer then reported a similar warning when using `lld-link` (<rust-lang#140176 (comment)>). I don't think it was an implementation difference between the two linkers but rather that, depending on the obj that the declaration versus uses of `__rust_no_alloc_shim_is_unstable` landed in we would get different warnings, so I suppressed that warning as well: rust-lang#140954. 7. Another customer reported that they weren't using the Rust compiler to invoke the linker, thus these warnings were breaking their build: <rust-lang#140176 (comment)>. At that point, my original change was reverted (rust-lang#141024) leaving Arm64EC broken yet again. Taking a step back, a lot of these linker issues arise from the fact that `__rust_no_alloc_shim_is_unstable` is marked as `extern "Rust"` in the standard library and, therefore, assumed to be a foreign item from a different crate BUT the Rust compiler may choose to generate it either in the current crate, some other crate that will be statically linked in OR some other crate that will by dynamically imported. Worse yet, it is impossible while building a given crate to know if `__rust_no_alloc_shim_is_unstable` will statically linked or dynamically imported: it might be that one of its dependent crates is the one with an allocator kind set and thus that crate (which is compiled later) will decide depending if it has any dylib dependencies or not to import `__rust_no_alloc_shim_is_unstable` or generate it. Thus, there is no way to know if the declaration of `__rust_no_alloc_shim_is_unstable` should be marked with `dllimport` or not. There is a simple fix for all this: there is no reason `__rust_no_alloc_shim_is_unstable` must be a static. It needs to be some symbol that must be linked in; thus, it could easily be a function instead. As a function, there is no need to mark it as `dllimport` when dynamically imported which avoids the entire mess above. There may be a perf hit for changing the `volatile load` to be a `tail call`, so I'm happy to change that part back (although I question what the codegen of a `volatile load` would look like, and if the backend is going to try to use load-acquire semantics). Build with this change applied BEFORE rust-lang#140176 was reverted to demonstrate that there are no linking issues with either MSVC or MinGW: <https://github.com/rust-lang/rust/actions/runs/15078657205> Incidentally, I fixed `tests/run-make/no-alloc-shim` to work with MSVC as I needed it to be able to test locally (FYI for rust-lang#128602) r? `@bjorn3` cc `@jieyouxu`

Add new Tier-3 targets: `loongarch32-unknown-none*` MCP: rust-lang/compiler-team#865 NOTE: LoongArch32 ELF object support is available starting with object v0.37.0.

…elate, r=BoxyUwU Treat normalizing consts like normalizing types in deeply normalize ...so that we don't end up putting a top-level normalizes-to goal in the fulfillment context, which ICEs. This basically just models the normalize-const code off of the normalize-ty code above it, which uses an alias-relate goal instead. Fixes rust-lang#140571 r? lcnr

…arn, r=Urgau compiler: Treat ForceWarning as a Warning for diagnostic level This silences an ICE. No idea if this is the correct solution though tbh. r? `@oli-obk` Fixes rust-lang#142144

GuillaumeGomez · 2025-06-07T10:03:14Z

@bors r+ rollup=never p=5

bors · 2025-06-07T10:03:17Z

📌 Commit fbf35a8 has been approved by GuillaumeGomez

It is now in the queue for this repository.

rust-log-analyzer · 2025-06-07T10:41:51Z

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

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

tests/pass/float_nan.rs ... ok
tests/pass/0weak_memory_consistency_sc.rs ... ok

FAILED TEST: tests/pass/alloc-access-tracking.rs
command: MIRI_ENV_VAR_TEST="0" MIRI_TEMP="/tmp/miri-uitest-jv5JmD" 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/stage1-tools/x86_64-unknown-linux-gnu/tmp/miri_ui/0/tests/pass" "tests/pass/alloc-access-tracking.rs" "-Zmiri-track-alloc-id=20" "-Zmiri-track-alloc-accesses" "-Cpanic=abort" "--edition" "2021"

error: actual output differed from expected
Execute `./miri test --bless` to update `tests/pass/alloc-access-tracking.stderr` to the actual output
--- tests/pass/alloc-access-tracking.stderr
+++ <stderr output>
 note: tracking was triggered
   --> tests/pass/alloc-access-tracking.rs:LL:CC
    |
-LL |         let ptr = miri_alloc(123, 1);
+LL |         assert_eq!(*ptr, 42);
-   |                   ^^^^^^^^^^^^^^^^^^ created Miri bare-metal heap allocation of 123 bytes (alignment ALIGN bytes) with id $ALLOC
+   |         ^^^^^^^^^^^^^^^^^^^^ created stack variable allocation of 16 bytes (alignment ALIGN bytes) with id $ALLOC
    |
    = note: BACKTRACE:
-   = note: inside `miri_start` at tests/pass/alloc-access-tracking.rs:LL:CC
+   = note: inside `miri_start` at RUSTLIB/core/src/macros/mod.rs:LL:CC
+   = note: this note originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: tracking was triggered
   --> tests/pass/alloc-access-tracking.rs:LL:CC
    |
-LL |         *ptr = 42; // Crucially, only a write is printed here, no read!
+LL |         assert_eq!(*ptr, 42);
-   |         ^^^^^^^^^ write access to allocation with id $ALLOC
+   |         ^^^^^^^^^^^^^^^^^^^^ write access to allocation with id $ALLOC
    |
    = note: BACKTRACE:
-   = note: inside `miri_start` at tests/pass/alloc-access-tracking.rs:LL:CC
+   = note: inside `miri_start` at RUSTLIB/core/src/macros/mod.rs:LL:CC
+   = note: this note originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: tracking was triggered
   --> tests/pass/alloc-access-tracking.rs:LL:CC
    |
 LL |         assert_eq!(*ptr, 42);
+   |         ^^^^^^^^^^^^^^^^^^^^ write access to allocation with id $ALLOC
+   |
+   = note: BACKTRACE:
+   = note: inside `miri_start` at RUSTLIB/core/src/macros/mod.rs:LL:CC
+   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
+   = note: this note originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+note: tracking was triggered
+  --> tests/pass/alloc-access-tracking.rs:LL:CC
+   |
+LL |         assert_eq!(*ptr, 42);
    |         ^^^^^^^^^^^^^^^^^^^^ read access to allocation with id $ALLOC
    |
... 5 lines skipped ...
   --> tests/pass/alloc-access-tracking.rs:LL:CC
    |
-LL |         miri_dealloc(ptr, 123, 1);
+LL |         assert_eq!(*ptr, 42);
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^ freed allocation with id $ALLOC
+   |         ^^^^^^^^^^^^^^^^^^^^ write access to allocation with id $ALLOC
    |
    = note: BACKTRACE:
-   = note: inside `miri_start` at tests/pass/alloc-access-tracking.rs:LL:CC
+   = note: inside `miri_start` at RUSTLIB/core/src/macros/mod.rs:LL:CC
+   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
+   = note: this note originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 
+note: tracking was triggered
+  --> tests/pass/alloc-access-tracking.rs:LL:CC
+   |
+LL |         assert_eq!(*ptr, 42);
+   |         ^^^^^^^^^^^^^^^^^^^^ read access to allocation with id $ALLOC
+   |
+   = note: BACKTRACE:
+   = note: inside `miri_start` at RUSTLIB/core/src/macros/mod.rs:LL:CC
+   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
+   = note: this note originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+note: tracking was triggered
+  --> tests/pass/alloc-access-tracking.rs:LL:CC
+   |
+LL |         assert_eq!(*ptr, 42);
+   |         ^^^^^^^^^^^^^^^^^^^^ write access to allocation with id $ALLOC
+   |
+   = note: BACKTRACE:
+   = note: inside `miri_start` at RUSTLIB/core/src/macros/mod.rs:LL:CC
+   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
+   = note: this note originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+note: tracking was triggered
+  --> tests/pass/alloc-access-tracking.rs:LL:CC
+   |
+LL |         assert_eq!(*ptr, 42);
+   |         ^^^^^^^^^^^^^^^^^^^^ read access to allocation with id $ALLOC
+   |
+   = note: BACKTRACE:
+   = note: inside `miri_start` at RUSTLIB/core/src/macros/mod.rs:LL:CC
+   = note: this note originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+note: tracking was triggered
+  --> tests/pass/alloc-access-tracking.rs:LL:CC
+   |
+LL |         assert_eq!(*ptr, 42);
+   |         ^^^^^^^^^^^^^^^^^^^^ read access to allocation with id $ALLOC
+   |
+   = note: BACKTRACE:
+   = note: inside `miri_start` at RUSTLIB/core/src/macros/mod.rs:LL:CC
+   = note: this note originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+note: tracking was triggered
+  --> tests/pass/alloc-access-tracking.rs:LL:CC
+   |
+LL |         assert_eq!(*ptr, 42);
+   |         ^^^^^^^^^^^^^^^^^^^^ freed allocation with id $ALLOC
+   |
+   = note: BACKTRACE:
+   = note: inside `miri_start` at RUSTLIB/core/src/macros/mod.rs:LL:CC
+   = note: this note originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
+
---
   |         ^^^^^^^^^^^^^^^^^^^^ write access to allocation with id 20
   |
   = note: BACKTRACE:
   = note: inside `miri_start` at /checkout/library/core/src/macros/mod.rs:44:15: 44:32
   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
   = note: this note originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)

note: tracking was triggered
  --> tests/pass/alloc-access-tracking.rs:17:9
   |
LL |         assert_eq!(*ptr, 42);
---
   |         ^^^^^^^^^^^^^^^^^^^^ write access to allocation with id 20
   |
   = note: BACKTRACE:
   = note: inside `miri_start` at /checkout/library/core/src/macros/mod.rs:44:15: 44:32
   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
   = note: this note originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)

note: tracking was triggered
  --> tests/pass/alloc-access-tracking.rs:17:9
   |
LL |         assert_eq!(*ptr, 42);
   |         ^^^^^^^^^^^^^^^^^^^^ read access to allocation with id 20
   |
   = note: BACKTRACE:
   = note: inside `miri_start` at /checkout/library/core/src/macros/mod.rs:44:15: 44:32
   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
   = note: this note originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)

note: tracking was triggered
  --> tests/pass/alloc-access-tracking.rs:17:9
   |
LL |         assert_eq!(*ptr, 42);
   |         ^^^^^^^^^^^^^^^^^^^^ write access to allocation with id 20
   |
   = note: BACKTRACE:
   = note: inside `miri_start` at /checkout/library/core/src/macros/mod.rs:44:15: 44:32
   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
   = note: this note originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)

note: tracking was triggered
  --> tests/pass/alloc-access-tracking.rs:17:9
   |
LL |         assert_eq!(*ptr, 42);
---
   |         ^^^^^^^^^^^^^^^^^^^^ write access to allocation with id 20
   |
   = note: BACKTRACE:
   = note: inside `miri_start` at /checkout/library/core/src/macros/mod.rs:44:15: 44:32
   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
   = note: this note originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)

note: tracking was triggered
  --> tests/pass/alloc-access-tracking.rs:17:9
   |
LL |         assert_eq!(*ptr, 42);
---
   |         ^^^^^^^^^^^^^^^^^^^^ write access to allocation with id 20
   |
   = note: BACKTRACE:
   = note: inside `miri_start` at /checkout/library/core/src/macros/mod.rs:44:15: 44:32
   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
   = note: this note originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)

note: tracking was triggered
  --> tests/pass/alloc-access-tracking.rs:17:9
   |
LL |         assert_eq!(*ptr, 42);
   |         ^^^^^^^^^^^^^^^^^^^^ read access to allocation with id 20
   |
   = note: BACKTRACE:
   = note: inside `miri_start` at /checkout/library/core/src/macros/mod.rs:44:15: 44:32
   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
   = note: this note originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)

note: tracking was triggered
  --> tests/pass/alloc-access-tracking.rs:17:9
   |
LL |         assert_eq!(*ptr, 42);
   |         ^^^^^^^^^^^^^^^^^^^^ write access to allocation with id 20
   |
   = note: BACKTRACE:
   = note: inside `miri_start` at /checkout/library/core/src/macros/mod.rs:44:15: 44:32
   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
   = note: this note originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)

note: tracking was triggered
  --> tests/pass/alloc-access-tracking.rs:17:9
   |
LL |         assert_eq!(*ptr, 42);
---

Location:
   /cargo/registry/src/index.crates.io-1949cf8c6b5b557f/ui_test-0.29.2/src/lib.rs:369

Backtrace omitted. Run with RUST_BACKTRACE=1 environment variable to display it.
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/stage1-tools/x86_64-unknown-linux-gnu/release/deps/ui-f58affc77002becb` (exit status: 1)
Command has failed. Rerun with -v to see more details.
Build completed unsuccessfully in 0:04:33
  local time: Sat Jun  7 10:41:42 UTC 2025
  network time: Sat, 07 Jun 2025 10:41:42 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

matthiaskrgr · 2025-06-07T11:13:44Z

@bors r-

RalfJung · 2025-06-07T13:18:18Z

#141061 is much more likely than #138062 to be the cause of this CI failure.

Urgau and others added 20 commits May 22, 2025 19:12

Fix future-incompatible lint group test

eec894d

Allow #![doc(test(attr(..)))] at module level too

80c6a08

Collect and use #![doc(test(attr(..)))] at module level too

9d9705f

Allow #![doc(test(attr(..)))] doctests to be again merged together

041d95d

Allow #![doc(test(attr(..)))] at every level

316e62a

Collect and use #[doc(test(attr(..)))] at every level

d96d3be

Enable Float non-determinism in miri. Update and add tests and change

5bafe9d

change tests in std, core and coretests.

Bump object

27f8efb

change tests to use fixed constants to let them pass with miri

00452bd

Change __rust_no_alloc_shim_is_unstable to be a function

163d29a

Add new Tier-3 targets: loongarch32-unknown-none*

38d69c3

MCP: rust-lang/compiler-team#865

Treat normalizing consts like normalizing types in deeply normalize

7efd90a

Unify normalization of terms in deeply normalize

aa1b296

compiler: Treat ForceWarning as a Warning for diagnostic level

5bab0d2

This silences an ICE.

Rollup merge of rust-lang#142053 - heiher:loong32-none, r=wesleywiser

90cfe1e

Add new Tier-3 targets: `loongarch32-unknown-none*` MCP: rust-lang/compiler-team#865 NOTE: LoongArch32 ELF object support is available starting with object v0.37.0.

Rollup merge of rust-lang#142148 - workingjubilee:dont-ice-on-force-w…

fbf35a8

…arn, r=Urgau compiler: Treat ForceWarning as a Warning for diagnostic level This silences an ICE. No idea if this is the correct solution though tbh. r? `@oli-obk` Fixes rust-lang#142144

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 Jun 7, 2025

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 Jun 7, 2025

GuillaumeGomez mentioned this pull request Jun 7, 2025

Enable Non-determinism of float operations in Miri and change std tests #138062

Merged

GuillaumeGomez closed this Jun 7, 2025

GuillaumeGomez deleted the rollup-jiq15lx branch June 7, 2025 12:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 6 pull requests #142153

Rollup of 6 pull requests #142153

Uh oh!

GuillaumeGomez commented Jun 7, 2025 •

edited by rustbot

Loading

Uh oh!

GuillaumeGomez commented Jun 7, 2025

Uh oh!

bors commented Jun 7, 2025

Uh oh!

rust-log-analyzer commented Jun 7, 2025

Uh oh!

matthiaskrgr commented Jun 7, 2025

Uh oh!

RalfJung commented Jun 7, 2025

Uh oh!

Uh oh!

Rollup of 6 pull requests #142153

Rollup of 6 pull requests #142153

Uh oh!

Conversation

GuillaumeGomez commented Jun 7, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GuillaumeGomez commented Jun 7, 2025

Uh oh!

bors commented Jun 7, 2025

Uh oh!

rust-log-analyzer commented Jun 7, 2025

Uh oh!

matthiaskrgr commented Jun 7, 2025

Uh oh!

RalfJung commented Jun 7, 2025

Uh oh!

Uh oh!

GuillaumeGomez commented Jun 7, 2025 •

edited by rustbot

Loading