From cbfc3640b047ebde1beb11629508597f960596ad Mon Sep 17 00:00:00 2001
From: Zalathar <Zalathar@users.noreply.github.com>
Date: Mon, 28 Apr 2025 21:14:37 +1000
Subject: [PATCH 01/10] compiletest: Remove the libtest-based executor and its
 dependency

This patch has deliberately been kept small and simple, to make it easier to
revert if necessary. Further cleanup can take palce after we're confident that
it won't need to be reverted.
---
 src/bootstrap/src/core/build_steps/tool.rs    |   2 +-
 src/tools/compiletest/src/common.rs           |   8 --
 src/tools/compiletest/src/executor.rs         |   1 -
 src/tools/compiletest/src/executor/libtest.rs | 111 ------------------
 src/tools/compiletest/src/lib.rs              |  19 ++-
 5 files changed, 8 insertions(+), 133 deletions(-)
 delete mode 100644 src/tools/compiletest/src/executor/libtest.rs

diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs
index 1549d4713af2c..ac568eab2e8a5 100644
--- a/src/bootstrap/src/core/build_steps/tool.rs
+++ b/src/bootstrap/src/core/build_steps/tool.rs
@@ -462,7 +462,7 @@ macro_rules! bootstrap_tool {
     }
 }
 
-pub(crate) const COMPILETEST_ALLOW_FEATURES: &str = "test,internal_output_capture";
+pub(crate) const COMPILETEST_ALLOW_FEATURES: &str = "internal_output_capture";
 
 bootstrap_tool!(
     // This is marked as an external tool because it includes dependencies
diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs
index e0132056d6c4a..4f93b49874134 100644
--- a/src/tools/compiletest/src/common.rs
+++ b/src/tools/compiletest/src/common.rs
@@ -413,14 +413,6 @@ pub struct Config {
     /// cross-compilation scenarios that do not otherwise want/need to `-Zbuild-std`. Used in e.g.
     /// ABI tests.
     pub minicore_path: Utf8PathBuf,
-
-    /// If true, disable the "new" executor, and use the older libtest-based
-    /// executor to run tests instead. This is a temporary fallback, to make
-    /// manual comparative testing easier if bugs are found in the new executor.
-    ///
-    /// FIXME(Zalathar): Eventually remove this flag and remove the libtest
-    /// dependency.
-    pub no_new_executor: bool,
 }
 
 impl Config {
diff --git a/src/tools/compiletest/src/executor.rs b/src/tools/compiletest/src/executor.rs
index 990be56ce0c5e..e774c5e2047c8 100644
--- a/src/tools/compiletest/src/executor.rs
+++ b/src/tools/compiletest/src/executor.rs
@@ -12,7 +12,6 @@ use crate::common::{Config, TestPaths};
 
 mod deadline;
 mod json;
-pub(crate) mod libtest;
 
 pub(crate) fn run_tests(config: &Config, tests: Vec<CollectedTest>) -> bool {
     let tests_len = tests.len();
diff --git a/src/tools/compiletest/src/executor/libtest.rs b/src/tools/compiletest/src/executor/libtest.rs
deleted file mode 100644
index 032b3f4fa9a87..0000000000000
--- a/src/tools/compiletest/src/executor/libtest.rs
+++ /dev/null
@@ -1,111 +0,0 @@
-//! This submodule encapsulates all of the code that actually interacts with
-//! libtest, so that it can be easily removed after the new executor becomes
-//! the default.
-
-use std::borrow::Cow;
-use std::io;
-
-use crate::common::Config;
-use crate::executor::{CollectedTest, CollectedTestDesc, ColorConfig, OutputFormat, ShouldPanic};
-
-/// Delegates to libtest to run the list of collected tests.
-///
-/// Returns `Ok(true)` if all tests passed, or `Ok(false)` if one or more tests failed.
-pub(crate) fn execute_tests(config: &Config, tests: Vec<CollectedTest>) -> io::Result<bool> {
-    let opts = test_opts(config);
-    let tests = tests.into_iter().map(|t| t.into_libtest()).collect::<Vec<_>>();
-
-    test::run_tests_console(&opts, tests)
-}
-
-impl CollectedTest {
-    fn into_libtest(self) -> test::TestDescAndFn {
-        let Self { desc, config, testpaths, revision } = self;
-        let CollectedTestDesc { name, ignore, ignore_message, should_panic } = desc;
-
-        // Libtest requires the ignore message to be a &'static str, so we might
-        // have to leak memory to create it. This is fine, as we only do so once
-        // per test, so the leak won't grow indefinitely.
-        let ignore_message = ignore_message.map(|msg| match msg {
-            Cow::Borrowed(s) => s,
-            Cow::Owned(s) => &*String::leak(s),
-        });
-
-        let desc = test::TestDesc {
-            name: test::DynTestName(name),
-            ignore,
-            ignore_message,
-            source_file: "",
-            start_line: 0,
-            start_col: 0,
-            end_line: 0,
-            end_col: 0,
-            should_panic: should_panic.to_libtest(),
-            compile_fail: false,
-            no_run: false,
-            test_type: test::TestType::Unknown,
-        };
-
-        // This closure is invoked when libtest returns control to compiletest
-        // to execute the test.
-        let testfn = test::DynTestFn(Box::new(move || {
-            crate::runtest::run(config, &testpaths, revision.as_deref());
-            Ok(())
-        }));
-
-        test::TestDescAndFn { desc, testfn }
-    }
-}
-
-impl ColorConfig {
-    fn to_libtest(self) -> test::ColorConfig {
-        match self {
-            Self::AutoColor => test::ColorConfig::AutoColor,
-            Self::AlwaysColor => test::ColorConfig::AlwaysColor,
-            Self::NeverColor => test::ColorConfig::NeverColor,
-        }
-    }
-}
-
-impl OutputFormat {
-    fn to_libtest(self) -> test::OutputFormat {
-        match self {
-            Self::Pretty => test::OutputFormat::Pretty,
-            Self::Terse => test::OutputFormat::Terse,
-            Self::Json => test::OutputFormat::Json,
-        }
-    }
-}
-
-impl ShouldPanic {
-    fn to_libtest(self) -> test::ShouldPanic {
-        match self {
-            Self::No => test::ShouldPanic::No,
-            Self::Yes => test::ShouldPanic::Yes,
-        }
-    }
-}
-
-fn test_opts(config: &Config) -> test::TestOpts {
-    test::TestOpts {
-        exclude_should_panic: false,
-        filters: config.filters.clone(),
-        filter_exact: config.filter_exact,
-        run_ignored: if config.run_ignored { test::RunIgnored::Yes } else { test::RunIgnored::No },
-        format: config.format.to_libtest(),
-        logfile: None,
-        run_tests: true,
-        bench_benchmarks: true,
-        nocapture: config.nocapture,
-        color: config.color.to_libtest(),
-        shuffle: false,
-        shuffle_seed: None,
-        test_threads: None,
-        skip: config.skip.clone(),
-        list: false,
-        options: test::Options::new(),
-        time_options: None,
-        force_run_in_process: false,
-        fail_fast: config.fail_fast,
-    }
-}
diff --git a/src/tools/compiletest/src/lib.rs b/src/tools/compiletest/src/lib.rs
index 788bafaa72479..0db4d3f6a4100 100644
--- a/src/tools/compiletest/src/lib.rs
+++ b/src/tools/compiletest/src/lib.rs
@@ -1,11 +1,10 @@
 #![crate_name = "compiletest"]
-// Needed by the libtest-based test executor.
-#![feature(test)]
 // Needed by the "new" test executor that does not depend on libtest.
+// FIXME(Zalathar): We should be able to get rid of `internal_output_capture`,
+// by having `runtest` manually capture all of its println-like output instead.
+// That would result in compiletest being written entirely in stable Rust!
 #![feature(internal_output_capture)]
 
-extern crate test;
-
 #[cfg(test)]
 mod tests;
 
@@ -448,8 +447,6 @@ pub fn parse_config(args: Vec<String>) -> Config {
         diff_command: matches.opt_str("compiletest-diff-tool"),
 
         minicore_path: opt_path(matches, "minicore-path"),
-
-        no_new_executor: matches.opt_present("no-new-executor"),
     }
 }
 
@@ -576,12 +573,10 @@ pub fn run_tests(config: Arc<Config>) {
     // Delegate to the executor to filter and run the big list of test structures
     // created during test discovery. When the executor decides to run a test,
     // it will return control to the rest of compiletest by calling `runtest::run`.
-    let res = if !config.no_new_executor {
-        Ok(executor::run_tests(&config, tests))
-    } else {
-        // FIXME(Zalathar): Eventually remove the libtest executor entirely.
-        crate::executor::libtest::execute_tests(&config, tests)
-    };
+    // FIXME(Zalathar): Once we're confident that we won't need to revert the
+    // removal of the libtest-based executor, remove this Result and other
+    // remnants of the old executor.
+    let res: io::Result<bool> = Ok(executor::run_tests(&config, tests));
 
     // Check the outcome reported by libtest.
     match res {

From 21b2dc137854aedc403ca3252abdf47968c9116c Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 28 Apr 2025 15:17:33 +0200
Subject: [PATCH 02/10] forbidden target feature tests: consolidate multiple
 tests in a single one with revisions

---
 ...dfloat-target-feature-flag-disable-implied.rs | 15 ---------------
 ...hardfloat-target-feature-flag-disable-neon.rs | 13 -------------
 ...t-target-feature-flag-disable.aarch64.stderr} |  0
 ...dden-hardfloat-target-feature-flag-disable.rs | 16 +++++++++++-----
 ...rget-feature-flag-disable.x86-implied.stderr} |  0
 ...float-target-feature-flag-disable.x86.stderr} |  0
 6 files changed, 11 insertions(+), 33 deletions(-)
 delete mode 100644 tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable-implied.rs
 delete mode 100644 tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable-neon.rs
 rename tests/ui/target-feature/{forbidden-hardfloat-target-feature-flag-disable-neon.stderr => forbidden-hardfloat-target-feature-flag-disable.aarch64.stderr} (100%)
 rename tests/ui/target-feature/{forbidden-hardfloat-target-feature-flag-disable-implied.stderr => forbidden-hardfloat-target-feature-flag-disable.x86-implied.stderr} (100%)
 rename tests/ui/target-feature/{forbidden-hardfloat-target-feature-flag-disable.stderr => forbidden-hardfloat-target-feature-flag-disable.x86.stderr} (100%)

diff --git a/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable-implied.rs b/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable-implied.rs
deleted file mode 100644
index 12e7e3bc45b31..0000000000000
--- a/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable-implied.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-//! Ensure that if disabling a target feature implies disabling an ABI-required target feature,
-//! we complain.
-//@ compile-flags: --target=x86_64-unknown-linux-gnu --crate-type=lib
-//@ needs-llvm-components: x86
-//@ compile-flags: -Ctarget-feature=-sse
-// For now this is just a warning.
-//@ build-pass
-
-#![feature(no_core, lang_items)]
-#![no_core]
-
-#[lang = "sized"]
-pub trait Sized {}
-
-//~? WARN target feature `sse2` must be enabled to ensure that the ABI of the current target can be implemented correctly
diff --git a/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable-neon.rs b/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable-neon.rs
deleted file mode 100644
index 33e4f12694f36..0000000000000
--- a/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable-neon.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-//@ compile-flags: --target=aarch64-unknown-linux-gnu --crate-type=lib
-//@ needs-llvm-components: aarch64
-//@ compile-flags: -Ctarget-feature=-neon
-// For now this is just a warning.
-//@ build-pass
-
-#![feature(no_core, lang_items)]
-#![no_core]
-
-#[lang = "sized"]
-pub trait Sized {}
-
-//~? WARN target feature `neon` must be enabled to ensure that the ABI of the current target can be implemented correctly
diff --git a/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable-neon.stderr b/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.aarch64.stderr
similarity index 100%
rename from tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable-neon.stderr
rename to tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.aarch64.stderr
diff --git a/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.rs b/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.rs
index e1bd25ffad1e9..e0d095844fbbf 100644
--- a/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.rs
+++ b/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.rs
@@ -1,7 +1,13 @@
 //! Ensure ABI-required features cannot be disabled via `-Ctarget-feature`.
-//@ compile-flags: --target=x86_64-unknown-linux-gnu --crate-type=lib
-//@ needs-llvm-components: x86
-//@ compile-flags: -Ctarget-feature=-x87
+//! Also covers the case of a feature indirectly disabling another via feature implications.
+//@ compile-flags: --crate-type=lib
+//@ revisions: x86 x86-implied aarch64
+//@[x86] compile-flags: --target=x86_64-unknown-linux-gnu -Ctarget-feature=-x87
+//@[x86] needs-llvm-components: x86
+//@[x86-implied] compile-flags: --target=x86_64-unknown-linux-gnu -Ctarget-feature=-sse
+//@[x86-implied] needs-llvm-components: x86
+//@[aarch64] compile-flags: --target=aarch64-unknown-linux-gnu -Ctarget-feature=-neon
+//@[aarch64] needs-llvm-components: aarch64
 // For now this is just a warning.
 //@ build-pass
 
@@ -11,5 +17,5 @@
 #[lang = "sized"]
 pub trait Sized {}
 
-//~? WARN target feature `x87` must be enabled to ensure that the ABI of the current target can be implemented correctly
-//~? WARN unstable feature specified for `-Ctarget-feature`: `x87`
+//~? WARN must be enabled to ensure that the ABI of the current target can be implemented correctly
+//[x86]~? WARN unstable feature specified for `-Ctarget-feature`
diff --git a/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable-implied.stderr b/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.x86-implied.stderr
similarity index 100%
rename from tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable-implied.stderr
rename to tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.x86-implied.stderr
diff --git a/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.stderr b/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.x86.stderr
similarity index 100%
rename from tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.stderr
rename to tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.x86.stderr

From c73687fb57ba1e0c2a43dfcab558f53acb6700e3 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 28 Apr 2025 15:22:14 +0200
Subject: [PATCH 03/10] give the abi-relevant target feature tests better names

---
 ...tribute.rs => abi-incompatible-target-feature-attribute.rs} | 0
 ...stderr => abi-incompatible-target-feature-attribute.stderr} | 2 +-
 ...-flag.rs => abi-incompatible-target-feature-flag-enable.rs} | 0
 ...derr => abi-incompatible-target-feature-flag-enable.stderr} | 0
 ...isable.rs => abi-irrelevant-target-feature-flag-disable.rs} | 3 +++
 ...tderr => abi-irrelevant-target-feature-flag-disable.stderr} | 0
 ...e-attribute.rs => abi-required-target-feature-attribute.rs} | 2 ++
 ...=> abi-required-target-feature-flag-disable.aarch64.stderr} | 0
 ...-disable.rs => abi-required-target-feature-flag-disable.rs} | 0
 ...bi-required-target-feature-flag-disable.x86-implied.stderr} | 0
 ...err => abi-required-target-feature-flag-disable.x86.stderr} | 0
 11 files changed, 6 insertions(+), 1 deletion(-)
 rename tests/ui/target-feature/{forbidden-hardfloat-target-feature-attribute.rs => abi-incompatible-target-feature-attribute.rs} (100%)
 rename tests/ui/target-feature/{forbidden-hardfloat-target-feature-attribute.stderr => abi-incompatible-target-feature-attribute.stderr} (78%)
 rename tests/ui/target-feature/{forbidden-hardfloat-target-feature-flag.rs => abi-incompatible-target-feature-flag-enable.rs} (100%)
 rename tests/ui/target-feature/{forbidden-hardfloat-target-feature-flag.stderr => abi-incompatible-target-feature-flag-enable.stderr} (100%)
 rename tests/ui/target-feature/{allowed-softfloat-target-feature-flag-disable.rs => abi-irrelevant-target-feature-flag-disable.rs} (59%)
 rename tests/ui/target-feature/{allowed-softfloat-target-feature-flag-disable.stderr => abi-irrelevant-target-feature-flag-disable.stderr} (100%)
 rename tests/ui/target-feature/{allowed-softfloat-target-feature-attribute.rs => abi-required-target-feature-attribute.rs} (69%)
 rename tests/ui/target-feature/{forbidden-hardfloat-target-feature-flag-disable.aarch64.stderr => abi-required-target-feature-flag-disable.aarch64.stderr} (100%)
 rename tests/ui/target-feature/{forbidden-hardfloat-target-feature-flag-disable.rs => abi-required-target-feature-flag-disable.rs} (100%)
 rename tests/ui/target-feature/{forbidden-hardfloat-target-feature-flag-disable.x86-implied.stderr => abi-required-target-feature-flag-disable.x86-implied.stderr} (100%)
 rename tests/ui/target-feature/{forbidden-hardfloat-target-feature-flag-disable.x86.stderr => abi-required-target-feature-flag-disable.x86.stderr} (100%)

