Rollup merge of rust-lang#157276 - RalfJung:miri, r=RalfJung

miri subtree update

Subtree update of `miri` to rust-lang/miri@9fde9f5.

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

r? @ghost

Author: JonathanBrouwer

src/tools/miri/.github/workflows/ci.yml

@@ -155,6 +155,18 @@ jobs:
           cd ../rust # ./x does not seem to like being invoked from elsewhere
           ./x check miri
 
+  # This job is intentionally separate from `test` so that Priroda can be
+  # developed as a separate crate inside the Miri repository for now.
+  priroda-build:
+    name: Priroda
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: ./.github/workflows/setup
+      - name: build Priroda
+        working-directory: priroda
+        run: cargo build --locked
+
   coverage:
     name: coverage report
     runs-on: ubuntu-latest
@@ -168,7 +180,7 @@ jobs:
   # ALL THE PREVIOUS JOBS NEED TO BE ADDED TO THE `needs` SECTION OF THIS JOB!
   # And they should be added below in `cron-fail-notify` as well.
   conclusion:
-    needs: [test, style, bootstrap, coverage]
+    needs: [test, style, bootstrap, coverage, priroda-build]
     # We need to ensure this job does *not* get skipped if its dependencies fail,
     # because a skipped job is considered a success by GitHub. So we have to
     # overwrite `if:`. We use `!cancelled()` to ensure the job does still not get run
@@ -252,7 +264,7 @@ jobs:
   cron-fail-notify:
     name: cronjob failure notification
     runs-on: ubuntu-latest
-    needs: [test, style, bootstrap, coverage]
+    needs: [test, style, bootstrap, coverage, priroda-build]
     if: ${{ github.event_name == 'schedule' && failure() }}
     steps:
       # Send a Zulip notification

src/tools/miri/README.md

@@ -517,6 +517,10 @@ to Miri failing to detect cases of undefined behavior in a program.
   track interior mutable data on the level of references instead of on the
   byte-level as is done by default.  Therefore, with this flag, Tree
   Borrows will be more permissive.
+* `-Zmiri-tree-borrows-relax-custom-allocator-uniqueness` disables uniqueness assumptions for
+  `Box<T, A>` where `A` is not `Global`. The exact aliasing rules for such custom allocators are
+  still up in the air, and by default Miri is conservative and rejects some allocator
+  implementations that incur relevant aliasing between the allocation and the allocator.
 * `-Zmiri-force-page-size=<num>` overrides the default page size for an architecture, in multiples of 1k.
   `4` is default for most targets. This value should always be a power of 2 and nonzero.
 

src/tools/miri/ci/ci.sh

@@ -150,11 +150,10 @@ case $HOST_TARGET in
   i686-unknown-linux-gnu)
     # Host
     MIR_OPT=1 MANY_SEEDS=64 TEST_BENCH=1 CARGO_MIRI_ENV=1 run_tests
-    # Fully, but not officially, supported tier 2
+    # Not officially supported tier 2
     MANY_SEEDS=16 TEST_TARGET=aarch64-linux-android run_tests
-    # Partially supported targets (tier 2)
-    BASIC="empty_main integer heap_alloc libc-mem vec string btreemap" # ensures we have the basics: pre-main code, system allocator
-    UNIX="hello panic/panic panic/unwind concurrency/simple atomic libc-mem libc-misc libc-random env num_cpus" # the things that are very similar across all Unixes, and hence easily supported there
+    MANY_SEEDS=16 TEST_TARGET=loongarch64-unknown-linux-gnu run_tests
+    # Partially supported targets (no_std, tier 2)
     TEST_TARGET=wasm32-unknown-unknown run_tests_minimal no_std empty_main wasm # this target doesn't really have std
     TEST_TARGET=thumbv7em-none-eabihf  run_tests_minimal no_std
     ;;