Auto merge of #162510 - Zalathar:rollup-0hi6WtW, r=Zalathar

Rollup of 6 pull requests

Successful merges:

 - #162482 (Make `run-make` testsuite work with other codegen backend than LLVM)
 - #161587 (Avoid invalid suggestion in case of macro expansion without inferrable generic type)
 - #162363 (Use correct `dir_path` when parsing module from path)
 - #162408 (add crashtests [7/N])
 - #162502 (triagebot: Subscribe me to amdgpu changes)
 - #162505 (Revert "fuchsia: Add safestack as a supported sanitizer for x86_64 fuchsia")

Author: bors

compiler/rustc_expand/src/expand.rs

@@ -1382,7 +1382,11 @@ impl InvocationCollectorNode for Box<ast::Item> {
                 // This lets `parse_external_mod` catch cycles if it's self-referential.
                 let file_path = match inline {
                     Inline::Yes => None,
-                    Inline::No { .. } => mod_file_path_from_attr(ecx.sess, &node.attrs, &dir_path),
+                    Inline::No { .. } => mod_file_path_from_attr(
+                        ecx.sess,
+                        &node.attrs,
+                        &ecx.current_expansion.module.dir_path,
+                    ),
                 };
                 (file_path, dir_path, dir_ownership)
             }

compiler/rustc_target/src/spec/targets/x86_64_unknown_fuchsia.rs

@@ -9,9 +9,7 @@ pub(crate) fn target() -> Target {
     base.features = "+cmpxchg16b,+lahfsahf,+popcnt,+sse3,+sse4.1,+sse4.2,+ssse3".into();
     base.max_atomic_width = Some(128);
     base.stack_probes = StackProbeType::Inline;
-    base.supported_sanitizers =
-        SanitizerSet::ADDRESS | SanitizerSet::CFI | SanitizerSet::LEAK | SanitizerSet::SAFESTACK;
-    base.default_sanitizers = SanitizerSet::SAFESTACK;
+    base.supported_sanitizers = SanitizerSet::ADDRESS | SanitizerSet::CFI | SanitizerSet::LEAK;
     base.supports_xray = true;
 
     Target {

compiler/rustc_trait_selection/src/error_reporting/infer/need_type_info.rs

@@ -519,11 +519,13 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
         };
 
         let mut local_visitor = FindInferSourceVisitor::new(self, typeck_results, term, ty);
+        let mut body_from_expansion = false;
         if let Some(body) =
             self.tcx.hir_maybe_body_owned_by(self.tcx.typeck_root_def_id_local(body_def_id))
         {
             let expr = body.value;
             local_visitor.visit_expr(expr);
+            body_from_expansion = body.value.span.from_expansion();
         }
 
         let Some(InferSource { span, kind }) = local_visitor.infer_source else {
@@ -566,6 +568,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
             term,
             &arg_data,
             typeck_results,
+            body_from_expansion,
             span,
         );
 
@@ -705,6 +708,7 @@ impl<'tcx> InferSourceKind<'tcx> {
         term: Term<'tcx>,
         arg_data: &'local InferenceDiagnosticsData,
         typeck_results: &TypeckResults<'tcx>,
+        body_from_expansion: bool,
         span: Span,
     ) -> Option<SourceKindSubdiag<'local>>
     where
@@ -799,7 +803,7 @@ impl<'tcx> InferSourceKind<'tcx> {
                     p.into_buffer()
                 };
 
-                let suggestion = if have_turbofish {
+                let suggestion = if have_turbofish || body_from_expansion {
                     None
                 } else if generic_args.len() == 1 && used_fallback {
                     match param.kind {

src/tools/compiletest/src/runtest/run_make.rs

@@ -203,6 +203,11 @@ impl TestCx<'_> {
             // through a specific CI runner).
             .env("LLVM_COMPONENTS", &self.config.llvm_components);
 
+        if let Some(codegen_backend) = &self.config.override_codegen_backend {
+            // In case it's a different codegen backend than LLVM.
+            cmd.env("RUSTC_CODEGEN_BACKEND", codegen_backend.as_str());
+        }
+
         // The `run-make-cargo` and `build-std` suites need an in-tree `cargo`, `run-make` does not.
         if matches!(self.config.suite, TestSuite::RunMakeCargo | TestSuite::BuildStd) {
             cmd.env(

src/tools/run-make-support/src/external_deps/rustc.rs

@@ -76,6 +76,9 @@ pub fn rustc_path() -> String {
 fn setup_common() -> Command {
     let mut cmd = Command::new(rustc_path());
     set_host_compiler_dylib_path(&mut cmd);
+    if let Ok(codegen_backend) = std::env::var("RUSTC_CODEGEN_BACKEND") {
+        cmd.arg(format!("-Zcodegen-backend={codegen_backend}"));
+    }
     cmd
 }
 

tests/assembly-llvm/stack-protector/stack-protector-target-support.rs

@@ -177,15 +177,13 @@
 //@ compile-flags: -C opt-level=2
 
 #![crate_type = "lib"]
-#![feature(no_core, lang_items, sanitize)]
+#![feature(no_core, lang_items)]
 #![crate_type = "lib"]
 #![no_core]
 
 extern crate minicore;
 use minicore::*;
 
-// We only do this because we can't disable default sanitizers via compile-flags.
-#[sanitize(safestack = "off")]
 #[no_mangle]
 pub fn foo() {
     // CHECK: foo{{:|()}}

tests/crashes/140693.rs

@@ -0,0 +1,10 @@
+//@ known-bug: #140693
+#![crate_type = "sdylib"]
+
+pub trait Trait {
+    type Type;
+}
+pub struct S;
+
+#[export_stable]
+pub extern "C" fn foo1(_x: <S as Trait>::Type) {}

tests/crashes/146210.rs

@@ -0,0 +1,10 @@
+//@ known-bug: #146210
+//@ edition: 2024
+//@ compile-flags: -Zvalidate-mir --crate-type lib
+use core::pin::Pin;
+
+fn bar<T>(non_send: T) -> Pin<Box<dyn Future<Output = ()> + Send>> {
+    Box::pin(async {
+        non_send;
+    })
+}

tests/crashes/146353.rs

@@ -0,0 +1,4 @@
+//@ known-bug: #146353
+const BIG_CHAIN: u8 = ();
+trait NeverSend = !Send;
+fn main() {}

tests/crashes/149015.rs

@@ -0,0 +1,10 @@
+//@ known-bug: #149015
+trait Trait1 {
+    type Assoc;
+}
+
+trait Trait2 {}
+
+impl Trait1 for <dyn Trait2 as Trait1>::Assoc {
+    type Assoc = ();
+}