diff --git a/tests/ui/target-feature/forbidden-hardfloat-target-feature-attribute.rs b/tests/ui/target-feature/abi-incompatible-target-feature-attribute.rs
similarity index 100%
rename from tests/ui/target-feature/forbidden-hardfloat-target-feature-attribute.rs
rename to tests/ui/target-feature/abi-incompatible-target-feature-attribute.rs
diff --git a/tests/ui/target-feature/forbidden-hardfloat-target-feature-attribute.stderr b/tests/ui/target-feature/abi-incompatible-target-feature-attribute.stderr
similarity index 78%
rename from tests/ui/target-feature/forbidden-hardfloat-target-feature-attribute.stderr
rename to tests/ui/target-feature/abi-incompatible-target-feature-attribute.stderr
index bfe767e5ffb07..baa8551b17a3c 100644
--- a/tests/ui/target-feature/forbidden-hardfloat-target-feature-attribute.stderr
+++ b/tests/ui/target-feature/abi-incompatible-target-feature-attribute.stderr
@@ -1,5 +1,5 @@
 error: target feature `d` cannot be enabled with `#[target_feature]`: this feature is incompatible with the target ABI
-  --> $DIR/forbidden-hardfloat-target-feature-attribute.rs:10:18
+  --> $DIR/abi-incompatible-target-feature-attribute.rs:10:18
    |
 LL | #[target_feature(enable = "d")]
    |                  ^^^^^^^^^^^^
diff --git a/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag.rs b/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.rs
similarity index 100%
rename from tests/ui/target-feature/forbidden-hardfloat-target-feature-flag.rs
rename to tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.rs
diff --git a/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag.stderr b/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.stderr
similarity index 100%
rename from tests/ui/target-feature/forbidden-hardfloat-target-feature-flag.stderr
rename to tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.stderr
diff --git a/tests/ui/target-feature/allowed-softfloat-target-feature-flag-disable.rs b/tests/ui/target-feature/abi-irrelevant-target-feature-flag-disable.rs
similarity index 59%
rename from tests/ui/target-feature/allowed-softfloat-target-feature-flag-disable.rs
rename to tests/ui/target-feature/abi-irrelevant-target-feature-flag-disable.rs
index 7368ef120fa6e..0013d033b9c5e 100644
--- a/tests/ui/target-feature/allowed-softfloat-target-feature-flag-disable.rs
+++ b/tests/ui/target-feature/abi-irrelevant-target-feature-flag-disable.rs
@@ -1,3 +1,6 @@
+//! `x87` is a required target feature on some x86 targets, but not on this one as this one
+//! uses soft-floats. So ensure disabling the target feature here (which is a NOP) does
+//! not trigger a warning.
 //@ compile-flags: --target=x86_64-unknown-none --crate-type=lib
 //@ needs-llvm-components: x86
 //@ compile-flags: -Ctarget-feature=-x87
