Only allow using the atomic intrinsics on integer types
This commit is contained in:
parent
30a3849f22
commit
78eae9bf23
|
@ -752,33 +752,47 @@ pub fn trans_intrinsic_call<'a, 'blk, 'tcx>(mut bcx: Block<'blk, 'tcx>,
|
||||||
|
|
||||||
match split[1] {
|
match split[1] {
|
||||||
"cxchg" | "cxchgweak" => {
|
"cxchg" | "cxchgweak" => {
|
||||||
let cmp = from_immediate(bcx, llargs[1]);
|
let sty = &substs.types.get(FnSpace, 0).sty;
|
||||||
let src = from_immediate(bcx, llargs[2]);
|
if int_type_width_signed(sty, ccx).is_some() {
|
||||||
let ptr = PointerCast(bcx, llargs[0], val_ty(src).ptr_to());
|
|
||||||
let weak = if split[1] == "cxchgweak" { llvm::True } else { llvm::False };
|
let weak = if split[1] == "cxchgweak" { llvm::True } else { llvm::False };
|
||||||
let val = AtomicCmpXchg(bcx, ptr, cmp, src, order, failorder, weak);
|
let val = AtomicCmpXchg(bcx, llargs[0], llargs[1], llargs[2],
|
||||||
|
order, failorder, weak);
|
||||||
let result = ExtractValue(bcx, val, 0);
|
let result = ExtractValue(bcx, val, 0);
|
||||||
let success = ZExt(bcx, ExtractValue(bcx, val, 1), Type::bool(bcx.ccx()));
|
let success = ZExt(bcx, ExtractValue(bcx, val, 1), Type::bool(bcx.ccx()));
|
||||||
Store(bcx,
|
Store(bcx, result, StructGEP(bcx, llresult, 0));
|
||||||
result,
|
|
||||||
PointerCast(bcx, StructGEP(bcx, llresult, 0), val_ty(src).ptr_to()));
|
|
||||||
Store(bcx, success, StructGEP(bcx, llresult, 1));
|
Store(bcx, success, StructGEP(bcx, llresult, 1));
|
||||||
|
} else {
|
||||||
|
span_invalid_monomorphization_error(
|
||||||
|
tcx.sess, span,
|
||||||
|
&format!("invalid monomorphization of `{}` intrinsic: \
|
||||||
|
expected basic integer type, found `{}`", name, sty));
|
||||||
|
}
|
||||||
C_nil(ccx)
|
C_nil(ccx)
|
||||||
}
|
}
|
||||||
|
|
||||||
"load" => {
|
"load" => {
|
||||||
let tp_ty = *substs.types.get(FnSpace, 0);
|
let sty = &substs.types.get(FnSpace, 0).sty;
|
||||||
let mut ptr = llargs[0];
|
if int_type_width_signed(sty, ccx).is_some() {
|
||||||
if let Some(ty) = fn_ty.ret.cast {
|
AtomicLoad(bcx, llargs[0], order)
|
||||||
ptr = PointerCast(bcx, ptr, ty.ptr_to());
|
} else {
|
||||||
|
span_invalid_monomorphization_error(
|
||||||
|
tcx.sess, span,
|
||||||
|
&format!("invalid monomorphization of `{}` intrinsic: \
|
||||||
|
expected basic integer type, found `{}`", name, sty));
|
||||||
|
C_nil(ccx)
|
||||||
}
|
}
|
||||||
to_immediate(bcx, AtomicLoad(bcx, ptr, order), tp_ty)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
"store" => {
|
"store" => {
|
||||||
let val = from_immediate(bcx, llargs[1]);
|
let sty = &substs.types.get(FnSpace, 0).sty;
|
||||||
let ptr = PointerCast(bcx, llargs[0], val_ty(val).ptr_to());
|
if int_type_width_signed(sty, ccx).is_some() {
|
||||||
AtomicStore(bcx, val, ptr, order);
|
AtomicStore(bcx, llargs[1], llargs[0], order);
|
||||||
|
} else {
|
||||||
|
span_invalid_monomorphization_error(
|
||||||
|
tcx.sess, span,
|
||||||
|
&format!("invalid monomorphization of `{}` intrinsic: \
|
||||||
|
expected basic integer type, found `{}`", name, sty));
|
||||||
|
}
|
||||||
C_nil(ccx)
|
C_nil(ccx)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -809,9 +823,16 @@ pub fn trans_intrinsic_call<'a, 'blk, 'tcx>(mut bcx: Block<'blk, 'tcx>,
|
||||||
_ => ccx.sess().fatal("unknown atomic operation")
|
_ => ccx.sess().fatal("unknown atomic operation")
|
||||||
};
|
};
|
||||||
|
|
||||||
let val = from_immediate(bcx, llargs[1]);
|
let sty = &substs.types.get(FnSpace, 0).sty;
|
||||||
let ptr = PointerCast(bcx, llargs[0], val_ty(val).ptr_to());
|
if int_type_width_signed(sty, ccx).is_some() {
|
||||||
AtomicRMW(bcx, atom_op, ptr, val, order)
|
AtomicRMW(bcx, atom_op, llargs[0], llargs[1], order)
|
||||||
|
} else {
|
||||||
|
span_invalid_monomorphization_error(
|
||||||
|
tcx.sess, span,
|
||||||
|
&format!("invalid monomorphization of `{}` intrinsic: \
|
||||||
|
expected basic integer type, found `{}`", name, sty));
|
||||||
|
C_nil(ccx)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,24 +16,16 @@ use std::intrinsics;
|
||||||
#[derive(Copy, Clone)]
|
#[derive(Copy, Clone)]
|
||||||
struct Wrap(i64);
|
struct Wrap(i64);
|
||||||
|
|
||||||
// These volatile and atomic intrinsics used to cause an ICE
|
// These volatile intrinsics used to cause an ICE
|
||||||
|
|
||||||
unsafe fn test_bool(p: &mut bool, v: bool) {
|
unsafe fn test_bool(p: &mut bool, v: bool) {
|
||||||
intrinsics::volatile_load(p);
|
intrinsics::volatile_load(p);
|
||||||
intrinsics::volatile_store(p, v);
|
intrinsics::volatile_store(p, v);
|
||||||
intrinsics::atomic_load(p);
|
|
||||||
intrinsics::atomic_cxchg(p, v, v);
|
|
||||||
intrinsics::atomic_store(p, v);
|
|
||||||
intrinsics::atomic_xchg(p, v);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
unsafe fn test_immediate_fca(p: &mut Wrap, v: Wrap) {
|
unsafe fn test_immediate_fca(p: &mut Wrap, v: Wrap) {
|
||||||
intrinsics::volatile_load(p);
|
intrinsics::volatile_load(p);
|
||||||
intrinsics::volatile_store(p, v);
|
intrinsics::volatile_store(p, v);
|
||||||
intrinsics::atomic_load(p);
|
|
||||||
intrinsics::atomic_cxchg(p, v, v);
|
|
||||||
intrinsics::atomic_store(p, v);
|
|
||||||
intrinsics::atomic_xchg(p, v);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn main() {}
|
fn main() {}
|
||||||
|
|
Loading…
Reference in New Issue