Skip to content

Fix compat_fn option method on miri #98042

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.

Sign up for GitHub

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
Jun 14, 2022
Merged

Fix compat_fn option method on miri #98042

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
940e0b3
fix compat_fn option method on miri
beepster4096 Jun 1, 2022
5470a38
add inline(always) to option
beepster4096 Jun 13, 2022
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
17 changes: 9 additions & 8 deletions library/std/src/sys/windows/compat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,20 +103,21 @@ macro_rules! compat_fn {

#[allow(dead_code)]
pub fn option() -> Option<F> {
unsafe { PTR }
unsafe {
if cfg!(miri) {
// Miri does not run `init`, so we just call `get_f` each time.
get_f()
} else {
PTR
}
}
}

#[allow(dead_code)]
pub unsafe fn call($($argname: $argtype),*) -> $rettype {
if let Some(ptr) = PTR {
if let Some(ptr) = option() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is super hot code, do we want inline(always) on option to ensure it doesn't get slowed down too much?

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