Auto merge of #1938 - RalfJung:test, r=RalfJung

add regression test

Adds a regression test for rust-lang/rust#91636 (which was fixed by rust-lang/rust#91856)

Author: bors

rust-version

@@ -1 +1 @@
-404c8471aba60c2d837fa728e7c729a0f52d5830
+c5ecc157043ba413568b09292001a4a74b541a4e

src/shims/foreign_items.rs

@@ -176,7 +176,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                         if let Some((original_instance, original_cnum)) = instance_and_crate {
                             // Make sure we are consistent wrt what is 'first' and 'second'.
                             let original_span = tcx.def_span(original_instance.def_id()).data();
-                            let span =  tcx.def_span(def_id).data();
+                            let span = tcx.def_span(def_id).data();
                             if original_span < span {
                                 throw_machine_stop!(TerminationInfo::MultipleSymbolDefinitions {
                                     link_name,

test-cargo-miri/build.rs

@@ -1,5 +1,3 @@
-#![feature(asm)]
-
 use std::env;
 
 #[cfg(miri)]
@@ -9,7 +7,7 @@ fn not_in_miri() -> i32 {
     // Inline assembly definitely does not work in Miri.
     let mut dummy = 42;
     unsafe {
-        asm!("/* {} */", in(reg) &mut dummy);
+        std::arch::asm!("/* {} */", in(reg) &mut dummy);
     }
     return dummy;
 }

tests/run-pass/issue-91636.rs

@@ -0,0 +1,20 @@
+type BuiltIn = for<'a> fn(&str);
+
+struct Function {
+    inner: BuiltIn,
+}
+
+impl Function {
+    fn new(subr: BuiltIn) -> Self {
+        Self { inner: subr }
+    }
+}
+
+fn dummy(_: &str) {}
+
+fn main() {
+    let func1 = Function::new(dummy);
+    let func2 = Function::new(dummy);
+    let inner: fn(&'static _) -> _ = func1.inner;
+    assert!(inner == func2.inner);
+}