Skip to content

Commit

Permalink
Auto merge of #95775 - RalfJung:miri-windows-compat, r=ChrisDenton
Browse files Browse the repository at this point in the history
make windows compat_fn (crudely) work on Miri

With rust-lang/rust#95469, Windows `compat_fn!` now has to be supported by Miri to even make stdout work. Unfortunately, it relies on some outside-of-Rust linker hacks (`#[link_section = ".CRT$XCU"]`) that are rather hard to make work in Miri. So I came up with this crude hack to make this stuff work in Miri regardless. It should come at no cost for regular executions, so I hope this is okay.

Cc rust-lang/rust#95627 `@ChrisDenton`
  • Loading branch information
bors committed Apr 8, 2022
2 parents b86be12 + 40d490b commit 6e336a0
Showing 1 changed file with 17 additions and 8 deletions.
25 changes: 17 additions & 8 deletions std/src/sys/windows/compat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ macro_rules! compat_fn {
static INIT_TABLE_ENTRY: unsafe extern "C" fn() = init;

unsafe extern "C" fn init() {
PTR = get_f();
}

unsafe extern "C" fn get_f() -> Option<F> {
// There is no locking here. This code is executed before main() is entered, and
// is guaranteed to be single-threaded.
//
Expand All @@ -88,13 +92,13 @@ macro_rules! compat_fn {
let symbol_name: *const u8 = concat!(stringify!($symbol), "\0").as_ptr();
let module_handle = $crate::sys::c::GetModuleHandleA(module_name as *const i8);
if !module_handle.is_null() {
match $crate::sys::c::GetProcAddress(module_handle, symbol_name as *const i8).addr() {
0 => {}
n => {
PTR = Some(mem::transmute::<usize, F>(n));
}
let ptr = $crate::sys::c::GetProcAddress(module_handle, symbol_name as *const i8);
if !ptr.is_null() {
// Transmute to the right function pointer type.
return Some(mem::transmute(ptr));
}
}
return None;
}

#[allow(dead_code)]
Expand All @@ -105,10 +109,15 @@ macro_rules! compat_fn {
#[allow(dead_code)]
pub unsafe fn call($($argname: $argtype),*) -> $rettype {
if let Some(ptr) = PTR {
ptr($($argname),*)
} else {
$fallback_body
return ptr($($argname),*);
}
if cfg!(miri) {
// Miri does not run `init`, so we just call `get_f` each time.
if let Some(ptr) = get_f() {
return ptr($($argname),*);
}
}
$fallback_body
}
}

Expand Down

0 comments on commit 6e336a0

Please sign in to comment.