diff --git a/tests/ui/target-feature/allowed-softfloat-target-feature-flag-disable.stderr b/tests/ui/target-feature/abi-irrelevant-target-feature-flag-disable.stderr
similarity index 100%
rename from tests/ui/target-feature/allowed-softfloat-target-feature-flag-disable.stderr
rename to tests/ui/target-feature/abi-irrelevant-target-feature-flag-disable.stderr
diff --git a/tests/ui/target-feature/allowed-softfloat-target-feature-attribute.rs b/tests/ui/target-feature/abi-required-target-feature-attribute.rs
similarity index 69%
rename from tests/ui/target-feature/allowed-softfloat-target-feature-attribute.rs
rename to tests/ui/target-feature/abi-required-target-feature-attribute.rs
index 8b60820cc9b68..95723c57f94d4 100644
--- a/tests/ui/target-feature/allowed-softfloat-target-feature-attribute.rs
+++ b/tests/ui/target-feature/abi-required-target-feature-attribute.rs
@@ -1,3 +1,5 @@
+//! Enabling a target feature that is anyway required changes nothing, so this is allowed
+//! for `#[target_feature]`.
 //@ compile-flags: --target=x86_64-unknown-none --crate-type=lib
 //@ needs-llvm-components: x86
 //@ build-pass
diff --git a/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.aarch64.stderr b/tests/ui/target-feature/abi-required-target-feature-flag-disable.aarch64.stderr
similarity index 100%
rename from tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.aarch64.stderr
rename to tests/ui/target-feature/abi-required-target-feature-flag-disable.aarch64.stderr
diff --git a/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.rs b/tests/ui/target-feature/abi-required-target-feature-flag-disable.rs
similarity index 100%
rename from tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.rs
rename to tests/ui/target-feature/abi-required-target-feature-flag-disable.rs
diff --git a/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.x86-implied.stderr b/tests/ui/target-feature/abi-required-target-feature-flag-disable.x86-implied.stderr
similarity index 100%
rename from tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.x86-implied.stderr
rename to tests/ui/target-feature/abi-required-target-feature-flag-disable.x86-implied.stderr
diff --git a/tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.x86.stderr b/tests/ui/target-feature/abi-required-target-feature-flag-disable.x86.stderr
similarity index 100%
rename from tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.x86.stderr
rename to tests/ui/target-feature/abi-required-target-feature-flag-disable.x86.stderr

From 240cc10387b96e3071db43b11adcf132a484101f Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 28 Apr 2025 15:40:44 +0200
Subject: [PATCH 04/10] add more revisions to cover more architectures

---
 ...ible-target-feature-attribute.riscv.stderr |  8 +++++++
 ...i-incompatible-target-feature-attribute.rs | 13 ++++++++----
 ...compatible-target-feature-attribute.stderr |  8 -------
 ...atible-target-feature-attribute.x86.stderr |  8 +++++++
 ...le-target-feature-flag-enable.riscv.stderr | 19 +++++++++++++++++
 ...incompatible-target-feature-flag-enable.rs | 21 ++++++++++++-------
 ...ble-target-feature-flag-enable.x86.stderr} |  0
 ...rget-feature-flag-disable.loongarch.stderr | 13 ++++++++++++
 ...d-target-feature-flag-disable.riscv.stderr | 12 +++++++++++
 ...bi-required-target-feature-flag-disable.rs |  8 +++++--
 10 files changed, 89 insertions(+), 21 deletions(-)
 create mode 100644 tests/ui/target-feature/abi-incompatible-target-feature-attribute.riscv.stderr
 delete mode 100644 tests/ui/target-feature/abi-incompatible-target-feature-attribute.stderr
 create mode 100644 tests/ui/target-feature/abi-incompatible-target-feature-attribute.x86.stderr
 create mode 100644 tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.riscv.stderr
 rename tests/ui/target-feature/{abi-incompatible-target-feature-flag-enable.stderr => abi-incompatible-target-feature-flag-enable.x86.stderr} (100%)
 create mode 100644 tests/ui/target-feature/abi-required-target-feature-flag-disable.loongarch.stderr
 create mode 100644 tests/ui/target-feature/abi-required-target-feature-flag-disable.riscv.stderr

diff --git a/tests/ui/target-feature/abi-incompatible-target-feature-attribute.riscv.stderr b/tests/ui/target-feature/abi-incompatible-target-feature-attribute.riscv.stderr
new file mode 100644
index 0000000000000..49c5479275f39
--- /dev/null
+++ b/tests/ui/target-feature/abi-incompatible-target-feature-attribute.riscv.stderr
@@ -0,0 +1,8 @@
+error: target feature `d` cannot be enabled with `#[target_feature]`: this feature is incompatible with the target ABI
+  --> $DIR/abi-incompatible-target-feature-attribute.rs:15:90
+   |
+LL | #[cfg_attr(x86, target_feature(enable = "soft-float"))] #[cfg_attr(riscv, target_feature(enable = "d"))]
+   |                                                                                          ^^^^^^^^^^^^
+
+error: aborting due to 1 previous error
+
diff --git a/tests/ui/target-feature/abi-incompatible-target-feature-attribute.rs b/tests/ui/target-feature/abi-incompatible-target-feature-attribute.rs
index 215e64979f736..a873344075920 100644
--- a/tests/ui/target-feature/abi-incompatible-target-feature-attribute.rs
+++ b/tests/ui/target-feature/abi-incompatible-target-feature-attribute.rs
@@ -1,12 +1,17 @@
 //! Ensure ABI-incompatible features cannot be enabled via `#[target_feature]`.
-//@ compile-flags: --target=riscv32e-unknown-none-elf --crate-type=lib
-//@ needs-llvm-components: riscv
-#![feature(no_core, lang_items, riscv_target_feature)]
+// ignore-tidy-linelength
+//@ compile-flags: --crate-type=lib
+//@ revisions: x86 riscv
+//@[x86] compile-flags: --target=x86_64-unknown-linux-gnu
+//@[x86] needs-llvm-components: x86
+//@[riscv] compile-flags: --target=riscv32e-unknown-none-elf
+//@[riscv] needs-llvm-components: riscv
+#![feature(no_core, lang_items, riscv_target_feature, x87_target_feature)]
 #![no_core]
 
 #[lang = "sized"]
 pub trait Sized {}
 
-#[target_feature(enable = "d")]
+#[cfg_attr(x86, target_feature(enable = "soft-float"))] #[cfg_attr(riscv, target_feature(enable = "d"))]
 //~^ERROR: cannot be enabled with
 pub unsafe fn my_fun() {}
diff --git a/tests/ui/target-feature/abi-incompatible-target-feature-attribute.stderr b/tests/ui/target-feature/abi-incompatible-target-feature-attribute.stderr
deleted file mode 100644
index baa8551b17a3c..0000000000000
--- a/tests/ui/target-feature/abi-incompatible-target-feature-attribute.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: target feature `d` cannot be enabled with `#[target_feature]`: this feature is incompatible with the target ABI
-  --> $DIR/abi-incompatible-target-feature-attribute.rs:10:18
-   |
-LL | #[target_feature(enable = "d")]
-   |                  ^^^^^^^^^^^^
-
-error: aborting due to 1 previous error
-
diff --git a/tests/ui/target-feature/abi-incompatible-target-feature-attribute.x86.stderr b/tests/ui/target-feature/abi-incompatible-target-feature-attribute.x86.stderr
new file mode 100644
index 0000000000000..81471fd7e303e
--- /dev/null
+++ b/tests/ui/target-feature/abi-incompatible-target-feature-attribute.x86.stderr
@@ -0,0 +1,8 @@
+error: target feature `soft-float` cannot be enabled with `#[target_feature]`: this feature is incompatible with the target ABI
+  --> $DIR/abi-incompatible-target-feature-attribute.rs:15:32
+   |
+LL | #[cfg_attr(x86, target_feature(enable = "soft-float"))] #[cfg_attr(riscv, target_feature(enable = "d"))]
+   |                                ^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 1 previous error
+
diff --git a/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.riscv.stderr b/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.riscv.stderr
new file mode 100644
index 0000000000000..2dca0c220332b
--- /dev/null
+++ b/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.riscv.stderr
@@ -0,0 +1,19 @@
+warning: target feature `d` must be disabled to ensure that the ABI of the current target can be implemented correctly
+   |
+   = note: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #116344 <https://github.com/rust-lang/rust/issues/116344>
+
+warning: unstable feature specified for `-Ctarget-feature`: `d`
+   |
+   = note: this feature is not stably supported; its behavior can change in the future
+
+warning: unstable feature specified for `-Ctarget-feature`: `f`
+   |
+   = note: this feature is not stably supported; its behavior can change in the future
+
+warning: unstable feature specified for `-Ctarget-feature`: `zicsr`
+   |
+   = note: this feature is not stably supported; its behavior can change in the future
+
+warning: 4 warnings emitted
+
diff --git a/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.rs b/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.rs
index 4ccc6e0e941f1..68e1d3b9ddc61 100644
--- a/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.rs
+++ b/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.rs
@@ -1,15 +1,22 @@
 //! Ensure ABI-incompatible features cannot be enabled via `-Ctarget-feature`.
