Skip to content

Commit c43a517

Browse files
Fix usage of get_size for gcc 12
1 parent 9c6618e commit c43a517

File tree

1 file changed

+19
-3
lines changed

1 file changed

+19
-3
lines changed

src/builder.rs

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ impl<'a, 'gcc, 'tcx> Builder<'a, 'gcc, 'tcx> {
6868
src: RValue<'gcc>,
6969
order: AtomicOrdering,
7070
) -> RValue<'gcc> {
71-
let size = src.get_type().get_size();
71+
let size = get_maybe_pointer_size(src);
7272

7373
let func = self.current_func();
7474

@@ -138,7 +138,7 @@ impl<'a, 'gcc, 'tcx> Builder<'a, 'gcc, 'tcx> {
138138
failure_order: AtomicOrdering,
139139
weak: bool,
140140
) -> RValue<'gcc> {
141-
let size = src.get_type().get_size();
141+
let size = get_maybe_pointer_size(src);
142142
let compare_exchange =
143143
self.context.get_builtin_function(&format!("__atomic_compare_exchange_{}", size));
144144
let order = self.context.new_rvalue_from_int(self.i32_type, order.to_gcc());
@@ -1600,7 +1600,7 @@ impl<'a, 'gcc, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'gcc, 'tcx> {
16001600
src: RValue<'gcc>,
16011601
order: AtomicOrdering,
16021602
) -> RValue<'gcc> {
1603-
let size = src.get_type().get_size();
1603+
let size = get_maybe_pointer_size(src);
16041604
let name = match op {
16051605
AtomicRmwBinOp::AtomicXchg => format!("__atomic_exchange_{}", size),
16061606
AtomicRmwBinOp::AtomicAdd => format!("__atomic_fetch_add_{}", size),
@@ -2425,3 +2425,19 @@ impl ToGccOrdering for AtomicOrdering {
24252425
ordering as i32
24262426
}
24272427
}
2428+
2429+
// Needed because gcc 12 `get_size()` doesn't work on pointers.
2430+
#[cfg(feature = "master")]
2431+
fn get_maybe_pointer_size(value: RValue<'_>) -> u32 {
2432+
value.get_type().get_size()
2433+
}
2434+
2435+
#[cfg(not(feature = "master"))]
2436+
fn get_maybe_pointer_size(value: RValue<'_>) -> u32 {
2437+
let type_ = value.get_type();
2438+
if type_.get_pointee().is_some() {
2439+
std::mem::size_of::<*const ()>() as _
2440+
} else {
2441+
type_.get_size()
2442+
}
2443+
}

0 commit comments

Comments
 (0)