Skip to content

Commit

Permalink
chore: fix version detection for addr_of! (#4863)
Browse files Browse the repository at this point in the history
  • Loading branch information
Darksonn authored Jul 25, 2022
1 parent 0906351 commit ffff9e6
Showing 1 changed file with 29 additions and 2 deletions.
31 changes: 29 additions & 2 deletions tokio/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,16 @@ const CONST_THREAD_LOCAL_PROBE: &str = r#"
}
"#;

const ADDR_OF_PROBE: &str = r#"
{
let my_var = 10;
::std::ptr::addr_of!(my_var)
}
"#;

fn main() {
let mut enable_const_thread_local = false;
let mut enable_addr_of = false;

match AutoCfg::new() {
Ok(ac) => {
Expand All @@ -35,8 +43,19 @@ fn main() {
}
}

if !ac.probe_rustc_version(1, 51) {
autocfg::emit("tokio_no_addr_of")
// The `addr_of` and `addr_of_mut` macros were stabilized in 1.51.
if ac.probe_rustc_version(1, 52) {
enable_addr_of = true;
} else if ac.probe_rustc_version(1, 51) {
// This compiler claims to be 1.51, but there are some nightly
// compilers that claim to be 1.51 without supporting the
// feature. Explicitly probe to check if code using them
// compiles.
//
// The oldest nightly that supports the feature is 2021-01-31.
if ac.probe_expression(ADDR_OF_PROBE) {
enable_addr_of = true;
}
}
}

Expand All @@ -58,4 +77,12 @@ fn main() {
// RUSTFLAGS="--cfg tokio_no_const_thread_local"
autocfg::emit("tokio_no_const_thread_local")
}

if !enable_addr_of {
// To disable this feature on compilers that support it, you can
// explicitly pass this flag with the following environment variable:
//
// RUSTFLAGS="--cfg tokio_no_addr_of"
autocfg::emit("tokio_no_addr_of")
}
}

0 comments on commit ffff9e6

Please sign in to comment.