Skip to content

Commit 51e9630

Browse files
committed
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)
2 parents 65cbcb0 + e7c327c commit 51e9630

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
404c8471aba60c2d837fa728e7c729a0f52d5830
1+
c5ecc157043ba413568b09292001a4a74b541a4e

test-cargo-miri/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fn not_in_miri() -> i32 {
99
// Inline assembly definitely does not work in Miri.
1010
let mut dummy = 42;
1111
unsafe {
12-
asm!("/* {} */", in(reg) &mut dummy);
12+
std::arch::asm!("/* {} */", in(reg) &mut dummy);
1313
}
1414
return dummy;
1515
}

tests/run-pass/issue-91636.rs

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
type BuiltIn = for<'a> fn(&str);
2+
3+
struct Function {
4+
inner: BuiltIn,
5+
}
6+
7+
impl Function {
8+
fn new(subr: BuiltIn) -> Self {
9+
Self { inner: subr }
10+
}
11+
}
12+
13+
fn dummy(_: &str) {}
14+
15+
fn main() {
16+
let func1 = Function::new(dummy);
17+
let func2 = Function::new(dummy);
18+
let inner: fn(&'static _) -> _ = func1.inner;
19+
assert!(inner == func2.inner);
20+
}

0 commit comments

Comments
 (0)