Skip to content

add regression test #1938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
404c8471aba60c2d837fa728e7c729a0f52d5830
c5ecc157043ba413568b09292001a4a74b541a4e
2 changes: 1 addition & 1 deletion src/shims/foreign_items.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 1 addition & 3 deletions test-cargo-miri/build.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![feature(asm)]

use std::env;

#[cfg(miri)]
Expand All @@ -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;
}
Expand Down
20 changes: 20 additions & 0 deletions tests/run-pass/issue-91636.rs
Original file line number Diff line number Diff line change
@@ -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);
}