Auto merge of #66645 - RalfJung:dereferenceable, r=pnkfelix
remove the 'dereferenceable' attribute from Box Fixes https://github.com/rust-lang/rust/issues/66600 r? @eddyb @rkruppe
This commit is contained in:
commit
c4375c9dfd
3 changed files with 13 additions and 2 deletions
|
@ -2526,9 +2526,16 @@ where
|
|||
|
||||
if let Some(pointee) = layout.pointee_info_at(cx, offset) {
|
||||
if let Some(kind) = pointee.safe {
|
||||
attrs.pointee_size = pointee.size;
|
||||
attrs.pointee_align = Some(pointee.align);
|
||||
|
||||
// `Box` (`UniqueBorrowed`) are not necessarily dereferencable
|
||||
// for the entire duration of the function as they can be deallocated
|
||||
// any time. Set their valid size to 0.
|
||||
attrs.pointee_size = match kind {
|
||||
PointerKind::UniqueOwned => Size::ZERO,
|
||||
_ => pointee.size
|
||||
};
|
||||
|
||||
// `Box` pointer parameters never alias because ownership is transferred
|
||||
// `&mut` pointer parameters never alias other parameters,
|
||||
// or mutable global data
|
||||
|
|
|
@ -69,6 +69,8 @@ mod attr_impl {
|
|||
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
|
||||
pub struct ArgAttributes {
|
||||
pub regular: ArgAttribute,
|
||||
/// The minimum size of the pointee, guaranteed to be valid for the duration of the whole call
|
||||
/// (corresponding to LLVM's dereferenceable and dereferenceable_or_null attributes).
|
||||
pub pointee_size: Size,
|
||||
pub pointee_align: Option<Align>
|
||||
}
|
||||
|
|
|
@ -65,7 +65,9 @@ pub fn indirect_struct(_: S) {
|
|||
pub fn borrowed_struct(_: &S) {
|
||||
}
|
||||
|
||||
// CHECK: noalias align 4 dereferenceable(4) i32* @_box(i32* noalias align 4 dereferenceable(4) %x)
|
||||
// `Box` can get deallocated during execution of the function, so it should
|
||||
// not get `dereferenceable`.
|
||||
// CHECK: noalias nonnull align 4 i32* @_box(i32* noalias nonnull align 4 %x)
|
||||
#[no_mangle]
|
||||
pub fn _box(x: Box<i32>) -> Box<i32> {
|
||||
x
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue