bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Add cfg(target_has_atomic_equal_alignment).

Browse source 
This is needed for Atomic::from_mut.
This commit is contained in:
Mara Bos 2020-09-20 12:09:22 +02:00
parent 4eff9b0b29
commit db74e1f1e3
3 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_feature/src/builtin_attrs.rs
View file

@ -26,6 +26,11 @@ const GATED_CFGS: &[GatedCfg] = &[
(sym::target_thread_local, sym::cfg_target_thread_local, cfg_fn!(cfg_target_thread_local)), (sym::target_thread_local, sym::cfg_target_thread_local, cfg_fn!(cfg_target_thread_local)),
(sym::target_has_atomic, sym::cfg_target_has_atomic, cfg_fn!(cfg_target_has_atomic)), (sym::target_has_atomic, sym::cfg_target_has_atomic, cfg_fn!(cfg_target_has_atomic)),
(sym::target_has_atomic_load_store, sym::cfg_target_has_atomic, cfg_fn!(cfg_target_has_atomic)), (sym::target_has_atomic_load_store, sym::cfg_target_has_atomic, cfg_fn!(cfg_target_has_atomic)),
(
sym::target_has_atomic_equal_alignment,
sym::cfg_target_has_atomic,
cfg_fn!(cfg_target_has_atomic),
),
(sym::sanitize, sym::cfg_sanitize, cfg_fn!(cfg_sanitize)), (sym::sanitize, sym::cfg_sanitize, cfg_fn!(cfg_sanitize)),
(sym::version, sym::cfg_version, cfg_fn!(cfg_version)), (sym::version, sym::cfg_version, cfg_fn!(cfg_version)),
]; ];

19
compiler/rustc_session/src/config.rs
View file

@ -12,6 +12,7 @@ use rustc_data_structures::fx::FxHashSet;
use rustc_data_structures::impl_stable_hash_via_hash; use rustc_data_structures::impl_stable_hash_via_hash;
use rustc_data_structures::stable_hasher::{HashStable, StableHasher}; use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
use rustc_target::abi::{Align, TargetDataLayout};
use rustc_target::spec::{Target, TargetTriple}; use rustc_target::spec::{Target, TargetTriple};
use crate::parse::CrateConfig; use crate::parse::CrateConfig;
@ -748,6 +749,7 @@ pub fn default_configuration(sess: &Session) -> CrateConfig {
let min_atomic_width = sess.target.target.min_atomic_width(); let min_atomic_width = sess.target.target.min_atomic_width();
let max_atomic_width = sess.target.target.max_atomic_width(); let max_atomic_width = sess.target.target.max_atomic_width();
let atomic_cas = sess.target.target.options.atomic_cas; let atomic_cas = sess.target.target.options.atomic_cas;
let layout = TargetDataLayout::parse(&sess.target.target).unwrap();
let mut ret = FxHashSet::default(); let mut ret = FxHashSet::default();
ret.reserve(6); // the minimum number of insertions ret.reserve(6); // the minimum number of insertions
@ -769,18 +771,27 @@ pub fn default_configuration(sess: &Session) -> CrateConfig {
if sess.target.target.options.has_elf_tls { if sess.target.target.options.has_elf_tls {
ret.insert((sym::target_thread_local, None)); ret.insert((sym::target_thread_local, None));
} }
for &i in &[8, 16, 32, 64, 128] { for &(i, align) in &[
(8, layout.i8_align.abi),
(16, layout.i16_align.abi),
(32, layout.i32_align.abi),
(64, layout.i64_align.abi),
(128, layout.i128_align.abi),
] {
if i >= min_atomic_width && i <= max_atomic_width { if i >= min_atomic_width && i <= max_atomic_width {
let mut insert_atomic = |s| { let mut insert_atomic = |s, align: Align| {
ret.insert((sym::target_has_atomic_load_store, Some(Symbol::intern(s)))); ret.insert((sym::target_has_atomic_load_store, Some(Symbol::intern(s))));
if atomic_cas { if atomic_cas {
ret.insert((sym::target_has_atomic, Some(Symbol::intern(s)))); ret.insert((sym::target_has_atomic, Some(Symbol::intern(s))));
} }
if align.bits() == i {
ret.insert((sym::target_has_atomic_equal_alignment, Some(Symbol::intern(s))));
}
}; };
let s = i.to_string(); let s = i.to_string();
insert_atomic(&s); insert_atomic(&s, align);
if &s == wordsz { if &s == wordsz {
insert_atomic("ptr"); insert_atomic("ptr", layout.pointer_align.abi);
} }
} }
} }

1
compiler/rustc_span/src/symbol.rs
View file

@ -1071,6 +1071,7 @@ symbols! {
target_feature, target_feature,
target_feature_11, target_feature_11,
target_has_atomic, target_has_atomic,
target_has_atomic_equal_alignment,
target_has_atomic_load_store, target_has_atomic_load_store,
target_os, target_os,
target_pointer_width, target_pointer_width,