bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make sure symbol_name is const evaluated

Browse source
This commit is contained in:
Chris Denton 2022-07-31 15:07:47 +01:00
parent 7f3d11e1d8
commit bf0b18e910
No known key found for this signature in database
GPG key ID: 713472F2F45627DE
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
library/std/src/sys/windows/compat.rs
View file

@ -180,8 +180,8 @@ macro_rules! compat_fn_with_fallback {
fn load_from_module(module: Option<Module>) -> F { fn load_from_module(module: Option<Module>) -> F {
unsafe { unsafe {
static symbol_name: &CStr = ansi_str!(sym $symbol); static SYMBOL_NAME: &CStr = ansi_str!(sym $symbol);
if let Some(f) = module.and_then(|m| m.proc_address(symbol_name)) { if let Some(f) = module.and_then(|m| m.proc_address(SYMBOL_NAME)) {
PTR.store(f.as_ptr(), Ordering::Relaxed); PTR.store(f.as_ptr(), Ordering::Relaxed);
mem::transmute(f) mem::transmute(f)
} else { } else {
@ -262,8 +262,8 @@ macro_rules! compat_fn_optional {
#[allow(unused)] #[allow(unused)]
pub(in crate::sys) fn preload(module: Module) { pub(in crate::sys) fn preload(module: Module) {
unsafe { unsafe {
let symbol_name = ansi_str!(sym $symbol); static SYMBOL_NAME: &CStr = ansi_str!(sym $symbol);
if let Some(f) = module.proc_address(symbol_name) { if let Some(f) = module.proc_address(SYMBOL_NAME) {
PTR.store(f.as_ptr(), Ordering::Relaxed); PTR.store(f.as_ptr(), Ordering::Relaxed);
} }
} }