-//@ compile-flags: --target=x86_64-unknown-linux-gnu --crate-type=lib
-//@ needs-llvm-components: x86
-//@ compile-flags: -Ctarget-feature=+soft-float
-// For now this is just a warning.
-//@ build-pass
+// These are just warnings for now.
+//@ check-pass
+//@ compile-flags: --crate-type=lib
+//@ revisions: x86 riscv
+//@[x86] compile-flags: --target=x86_64-unknown-linux-gnu -Ctarget-feature=+soft-float
+//@[x86] needs-llvm-components: x86
+//@[riscv] compile-flags: --target=riscv32e-unknown-none-elf -Ctarget-feature=+d
+//@[riscv] needs-llvm-components: riscv
 
 #![feature(no_core, lang_items, riscv_target_feature)]
 #![no_core]
 
 #[lang = "sized"]
 pub trait Sized {}
+#[lang = "freeze"]
+pub trait Freeze {}
 
-//~? WARN target feature `soft-float` must be disabled to ensure that the ABI of the current target can be implemented correctl
-//~? WARN unstable feature specified for `-Ctarget-feature`: `soft-float`
+//~? WARN must be disabled to ensure that the ABI of the current target can be implemented correctly
+//~? WARN unstable feature specified for `-Ctarget-feature`
+//[riscv]~? WARN unstable feature specified for `-Ctarget-feature`
+//[riscv]~? WARN unstable feature specified for `-Ctarget-feature`
diff --git a/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.stderr b/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.x86.stderr
similarity index 100%
rename from tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.stderr
rename to tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.x86.stderr
diff --git a/tests/ui/target-feature/abi-required-target-feature-flag-disable.loongarch.stderr b/tests/ui/target-feature/abi-required-target-feature-flag-disable.loongarch.stderr
new file mode 100644
index 0000000000000..e8df521e1bd91
--- /dev/null
+++ b/tests/ui/target-feature/abi-required-target-feature-flag-disable.loongarch.stderr
@@ -0,0 +1,13 @@
+warning: target feature `d` must be enabled to ensure that the ABI of the current target can be implemented correctly
+   |
+   = note: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #116344 <https://github.com/rust-lang/rust/issues/116344>
+
+warning: unstable feature specified for `-Ctarget-feature`: `d`
+   |
+   = note: this feature is not stably supported; its behavior can change in the future
+
+warning: both target-abi and the triple-implied ABI are invalid, ignoring and using feature-implied ABI
+warning: 'lp64f' has not been standardized
+warning: 2 warnings emitted
+
diff --git a/tests/ui/target-feature/abi-required-target-feature-flag-disable.riscv.stderr b/tests/ui/target-feature/abi-required-target-feature-flag-disable.riscv.stderr
new file mode 100644
index 0000000000000..919c49dcf9657
--- /dev/null
+++ b/tests/ui/target-feature/abi-required-target-feature-flag-disable.riscv.stderr
@@ -0,0 +1,12 @@
+warning: target feature `d` must be enabled to ensure that the ABI of the current target can be implemented correctly
+   |
+   = note: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #116344 <https://github.com/rust-lang/rust/issues/116344>
+
+warning: unstable feature specified for `-Ctarget-feature`: `d`
+   |
+   = note: this feature is not stably supported; its behavior can change in the future
+
+Hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension (ignoring target-abi)
+warning: 2 warnings emitted
+
diff --git a/tests/ui/target-feature/abi-required-target-feature-flag-disable.rs b/tests/ui/target-feature/abi-required-target-feature-flag-disable.rs
index e0d095844fbbf..02841b6690aff 100644
--- a/tests/ui/target-feature/abi-required-target-feature-flag-disable.rs
+++ b/tests/ui/target-feature/abi-required-target-feature-flag-disable.rs
@@ -1,13 +1,17 @@
 //! Ensure ABI-required features cannot be disabled via `-Ctarget-feature`.
 //! Also covers the case of a feature indirectly disabling another via feature implications.
 //@ compile-flags: --crate-type=lib
-//@ revisions: x86 x86-implied aarch64
+//@ revisions: x86 x86-implied aarch64 riscv loongarch
 //@[x86] compile-flags: --target=x86_64-unknown-linux-gnu -Ctarget-feature=-x87
 //@[x86] needs-llvm-components: x86
 //@[x86-implied] compile-flags: --target=x86_64-unknown-linux-gnu -Ctarget-feature=-sse
 //@[x86-implied] needs-llvm-components: x86
 //@[aarch64] compile-flags: --target=aarch64-unknown-linux-gnu -Ctarget-feature=-neon
 //@[aarch64] needs-llvm-components: aarch64
+//@[riscv] compile-flags: --target=riscv64gc-unknown-none-elf -Ctarget-feature=-d
+//@[riscv] needs-llvm-components: riscv
+//@[loongarch] compile-flags: --target=loongarch64-unknown-none -Ctarget-feature=-d
+//@[loongarch] needs-llvm-components: loongarch
 // For now this is just a warning.
 //@ build-pass
 
@@ -18,4 +22,4 @@
 pub trait Sized {}
 
 //~? WARN must be enabled to ensure that the ABI of the current target can be implemented correctly
-//[x86]~? WARN unstable feature specified for `-Ctarget-feature`
+//[x86,riscv,loongarch]~? WARN unstable feature specified for `-Ctarget-feature`

From a3e16c7adca4d907b5c99d39b7ba6a4fe5f8a56b Mon Sep 17 00:00:00 2001
From: Sean Cross <sean@xobs.io>
Date: Tue, 29 Apr 2025 09:46:32 +0800
Subject: [PATCH 05/10] unwind: bump `unwinding` dependency to 0.2.6

With a recent change to the compiler, all instances of `#[naked]` must
now be wrapped in `#[unsafe(naked)]`. The `unwinding` crate, which is
used on Xous for doing unwinding in constrained environments, needed to
be updated to handle this change.

Bump the `unwinding` dependency to 0.2.6, which performs this wrapping.

Signed-off-by: Sean Cross <sean@xobs.io>
---
 library/Cargo.lock        | 4 ++--
 library/unwind/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/Cargo.lock b/library/Cargo.lock
