Skip to content

Commit 7615e04

Browse files
GuillaumeGomezantoyo
authored andcommitted
Fix usage of get_size for gcc 12
1 parent 9b1211d commit 7615e04

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());
@@ -1586,7 +1586,7 @@ impl<'a, 'gcc, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'gcc, 'tcx> {
15861586
src: RValue<'gcc>,
15871587
order: AtomicOrdering,
15881588
) -> RValue<'gcc> {
1589-
let size = src.get_type().get_size();
1589+
let size = get_maybe_pointer_size(src);
15901590
let name = match op {
15911591
AtomicRmwBinOp::AtomicXchg => format!("__atomic_exchange_{}", size),
15921592
AtomicRmwBinOp::AtomicAdd => format!("__atomic_fetch_add_{}", size),
@@ -2419,3 +2419,19 @@ impl ToGccOrdering for AtomicOrdering {
24192419
ordering as i32
24202420
}
24212421
}
2422+
2423+
// Needed because gcc 12 `get_size()` doesn't work on pointers.
2424+
#[cfg(feature = "master")]
2425+
fn get_maybe_pointer_size(value: RValue<'_>) -> u32 {
2426+
value.get_type().get_size()
2427+
}
2428+
2429+
#[cfg(not(feature = "master"))]
2430+
fn get_maybe_pointer_size(value: RValue<'_>) -> u32 {
2431+
let type_ = value.get_type();
2432+
if type_.get_pointee().is_some() {
2433+
std::mem::size_of::<*const ()>() as _
2434+
} else {
2435+
type_.get_size()
2436+
}
2437+
}

0 commit comments

Comments
 (0)