mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sys/windows: remove miri hack that is only needed for win7

Browse Source
This commit is contained in:
Ralf Jung 2024-10-13 12:24:54 +02:00
parent ecf2d1fa4b
commit 2ae3b1b09a
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/std/src/sys/pal/windows/c.rs
View File

@ -175,9 +175,9 @@ pub fn WaitOnAddress(
pub fn WakeByAddressAll(address: *const c_void); pub fn WakeByAddressAll(address: *const c_void);
} }
// These are loaded by `load_synch_functions`.
#[cfg(target_vendor = "win7")] #[cfg(target_vendor = "win7")]
compat_fn_optional! { compat_fn_optional! {
crate::sys::compat::load_synch_functions();
pub fn WaitOnAddress( pub fn WaitOnAddress(
address: *const c_void, address: *const c_void,
compareaddress: *const c_void, compareaddress: *const c_void,

8
library/std/src/sys/pal/windows/compat.rs
View File

@ -198,11 +198,10 @@ pub unsafe fn call($($argname: $argtype),*) -> $rettype {
/// Optionally loaded functions. /// Optionally loaded functions.
/// ///
/// Actual loading of the function defers to $load_functions. /// Relies on the functions being pre-loaded elsewhere.
#[cfg(target_vendor = "win7")] #[cfg(target_vendor = "win7")]
macro_rules! compat_fn_optional { macro_rules! compat_fn_optional {
($load_functions:expr; ($(
$(
$(#[$meta:meta])* $(#[$meta:meta])*
$vis:vis fn $symbol:ident($($argname:ident: $argtype:ty),*) $(-> $rettype:ty)?; $vis:vis fn $symbol:ident($($argname:ident: $argtype:ty),*) $(-> $rettype:ty)?;
)+) => ( )+) => (
@ -221,9 +220,6 @@ pub mod $symbol {
#[inline(always)] #[inline(always)]
pub fn option() -> Option<F> { pub fn option() -> Option<F> {
// Miri does not understand the way we do preloading
// therefore load the function here instead.
#[cfg(miri)] $load_functions;
NonNull::new(PTR.load(Ordering::Relaxed)).map(|f| unsafe { mem::transmute(f) }) NonNull::new(PTR.load(Ordering::Relaxed)).map(|f| unsafe { mem::transmute(f) })
} }
} }