index f7f09a11f3ac9..9b620a1cf222e 100644
--- a/library/Cargo.lock
+++ b/library/Cargo.lock
@@ -448,9 +448,9 @@ dependencies = [
 
 [[package]]
 name = "unwinding"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51f06a05848f650946acef3bf525fe96612226b61f74ae23ffa4e98bfbb8ab3c"
+checksum = "8393f2782b6060a807337ff353780c1ca15206f9ba2424df18cb6e733bd7b345"
 dependencies = [
  "compiler_builtins",
  "gimli",
diff --git a/library/unwind/Cargo.toml b/library/unwind/Cargo.toml
index da60924c2b419..df43e6ae80fb0 100644
--- a/library/unwind/Cargo.toml
+++ b/library/unwind/Cargo.toml
@@ -22,7 +22,7 @@ cfg-if = "1.0"
 libc = { version = "0.2.140", features = ['rustc-dep-of-std'], default-features = false }
 
 [target.'cfg(target_os = "xous")'.dependencies]
-unwinding = { version = "0.2.5", features = ['rustc-dep-of-std', 'unwinder', 'fde-custom'], default-features = false }
+unwinding = { version = "0.2.6", features = ['rustc-dep-of-std', 'unwinder', 'fde-custom'], default-features = false }
 
 [features]
 

From 5b1e4954a109725019e6bd24bb1e33b879079512 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Thu, 24 Apr 2025 07:15:08 +1000
Subject: [PATCH 06/10] Add a few extra tests to
 `tests/ui/macros/stringify.rs`.

---
 tests/ui/macros/stringify.rs | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/tests/ui/macros/stringify.rs b/tests/ui/macros/stringify.rs
index 3490d3efc5992..ee62b28b96751 100644
--- a/tests/ui/macros/stringify.rs
+++ b/tests/ui/macros/stringify.rs
@@ -288,6 +288,9 @@ fn test_expr() {
     // ExprKind::OffsetOf: untestable because this test works pre-expansion.
 
     // ExprKind::MacCall
+    c1!(expr, [ mac!() ], "mac!()");
+    c1!(expr, [ mac![] ], "mac![]");
+    c1!(expr, [ mac! {} ], "mac! {}");
     c1!(expr, [ mac!(...) ], "mac!(...)");
     c1!(expr, [ mac![...] ], "mac![...]");
     c1!(expr, [ mac! { ... } ], "mac! { ... }");
@@ -354,6 +357,7 @@ fn test_item() {
 
     // ItemKind::Use
     c1!(item, [ pub use crate::{a, b::c}; ], "pub use crate::{ a, b::c };"); // FIXME
+    c1!(item, [ pub use crate::{ e, ff }; ], "pub use crate::{ e, ff };");
     c1!(item, [ pub use A::*; ], "pub use A::*;");
 
     // ItemKind::Static
@@ -482,9 +486,12 @@ fn test_item() {
     c1!(item, [ impl ~const Struct {} ], "impl ~const Struct {}");
 
     // ItemKind::MacCall
+    c1!(item, [ mac!(); ], "mac!();");
+    c1!(item, [ mac![]; ], "mac![];");
+    c1!(item, [ mac! {} ], "mac! {}");
     c1!(item, [ mac!(...); ], "mac!(...);");
     c1!(item, [ mac![...]; ], "mac![...];");
-    c1!(item, [ mac! { ... } ], "mac! { ... }");
+    c1!(item, [ mac! {...} ], "mac! { ... }");
 
     // ItemKind::MacroDef
     c1!(item,
@@ -598,8 +605,11 @@ fn test_pat() {
     c1!(pat, [ (pat) ], "(pat)");
 
     // PatKind::MacCall
+    c1!(pat, [ mac!() ], "mac!()");
+    c1!(pat, [ mac![] ], "mac![]");
+    c1!(pat, [ mac! {} ], "mac! {}");
     c1!(pat, [ mac!(...) ], "mac!(...)");
-    c1!(pat, [ mac![...] ], "mac![...]");
+    c1!(pat, [ mac! [ ... ] ], "mac! [...]");
     c1!(pat, [ mac! { ... } ], "mac! { ... }");
 
     // Attributes are not allowed on patterns.
@@ -644,6 +654,9 @@ fn test_stmt() {
     c1!(stmt, [ ; ], ";");
 
     // StmtKind::MacCall
+    c1!(stmt, [ mac! ( ) ], "mac! ()");
+    c1!(stmt, [ mac![] ], "mac![]");
+    c1!(stmt, [ mac!{} ], "mac!{}");
     c1!(stmt, [ mac!(...) ], "mac!(...)");
     c1!(stmt, [ mac![...] ], "mac![...]");
     c1!(stmt, [ mac! { ... } ], "mac! { ... }");
@@ -739,6 +752,9 @@ fn test_ty() {
     // TyKind::ImplicitSelf: there is no syntax for this.
 
     // TyKind::MacCall
+    c1!(ty, [ mac!() ], "mac!()");
+    c1!(ty, [ mac![] ], "mac![]");
+    c1!(ty, [ mac! { } ], "mac! {}");
     c1!(ty, [ mac!(...) ], "mac!(...)");
     c1!(ty, [ mac![...] ], "mac![...]");
     c1!(ty, [ mac! { ... } ], "mac! { ... }");

From 99f6b6328e7b418abe2e3bcf49b4504c2866671e Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Fri, 17 May 2024 17:31:34 +1000
Subject: [PATCH 07/10] Improve pretty-printing of braces.

Most notably, the `FIXME` for suboptimal printing of `use` groups in
`tests/ui/macros/stringify.rs` is fixed. And all other test output
changes result in pretty printed output being closer to the original
formatting in the source code.
---
 compiler/rustc_ast_pretty/src/pprust/state.rs | 33 ++++++++++++++-----
 compiler/rustc_builtin_macros/src/autodiff.rs |  4 +--
 compiler/rustc_expand/src/build.rs            | 14 ++++----
 compiler/rustc_hir_pretty/src/lib.rs          |  1 +
 tests/ui/macros/stringify.rs                  |  4 +--
 tests/ui/macros/trace_faulty_macros.stderr    |  6 ++--
 tests/ui/proc-macro/attr-complex-fn.stdout    |  2 +-
 tests/ui/proc-macro/weird-braces.stdout       |  9 +++--
 tests/ui/unpretty/expanded-exhaustive.stdout  |  2 +-
 9 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/compiler/rustc_ast_pretty/src/pprust/state.rs b/compiler/rustc_ast_pretty/src/pprust/state.rs
index 985359e1234e8..0d9178b5e2c93 100644
--- a/compiler/rustc_ast_pretty/src/pprust/state.rs
+++ b/compiler/rustc_ast_pretty/src/pprust/state.rs
@@ -634,6 +634,7 @@ pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::Dere
                 false,
                 None,
                 *delim,
+                None,
                 tokens,
                 true,
                 span,
@@ -679,6 +680,7 @@ pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::Dere
                     false,
                     None,
                     *delim,
+                    Some(spacing.open),
                     tts,
                     convert_dollar_crate,
                     dspan.entire(),
@@ -735,6 +737,7 @@ pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::Dere
         has_bang: bool,
         ident: Option<Ident>,
         delim: Delimiter,
+        open_spacing: Option<Spacing>,
         tts: &TokenStream,
         convert_dollar_crate: bool,
         span: Span,
@@ -758,16 +761,26 @@ pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::Dere
                     self.nbsp();
                 }
                 self.word("{");
-                if !tts.is_empty() {
+
+                // Respect `Alone`, if provided, and print a space. Unless the list is empty.
+                let open_space = (open_spacing == None || open_spacing == Some(Spacing::Alone))
+                    && !tts.is_empty();
+                if open_space {
                     self.space();
                 }
                 let ib = self.ibox(0);
                 self.print_tts(tts, convert_dollar_crate);
                 self.end(ib);
-                let empty = tts.is_empty();
-                self.bclose(span, empty, cb.unwrap());
+
+                // Use `open_space` for the spacing *before* the closing delim.
+                // Because spacing on delimiters is lost when going through
+                // proc macros, and otherwise we can end up with ugly cases
+                // like `{ x}`. Symmetry is better.
+                self.bclose(span, !open_space, cb.unwrap());
             }
             delim => {
+                // `open_spacing` is ignored. We never print spaces after
+                // non-brace opening delims or before non-brace closing delims.
                 let token_str = self.token_kind_to_string(&delim.as_open_token_kind());
                 self.word(token_str);
                 let ib = self.ibox(0);
@@ -797,6 +810,7 @@ pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::Dere
             has_bang,
             Some(*ident),
             macro_def.body.delim,
+            None,
             &macro_def.body.tokens,
             true,
             sp,
@@ -844,9 +858,9 @@ pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::Dere
         self.end(ib);
     }
 
-    fn bclose_maybe_open(&mut self, span: rustc_span::Span, empty: bool, cb: Option<BoxMarker>) {
+    fn bclose_maybe_open(&mut self, span: rustc_span::Span, no_space: bool, cb: Option<BoxMarker>) {
         let has_comment = self.maybe_print_comment(span.hi());
-        if !empty || has_comment {
+        if !no_space || has_comment {
             self.break_offset_if_not_bol(1, -INDENT_UNIT);
         }
         self.word("}");
@@ -855,9 +869,9 @@ pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::Dere
         }
     }
 
-    fn bclose(&mut self, span: rustc_span::Span, empty: bool, cb: BoxMarker) {
+    fn bclose(&mut self, span: rustc_span::Span, no_space: bool, cb: BoxMarker) {
         let cb = Some(cb);
-        self.bclose_maybe_open(span, empty, cb)
+        self.bclose_maybe_open(span, no_space, cb)
     }
 
     fn break_offset_if_not_bol(&mut self, n: usize, off: isize) {
@@ -1423,8 +1437,8 @@ impl<'a> State<'a> {
             }
         }
 
-        let empty = !has_attrs && blk.stmts.is_empty();
-        self.bclose_maybe_open(blk.span, empty, cb);
+        let no_space = !has_attrs && blk.stmts.is_empty();
+        self.bclose_maybe_open(blk.span, no_space, cb);
         self.ann.post(self, AnnNode::Block(blk))
     }
 
@@ -1471,6 +1485,7 @@ impl<'a> State<'a> {
             true,
             None,
             m.args.delim,
+            None,
             &m.args.tokens,
             true,
             m.span(),
diff --git a/compiler/rustc_builtin_macros/src/autodiff.rs b/compiler/rustc_builtin_macros/src/autodiff.rs
index 6d97dfa3a4d41..8c5c20c7af48c 100644
--- a/compiler/rustc_builtin_macros/src/autodiff.rs
+++ b/compiler/rustc_builtin_macros/src/autodiff.rs
@@ -323,9 +323,9 @@ mod llvm_enzyme {
             Spacing::Joint,
         )];
         let never_arg = ast::DelimArgs {
-            dspan: ast::tokenstream::DelimSpan::from_single(span),
+            dspan: DelimSpan::from_single(span),
             delim: ast::token::Delimiter::Parenthesis,
-            tokens: ast::tokenstream::TokenStream::from_iter(ts2),
+            tokens: TokenStream::from_iter(ts2),
         };
         let inline_item = ast::AttrItem {
             unsafety: ast::Safety::Default,
diff --git a/compiler/rustc_expand/src/build.rs b/compiler/rustc_expand/src/build.rs
index 6d616cf84bbd4..14b8cc90d97d6 100644
--- a/compiler/rustc_expand/src/build.rs
+++ b/compiler/rustc_expand/src/build.rs
@@ -1,8 +1,10 @@
 use rustc_ast::ptr::P;
+use rustc_ast::token::Delimiter;
+use rustc_ast::tokenstream::TokenStream;
 use rustc_ast::util::literal;
 use rustc_ast::{
     self as ast, AnonConst, AttrVec, BlockCheckMode, Expr, LocalKind, MatchKind, PatKind, UnOp,
-    attr, token,
+    attr, token, tokenstream,
 };
 use rustc_span::source_map::Spanned;
 use rustc_span::{DUMMY_SP, Ident, Span, Symbol, kw, sym};
@@ -55,13 +57,13 @@ impl<'a> ExtCtxt<'a> {
         &self,
         span: Span,
         path: ast::Path,
-        delim: ast::token::Delimiter,
-        tokens: ast::tokenstream::TokenStream,
+        delim: Delimiter,
+        tokens: TokenStream,
     ) -> P<ast::MacCall> {
         P(ast::MacCall {
             path,
             args: P(ast::DelimArgs {
-                dspan: ast::tokenstream::DelimSpan { open: span, close: span },
+                dspan: tokenstream::DelimSpan { open: span, close: span },
                 delim,
                 tokens,
             }),
@@ -480,8 +482,8 @@ impl<'a> ExtCtxt<'a> {
                     span,
                     [sym::std, sym::unreachable].map(|s| Ident::new(s, span)).to_vec(),
                 ),
-                ast::token::Delimiter::Parenthesis,
-                ast::tokenstream::TokenStream::default(),
+                Delimiter::Parenthesis,
+                TokenStream::default(),
             ),
         )
     }
diff --git a/compiler/rustc_hir_pretty/src/lib.rs b/compiler/rustc_hir_pretty/src/lib.rs
index b878147522dc8..d5ae8f7a95479 100644
--- a/compiler/rustc_hir_pretty/src/lib.rs
+++ b/compiler/rustc_hir_pretty/src/lib.rs
@@ -146,6 +146,7 @@ impl<'a> State<'a> {
                     false,
                     None,
                     *delim,
+                    None,
                     &tokens,
                     true,
                     span,
diff --git a/tests/ui/macros/stringify.rs b/tests/ui/macros/stringify.rs
index ee62b28b96751..3f3d9252adbe8 100644
--- a/tests/ui/macros/stringify.rs
+++ b/tests/ui/macros/stringify.rs
@@ -356,7 +356,7 @@ fn test_item() {
     c1!(item, [ pub extern crate self as std; ], "pub extern crate self as std;");
 
     // ItemKind::Use
-    c1!(item, [ pub use crate::{a, b::c}; ], "pub use crate::{ a, b::c };"); // FIXME
+    c1!(item, [ pub use crate::{a, b::c}; ], "pub use crate::{a, b::c};");
     c1!(item, [ pub use crate::{ e, ff }; ], "pub use crate::{ e, ff };");
     c1!(item, [ pub use A::*; ], "pub use A::*;");
 
@@ -491,7 +491,7 @@ fn test_item() {
     c1!(item, [ mac! {} ], "mac! {}");
     c1!(item, [ mac!(...); ], "mac!(...);");
     c1!(item, [ mac![...]; ], "mac![...];");
-    c1!(item, [ mac! {...} ], "mac! { ... }");
+    c1!(item, [ mac! {...} ], "mac! {...}");
 
     // ItemKind::MacroDef
     c1!(item,
diff --git a/tests/ui/macros/trace_faulty_macros.stderr b/tests/ui/macros/trace_faulty_macros.stderr
index 73fed66e61906..e90d7a98db4c7 100644
--- a/tests/ui/macros/trace_faulty_macros.stderr
+++ b/tests/ui/macros/trace_faulty_macros.stderr
@@ -87,9 +87,9 @@ LL |     let a = pat_macro!();
    |             ^^^^^^^^^^^^
    |
    = note: expanding `pat_macro! {  }`
-   = note: to `pat_macro! (A { a : a, b : 0, c : _, .. });`
-   = note: expanding `pat_macro! { A { a : a, b : 0, c : _, .. } }`
-   = note: to `A { a : a, b : 0, c : _, .. }`
+   = note: to `pat_macro! (A {a : a, b : 0, c : _, ..});`
+   = note: expanding `pat_macro! { A {a : a, b : 0, c : _, ..} }`
+   = note: to `A {a : a, b : 0, c : _, ..}`
 
 note: trace_macro
   --> $DIR/trace_faulty_macros.rs:53:5
diff --git a/tests/ui/proc-macro/attr-complex-fn.stdout b/tests/ui/proc-macro/attr-complex-fn.stdout
index 7c23d1ecae45d..9bbb746bb4d62 100644
--- a/tests/ui/proc-macro/attr-complex-fn.stdout
+++ b/tests/ui/proc-macro/attr-complex-fn.stdout
@@ -77,7 +77,7 @@ PRINT-ATTR INPUT (DEBUG): TokenStream [
         span: $DIR/attr-complex-fn.rs:19:42: 19:44 (#0),
     },
 ]
-PRINT-ATTR INPUT (DISPLAY): impl<T> MyTrait<T> for MyStruct<{ true }> { #![rustc_dummy] }
+PRINT-ATTR INPUT (DISPLAY): impl<T> MyTrait<T> for MyStruct<{true}> { #![rustc_dummy] }
 PRINT-ATTR RE-COLLECTED (DISPLAY): impl < T > MyTrait < T > for MyStruct < { true } > { #![rustc_dummy] }
 PRINT-ATTR DEEP-RE-COLLECTED (DISPLAY): impl < T > MyTrait < T > for MyStruct < { true } > { #! [rustc_dummy] }
 PRINT-ATTR INPUT (DEBUG): TokenStream [
diff --git a/tests/ui/proc-macro/weird-braces.stdout b/tests/ui/proc-macro/weird-braces.stdout
index 7da769ef0d247..0215deb05c302 100644
--- a/tests/ui/proc-macro/weird-braces.stdout
+++ b/tests/ui/proc-macro/weird-braces.stdout
@@ -5,7 +5,7 @@ PRINT-ATTR_ARGS INPUT (DEBUG): TokenStream [
         span: $DIR/weird-braces.rs:16:25: 16:36 (#0),
     },
 ]
-PRINT-ATTR INPUT (DISPLAY): #[print_target_and_args(second_outer)] impl Bar<{ 1 > 0 }> for Foo<{ true }>
+PRINT-ATTR INPUT (DISPLAY): #[print_target_and_args(second_outer)] impl Bar<{1 > 0}> for Foo<{true}>
 {
     #![print_target_and_args(first_inner)]
     #![print_target_and_args(second_inner)]
@@ -191,7 +191,7 @@ PRINT-ATTR_ARGS INPUT (DEBUG): TokenStream [
         span: $DIR/weird-braces.rs:17:25: 17:37 (#0),
     },
 ]
-PRINT-ATTR INPUT (DISPLAY): impl Bar<{ 1 > 0 }> for Foo<{ true }>
+PRINT-ATTR INPUT (DISPLAY): impl Bar<{1 > 0}> for Foo<{true}>
 {
     #![print_target_and_args(first_inner)]
     #![print_target_and_args(second_inner)]
@@ -350,8 +350,7 @@ PRINT-ATTR_ARGS INPUT (DEBUG): TokenStream [
         span: $DIR/weird-braces.rs:19:30: 19:41 (#0),
     },
 ]
-PRINT-ATTR INPUT (DISPLAY): impl Bar<{ 1 > 0 }> for Foo<{ true }>
-{ #![print_target_and_args(second_inner)] }
+PRINT-ATTR INPUT (DISPLAY): impl Bar<{1 > 0}> for Foo<{true}> { #![print_target_and_args(second_inner)] }
 PRINT-ATTR RE-COLLECTED (DISPLAY): impl Bar < { 1 > 0 } > for Foo < { true } >
 { #![print_target_and_args(second_inner)] }
 PRINT-ATTR DEEP-RE-COLLECTED (DISPLAY): impl Bar < { 1 > 0 } > for Foo < { true } >
@@ -470,7 +469,7 @@ PRINT-ATTR_ARGS INPUT (DEBUG): TokenStream [
         span: $DIR/weird-braces.rs:20:30: 20:42 (#0),
     },
 ]
-PRINT-ATTR INPUT (DISPLAY): impl Bar<{ 1 > 0 }> for Foo<{ true }> {}
+PRINT-ATTR INPUT (DISPLAY): impl Bar<{1 > 0}> for Foo<{true}> {}
 PRINT-ATTR RE-COLLECTED (DISPLAY): impl Bar < { 1 > 0 } > for Foo < { true } > {}
 PRINT-ATTR INPUT (DEBUG): TokenStream [
     Ident {
diff --git a/tests/ui/unpretty/expanded-exhaustive.stdout b/tests/ui/unpretty/expanded-exhaustive.stdout
index 841edf63c9191..c6ffbb0d316bb 100644
--- a/tests/ui/unpretty/expanded-exhaustive.stdout
+++ b/tests/ui/unpretty/expanded-exhaustive.stdout
@@ -505,7 +505,7 @@ mod items {
     mod item_mac_call { }
     /// ItemKind::MacroDef
     mod item_macro_def {
-        macro_rules! mac { () => { ... }; }
+        macro_rules! mac { () => {...}; }
         pub macro stringify { () => {} }
     }
     /// ItemKind::Delegation

From 4034cafffe5f282cf84c2f1f909a1190903eecea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= <matthias.krueger@famsik.de>
Date: Tue, 15 Apr 2025 22:46:29 +0200
Subject: [PATCH 08/10] crashes: more tests

---
 tests/crashes/138156.rs | 42 +++++++++++++++++++++++++++++++++++++++++
 tests/crashes/138240.rs |  9 +++++++++
 tests/crashes/138265.rs | 12 ++++++++++++
 tests/crashes/138266.rs |  7 +++++++
 tests/crashes/138359.rs |  8 ++++++++
 tests/crashes/138361.rs |  6 ++++++
 tests/crashes/138510.rs |  7 +++++++
 tests/crashes/138534.rs |  6 ++++++
 tests/crashes/138564.rs | 26 +++++++++++++++++++++++++
 tests/crashes/138707.rs | 37 ++++++++++++++++++++++++++++++++++++
 tests/crashes/138738.rs |  7 +++++++
 tests/crashes/139089.rs |  2 ++
 tests/crashes/139120.rs | 29 ++++++++++++++++++++++++++++
 tests/crashes/139381.rs | 13 +++++++++++++
 tests/crashes/139387.rs | 15 +++++++++++++++
 tests/crashes/139409.rs | 12 ++++++++++++
 tests/crashes/139462.rs |  8 ++++++++
 tests/crashes/139556.rs | 13 +++++++++++++
 tests/crashes/139570.rs |  4 ++++
 tests/crashes/139596.rs | 10 ++++++++++
 tests/crashes/139659.rs | 29 ++++++++++++++++++++++++++++
 tests/crashes/139738.rs |  3 +++
 tests/crashes/139815.rs | 14 ++++++++++++++
 tests/crashes/139817.rs |  8 ++++++++
 tests/crashes/139825.rs |  5 +++++
 tests/crashes/139872.rs | 12 ++++++++++++
 26 files changed, 344 insertions(+)
 create mode 100644 tests/crashes/138156.rs
 create mode 100644 tests/crashes/138240.rs
 create mode 100644 tests/crashes/138265.rs
 create mode 100644 tests/crashes/138266.rs
 create mode 100644 tests/crashes/138359.rs
 create mode 100644 tests/crashes/138361.rs
 create mode 100644 tests/crashes/138510.rs
 create mode 100644 tests/crashes/138534.rs
 create mode 100644 tests/crashes/138564.rs
 create mode 100644 tests/crashes/138707.rs
 create mode 100644 tests/crashes/138738.rs
 create mode 100644 tests/crashes/139089.rs
 create mode 100644 tests/crashes/139120.rs
 create mode 100644 tests/crashes/139381.rs
 create mode 100644 tests/crashes/139387.rs
 create mode 100644 tests/crashes/139409.rs
 create mode 100644 tests/crashes/139462.rs
 create mode 100644 tests/crashes/139556.rs
 create mode 100644 tests/crashes/139570.rs
 create mode 100644 tests/crashes/139596.rs
 create mode 100644 tests/crashes/139659.rs
 create mode 100644 tests/crashes/139738.rs
 create mode 100644 tests/crashes/139815.rs
 create mode 100644 tests/crashes/139817.rs
 create mode 100644 tests/crashes/139825.rs
 create mode 100644 tests/crashes/139872.rs

diff --git a/tests/crashes/138156.rs b/tests/crashes/138156.rs
new file mode 100644
index 0000000000000..48c6455627f0b
--- /dev/null
+++ b/tests/crashes/138156.rs
@@ -0,0 +1,42 @@
+//@ known-bug: #138156
+
+#![feature(generic_const_exprs)]
+
+#[derive(Default)]
+pub struct GenId<const IDX: usize>;
+
+pub trait IndexTrait: Default {
+    const IDX: usize;
+}
+pub trait ToplogyIndex {
+    type Idx: IndexTrait;
+}
+
+#[derive(Default)]
+pub struct Expression<T: ToplogyIndex> {
+    pub data: T,
+}
+
+fn i<T: ToplogyIndex, const IDX0: usize, const IDX1: usize>(s: Expression<T>) ->
+    Expression<GenId<{ IDX0 | IDX1 }>>
+where
+    GenId<{ IDX0 | IDX1 }>: ToplogyIndex,
+{
+    Expression::default()
+}
+
+pub fn sum<In: ToplogyIndex>(s: Expression<In>) -> Expression<In>
+where
+    [(); In::Idx::IDX]:,
+{
+    s
+}
+
+fn param_position<In: ToplogyIndex>(s: Expression<In>)
+where
+    GenId<{ 1 | 2 }>: ToplogyIndex,
+{
+    sum(i::<_, 1, 2>(s));
+}
+
+fn main() {}
diff --git a/tests/crashes/138240.rs b/tests/crashes/138240.rs
new file mode 100644
index 0000000000000..6ffb7868bd5d8
--- /dev/null
+++ b/tests/crashes/138240.rs
@@ -0,0 +1,9 @@
+//@ known-bug: #138240
+//@edition:2024
+#![feature(min_generic_const_args)]
+#![feature(inherent_associated_types)]
+async fn _CF() -> Box<[u8; Box::b]> {
+    Box::new(true)
+}
+
+fn main() {}
diff --git a/tests/crashes/138265.rs b/tests/crashes/138265.rs
new file mode 100644
index 0000000000000..f6c8ea748895c
--- /dev/null
+++ b/tests/crashes/138265.rs
@@ -0,0 +1,12 @@
+//@ known-bug: #138265
+
+#![feature(coerce_unsized)]
+#![crate_type = "lib"]
+impl<A> std::ops::CoerceUnsized<A> for A {}
+pub fn f() {
+    [0; {
+        let mut c = &0;
+        c = &0;
+        0
+    }]
+}
diff --git a/tests/crashes/138266.rs b/tests/crashes/138266.rs
new file mode 100644
index 0000000000000..9a4de9abcff5c
--- /dev/null
+++ b/tests/crashes/138266.rs
@@ -0,0 +1,7 @@
+//@ known-bug: #138266
+//@compile-flags: --crate-type=lib
+#![feature(min_generic_const_args)]
+#![feature(inherent_associated_types)]
+pub fn f(mut x: [u8; Box::b]) {
+    x[72] = 1;
+}
diff --git a/tests/crashes/138359.rs b/tests/crashes/138359.rs
new file mode 100644
index 0000000000000..d4376d536eecc
--- /dev/null
+++ b/tests/crashes/138359.rs
@@ -0,0 +1,8 @@
+//@ known-bug: #138359
+#![feature(min_generic_const_args)]
+#![feature(inherent_associated_types)]
+struct a(Box<[u8; Box::b]>);
+impl a {
+  fn c(self) { self.0.da }
+}
+fn main() {}
diff --git a/tests/crashes/138361.rs b/tests/crashes/138361.rs
new file mode 100644
index 0000000000000..8661ed374744a
--- /dev/null
+++ b/tests/crashes/138361.rs
@@ -0,0 +1,6 @@
+//@ known-bug: #138361
+
+fn main() {
+  [0; loop{}];
+  std::mem::transmute(4)
+}
diff --git a/tests/crashes/138510.rs b/tests/crashes/138510.rs
new file mode 100644
index 0000000000000..f429e8bb33b56
--- /dev/null
+++ b/tests/crashes/138510.rs
@@ -0,0 +1,7 @@
+//@ known-bug: #138510
+fn main()
+where
+    #[repr()]
+    _: Sized,
+{
+}
diff --git a/tests/crashes/138534.rs b/tests/crashes/138534.rs
new file mode 100644
index 0000000000000..80f9cd2251837
--- /dev/null
+++ b/tests/crashes/138534.rs
@@ -0,0 +1,6 @@
+//@ known-bug: #138534
+//@compile-flags: -Zunpretty=expanded
+#[repr(bool)]
+pub enum TopFg {
+    Bar,
+}
diff --git a/tests/crashes/138564.rs b/tests/crashes/138564.rs
new file mode 100644
index 0000000000000..b10f75f8cdd0c
--- /dev/null
+++ b/tests/crashes/138564.rs
@@ -0,0 +1,26 @@
+//@ known-bug: #138564
+//@compile-flags: -Copt-level=0 -Cdebuginfo=2 --crate-type lib
+#![feature(unsize, dispatch_from_dyn, arbitrary_self_types)]
+
+use std::marker::Unsize;
+use std::ops::{Deref, DispatchFromDyn};
+
+#[repr(align(16))]
+pub struct MyPointer<T: ?Sized>(*const T);
+
+impl<T: ?Sized + Unsize<U>, U: ?Sized> DispatchFromDyn<MyPointer<U>> for MyPointer<T> {}
+impl<T: ?Sized> Deref for MyPointer<T> {
+    type Target = T;
+    fn deref(&self) -> &T {
+        unimplemented!()
+    }
+}
+
+pub trait Trait {
+    fn foo(self: MyPointer<Self>) {}
+}
+
+// make sure some usage of `<dyn Trait>::foo` makes it to codegen
+pub fn user() -> *const () {
+    <dyn Trait>::foo as *const ()
+}
diff --git a/tests/crashes/138707.rs b/tests/crashes/138707.rs
new file mode 100644
index 0000000000000..4d9a82500ec45
--- /dev/null
+++ b/tests/crashes/138707.rs
@@ -0,0 +1,37 @@
+//@ known-bug: #138707
+//@edition:2024
+//@compile-flags: --crate-type lib
+use core::marker::PhantomData;
+
+struct LeftReflector<S> {
+    _phantom: PhantomData<S>,
+}
+
+struct DefaultAllocator {}
+
+trait Allocator<R> {
+    type Buffer;
+}
+
+struct U2 {}
+
+impl Allocator<U2> for DefaultAllocator {
+    type Buffer = [u8; 2];
+}
+
+impl<R> From<R> for LeftReflector<<DefaultAllocator as Allocator<R>>::Buffer>
+where
+    DefaultAllocator: Allocator<R>,
+{
+    fn from(_: R) -> Self {
+        todo!()
+    }
+}
+
+fn ice<D>(a: U2)
+where
+    DefaultAllocator: Allocator<D>,
+{
+    // ICE
+    let _ = LeftReflector::from(a);
+}
diff --git a/tests/crashes/138738.rs b/tests/crashes/138738.rs
new file mode 100644
index 0000000000000..74e5effa56f58
--- /dev/null
+++ b/tests/crashes/138738.rs
@@ -0,0 +1,7 @@
+//@ known-bug: #138738
+//@ only-x86_64
+
+#![feature(abi_ptx)]
+fn main() {
+    let a = unsafe { core::mem::transmute::<usize, extern "ptx-kernel" fn(i32)>(4) }(2);
+}
diff --git a/tests/crashes/139089.rs b/tests/crashes/139089.rs
new file mode 100644
index 0000000000000..3326aa6ad9846
--- /dev/null
+++ b/tests/crashes/139089.rs
@@ -0,0 +1,2 @@
+//@ known-bug: #139089
+pub fn foo3(x: ＆Vec<u8>) { x.push(0); }
diff --git a/tests/crashes/139120.rs b/tests/crashes/139120.rs
new file mode 100644
index 0000000000000..f946f010c44ef
--- /dev/null
+++ b/tests/crashes/139120.rs
@@ -0,0 +1,29 @@
+//@ known-bug: #139120
+
+
+
+pub trait Foo {
+    type Bar<'a>;
+}
+
+pub struct FooImpl {}
+
+impl Foo for FooImpl {
+    type Bar<'a> = ();
+}
+
+pub trait FooFn {
+    fn bar(&self);
+}
+
+impl<T: Foo> FooFn for fn(T, T::Bar<'_>) {
+    fn bar(&self) {}
+}
+
+fn foo<T: Foo>(f: fn(T, T::Bar<'_>)) {
+    let _: &dyn FooFn = &f;
+}
+
+fn main() {
+    foo(|_: FooImpl, _| {});
+}
diff --git a/tests/crashes/139381.rs b/tests/crashes/139381.rs
new file mode 100644
index 0000000000000..6757b584e82a1
--- /dev/null
+++ b/tests/crashes/139381.rs
@@ -0,0 +1,13 @@
+//@ known-bug: #139381
+//@ needs-rustc-debug-assertions
+trait A<'a> {
+    type Assoc: ?Sized;
+}
+
+impl<'a> A<'a> for () {
+    type Assoc = &'a ();
+}
+
+fn hello() -> impl for<'a> A<'a, Assoc: Into<u8> + 'static + Copy> {
+    ()
+}
diff --git a/tests/crashes/139387.rs b/tests/crashes/139387.rs
new file mode 100644
index 0000000000000..133643ad084ba
--- /dev/null
+++ b/tests/crashes/139387.rs
@@ -0,0 +1,15 @@
+//@ known-bug: #139387
+//@ needs-rustc-debug-assertions
+
+trait A {
+    fn method() -> impl Sized;
+}
+trait B {
+    fn method(Hash: Wrap<impl Beta<U: Copy + for<'a> Epsilon<'_, SI1: Eta>>>) -> impl Sized;
+}
+
+fn ambiguous<T: A + B>()
+where
+    T::method(..): Send,
+{
+}
diff --git a/tests/crashes/139409.rs b/tests/crashes/139409.rs
new file mode 100644
index 0000000000000..68cbfa153deb0
--- /dev/null
+++ b/tests/crashes/139409.rs
@@ -0,0 +1,12 @@
+//@ known-bug: #139409
+//@ compile-flags: -Znext-solver=globally
+
+fn main() {
+    trait B<C> {}
+    impl<C> B<C> for () {}
+    trait D<C, E>: B<C> + B<E> {
+        fn f(&self) {}
+    }
+    impl<C, E> D<C, E> for () {}
+    (&() as &dyn D<&(), &()>).f()
+}
diff --git a/tests/crashes/139462.rs b/tests/crashes/139462.rs
new file mode 100644
index 0000000000000..05bb246d7be0e
--- /dev/null
+++ b/tests/crashes/139462.rs
@@ -0,0 +1,8 @@
+//@ known-bug: #139462
+//@ compile-flags: -Cdebuginfo=2
+#![feature(unsafe_binders)]
+use std::unsafe_binder::wrap_binder;
+fn main() {
+    let foo = 0;
+    let foo: unsafe<'a> &'a u32 = unsafe { wrap_binder!(&foo) };
+}
diff --git a/tests/crashes/139556.rs b/tests/crashes/139556.rs
new file mode 100644
index 0000000000000..60dc8d7c3afcc
--- /dev/null
+++ b/tests/crashes/139556.rs
@@ -0,0 +1,13 @@
+//@ known-bug: #139556
+
+trait T {}
+
+type Alias<'a> = impl T;
+
+struct S;
+impl<'a> T for &'a S {}
+
+#[define_opaque(Alias)]
+fn with_positive(fun: impl Fn(Alias<'_>)) {
+    with_positive(|&n| ());
+}
diff --git a/tests/crashes/139570.rs b/tests/crashes/139570.rs
new file mode 100644
index 0000000000000..9c001aaf848aa
--- /dev/null
+++ b/tests/crashes/139570.rs
@@ -0,0 +1,4 @@
+//@ known-bug: #139570
+fn main() {
+    |(1, 42), ()| yield;
+}
diff --git a/tests/crashes/139596.rs b/tests/crashes/139596.rs
new file mode 100644
index 0000000000000..590cfddf83e29
--- /dev/null
+++ b/tests/crashes/139596.rs
@@ -0,0 +1,10 @@
+//@ known-bug: #139596
+
+#![feature(min_generic_const_args)]
+struct Colour;
+
+struct Led<const C: Colour>;
+
+fn main() {
+    Led::<{ Colour}>;
+}
diff --git a/tests/crashes/139659.rs b/tests/crashes/139659.rs
new file mode 100644
index 0000000000000..7fc33f7e6a7cf
--- /dev/null
+++ b/tests/crashes/139659.rs
@@ -0,0 +1,29 @@
+//@ known-bug: #139659
+//@compile-flags: -Cdebuginfo=2 -Copt-level=0 --crate-type lib
+trait Trait {
+    type Output;
+}
+
+impl<O, F: Fn() -> O> Trait for F {
+    type Output = O;
+}
+
+struct Wrap<P>(P);
+struct WrapOutput<O>(O);
+
+impl<P: Trait> Trait for Wrap<P> {
+    type Output = WrapOutput<P::Output>;
+}
+
+fn wrap<P: Trait>(x: P) -> impl Trait {
+    Wrap(x)
+}
+
+fn consume<P: Trait>(_: P) -> P::Output {
+    unimplemented!()
+}
+
+pub fn recurse() -> impl Sized {
+    consume(wrap(recurse))
+}
+pub fn main() {}
diff --git a/tests/crashes/139738.rs b/tests/crashes/139738.rs
new file mode 100644
index 0000000000000..c0e7307de6c3f
--- /dev/null
+++ b/tests/crashes/139738.rs
@@ -0,0 +1,3 @@
+//@ known-bug: #139738
+#![feature(generic_const_exprs)]
+fn b<'a>() -> impl IntoIterator<[(); (|_: &'a u8| 0, 0).1]> {}
diff --git a/tests/crashes/139815.rs b/tests/crashes/139815.rs
new file mode 100644
index 0000000000000..9094acdc94b21
--- /dev/null
+++ b/tests/crashes/139815.rs
@@ -0,0 +1,14 @@
+//@ known-bug: #139815
+
+#![feature(generic_const_exprs)]
+fn is_123<const N: usize>(
+    x: [u32; {
+        N + 1;
+        5
+    }],
+) -> bool {
+    match x {
+        [1, 2] => true,
+        _ => false,
+    }
+}
diff --git a/tests/crashes/139817.rs b/tests/crashes/139817.rs
new file mode 100644
index 0000000000000..d439ed4cacbd6
--- /dev/null
+++ b/tests/crashes/139817.rs
@@ -0,0 +1,8 @@
+//@ known-bug: #139817
+fn enum_upvar() {
+    type T = impl Copy;
+    let foo: T = Some((42, std::marker::PhantomData::<T>));
+    let x = move || match foo {
+        None => (),
+    };
+}
diff --git a/tests/crashes/139825.rs b/tests/crashes/139825.rs
new file mode 100644
index 0000000000000..8c5b6b80f0bad
--- /dev/null
+++ b/tests/crashes/139825.rs
@@ -0,0 +1,5 @@
+//@ known-bug: #139825
+//@compile-flags: --check-cfg=cfg(docsrs,test) --crate-type lib
+struct a
+where
+    for<#[cfg(b)] c> u8:;
diff --git a/tests/crashes/139872.rs b/tests/crashes/139872.rs
new file mode 100644
index 0000000000000..73e30efcae035
--- /dev/null
+++ b/tests/crashes/139872.rs
@@ -0,0 +1,12 @@
+//@ known-bug: #139872
+//@ only-x86_64
+//@ ignore-x86_64-apple-darwin
+pub fn main() {
+    enum A {
+        B(u32),
+    }
+    static C: (A, u16, str);
+    fn d() {
+        let (_, e, _) = C;
+    }
+}

From e3458dcf19cce424205eac5274ee1594c1413c72 Mon Sep 17 00:00:00 2001
From: Trevor Gross <tmgross@umich.edu>
Date: Tue, 29 Apr 2025 06:11:04 +0000
Subject: [PATCH 09/10] Update documentation for `fn target_config`

This was missed as part of [1].

[1]: https://github.com/rust-lang/rust/pull/140323
---
 compiler/rustc_codegen_ssa/src/traits/backend.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/compiler/rustc_codegen_ssa/src/traits/backend.rs b/compiler/rustc_codegen_ssa/src/traits/backend.rs
index e6b50cc7c0cbf..e2f1458d06232 100644
--- a/compiler/rustc_codegen_ssa/src/traits/backend.rs
+++ b/compiler/rustc_codegen_ssa/src/traits/backend.rs
@@ -45,15 +45,14 @@ pub trait CodegenBackend {
 
     fn print(&self, _req: &PrintRequest, _out: &mut String, _sess: &Session) {}
 
-    /// Returns two feature sets:
-    /// - The first has the features that should be set in `cfg(target_features)`.
-    /// - The second is like the first, but also includes unstable features.
-    ///
-    /// RUSTC_SPECIFIC_FEATURES should be skipped here, those are handled outside codegen.
+    /// Collect target-specific options that should be set in `cfg(...)`, including
+    /// `target_feature` and support for unstable float types.
     fn target_config(&self, _sess: &Session) -> TargetConfig {
         TargetConfig {
             target_features: vec![],
             unstable_target_features: vec![],
+            // `true` is used as a default so backends need to acknowledge when they do not
+            // support the float types, rather than accidentally quietly skipping all tests.
             has_reliable_f16: true,
             has_reliable_f16_math: true,
             has_reliable_f128: true,

From 5b7e669fa2a02f65cd7a701192fdeecd6c61cc16 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Tue, 29 Apr 2025 08:26:35 +0200
Subject: [PATCH 10/10] loongarch tests need LLVM version 20 to avoid warnings

---
 .../target-feature/abi-required-target-feature-flag-disable.rs  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/ui/target-feature/abi-required-target-feature-flag-disable.rs b/tests/ui/target-feature/abi-required-target-feature-flag-disable.rs
index 02841b6690aff..1788c0bf5b303 100644
--- a/tests/ui/target-feature/abi-required-target-feature-flag-disable.rs
+++ b/tests/ui/target-feature/abi-required-target-feature-flag-disable.rs
@@ -10,8 +10,10 @@
 //@[aarch64] needs-llvm-components: aarch64
 //@[riscv] compile-flags: --target=riscv64gc-unknown-none-elf -Ctarget-feature=-d
 //@[riscv] needs-llvm-components: riscv
+//@[riscv] min-llvm-version: 20
 //@[loongarch] compile-flags: --target=loongarch64-unknown-none -Ctarget-feature=-d
 //@[loongarch] needs-llvm-components: loongarch
+//@[loongarch] min-llvm-version: 20
 // For now this is just a warning.
 //@ build-pass