Fix compat_fn option method on miri #98042
Conversation
|
Hey! It looks like you've submitted a new PR for the library teams! If this PR contains changes to any Examples of
|
rustbot
added
the
T-libs
|
(rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
r? @RalfJung |
| } | ||
|
|
||
| #[allow(dead_code)] | ||
| pub unsafe fn call($($argname: $argtype),*) -> $rettype { | ||
| if let Some(ptr) = PTR { | ||
| if let Some(ptr) = option() { |
There was a problem hiding this comment.
This is super hot code, do we want inline(always) on option to ensure it doesn't get slowed down too much?
|
Ah, I overlooked this in #95775. However I don't actually know this code very well; @ChrisDenton it'd be great if you could take a look. |
|
This does not appear to affect the not-miri case (assuming |
|
Okay so let's land this with |
|
If everyone agrees then... @bors r+ rollup |
|
📌 Commit 5470a38 has been approved by |
bors
added
S-waiting-on-bors
…hrisDenton Fix compat_fn option method on miri This change is required to make `WaitOnAddress` work with rust-lang/miri#2231
Rollup of 5 pull requests Successful merges: - rust-lang#97869 (BTree: tweak internal comments) - rust-lang#97935 (Rename the `ConstS::val` field as `kind`.) - rust-lang#97948 (lint: add diagnostic translation migration lints) - rust-lang#98042 (Fix compat_fn option method on miri) - rust-lang#98069 (rustdoc: remove link on slice brackets) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This change is required to make
WaitOnAddresswork with rust-lang/miri#2231