Skip to content

Commit

Permalink
Rollup merge of #106292 - Nilstrieb:box-uninit-test, r=RalfJung
Browse files Browse the repository at this point in the history
Add codegen test for `Box::new(uninit)` of big arrays

Closes #58201

r? `@RalfJung`
  • Loading branch information
matthiaskrgr authored Jan 4, 2023
2 parents fbfaeb6 + 2675848 commit 3361247
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 6 deletions.
14 changes: 11 additions & 3 deletions src/test/codegen/box-maybe-uninit-llvm14.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// Once we're done with llvm 14 and earlier, this test can be deleted.

#![crate_type="lib"]
#![crate_type = "lib"]

use std::mem::MaybeUninit;

Expand All @@ -17,8 +17,16 @@ pub fn box_uninitialized() -> Box<MaybeUninit<usize>> {
Box::new(MaybeUninit::uninit())
}

// FIXME: add a test for a bigger box. Currently broken, see
// https://github.com/rust-lang/rust/issues/58201.
// https://github.com/rust-lang/rust/issues/58201
#[no_mangle]
pub fn box_uninitialized2() -> Box<MaybeUninit<[usize; 1024 * 1024]>> {
// CHECK-LABEL: @box_uninitialized2
// CHECK-NOT: store
// CHECK-NOT: alloca
// CHECK-NOT: memcpy
// CHECK-NOT: memset
Box::new(MaybeUninit::uninit())
}

// Hide the LLVM 15+ `allocalign` attribute in the declaration of __rust_alloc
// from the CHECK-NOT above. We don't check the attributes here because we can't rely
Expand Down
14 changes: 11 additions & 3 deletions src/test/codegen/box-maybe-uninit.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// compile-flags: -O
// min-llvm-version: 15.0
#![crate_type="lib"]
#![crate_type = "lib"]

use std::mem::MaybeUninit;

Expand All @@ -15,8 +15,16 @@ pub fn box_uninitialized() -> Box<MaybeUninit<usize>> {
Box::new(MaybeUninit::uninit())
}

// FIXME: add a test for a bigger box. Currently broken, see
// https://github.com/rust-lang/rust/issues/58201.
// https://github.com/rust-lang/rust/issues/58201
#[no_mangle]
pub fn box_uninitialized2() -> Box<MaybeUninit<[usize; 1024 * 1024]>> {
// CHECK-LABEL: @box_uninitialized2
// CHECK-NOT: store
// CHECK-NOT: alloca
// CHECK-NOT: memcpy
// CHECK-NOT: memset
Box::new(MaybeUninit::uninit())
}

// Hide the `allocalign` attribute in the declaration of __rust_alloc
// from the CHECK-NOT above, and also verify the attributes got set reasonably.
Expand Down

0 comments on commit 3361247

Please sign in to comment.