about summary refs log tree commit diff
path: root/tests/codegen-llvm
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2025-09-27 12:39:02 +0000
committerbors <bors@rust-lang.org>2025-09-27 12:39:02 +0000
commitaa7859c0dec2de6c9cab34b03028bcef7b1fc25d (patch)
tree50431061df23ecbcd1b621b7f709f8fdd19a44a7 /tests/codegen-llvm
parentbb624dcb4c8ab987e10c0808d92d76f3b84dd117 (diff)
parent186d91daf73188357d569b41906aa5f44a55dfba (diff)
downloadrust-aa7859c0dec2de6c9cab34b03028bcef7b1fc25d.tar.gz
rust-aa7859c0dec2de6c9cab34b03028bcef7b1fc25d.zip
Auto merge of #147030 - nikic:revert-alloc-zeroed, r=wesleywiser beta
Revert "Auto merge of #144086 - clubby789:alloc-zeroed, r=nikic"

This reverts commit 040a98af70f0a7da03f3d5356531b28a2a7a77e4, reversing changes made to e8a792daf500b5ff8097896ddb6cc037abe92487.

This reverts https://github.com/rust-lang/rust/pull/144086 on beta due to https://github.com/rust-lang/rust/issues/145995. On master the issue will be fixed by https://github.com/rust-lang/rust/pull/146766.
Diffstat (limited to 'tests/codegen-llvm')
-rw-r--r--tests/codegen-llvm/vec-calloc.rs20
1 files changed, 0 insertions, 20 deletions
diff --git a/tests/codegen-llvm/vec-calloc.rs b/tests/codegen-llvm/vec-calloc.rs
index 15971bbfa00..d1c320ead01 100644
--- a/tests/codegen-llvm/vec-calloc.rs
+++ b/tests/codegen-llvm/vec-calloc.rs
@@ -1,6 +1,4 @@
-//@ revisions: normal llvm21
 //@ compile-flags: -Copt-level=3 -Z merge-functions=disabled
-//@ [llvm21] min-llvm-version: 21
 //@ only-x86_64
 
 #![crate_type = "lib"]
@@ -178,24 +176,6 @@ pub fn vec_option_i32(n: usize) -> Vec<Option<i32>> {
     vec![None; n]
 }
 
-// LLVM21-LABEL: @vec_array
-#[cfg(llvm21)]
-#[no_mangle]
-pub fn vec_array(n: usize) -> Vec<[u32; 1_000_000]> {
-    // LLVM21-NOT: call {{.*}}alloc::vec::from_elem
-    // LLVM21-NOT: call {{.*}}reserve
-    // LLVM21-NOT: call {{.*}}__rust_alloc(
-
-    // LLVM21: call {{.*}}__rust_alloc_zeroed(
-
-    // LLVM21-NOT: call {{.*}}alloc::vec::from_elem
-    // LLVM21-NOT: call {{.*}}reserve
-    // LLVM21-NOT: call {{.*}}__rust_alloc(
-
-    // LLVM21: ret void
-    vec![[0; 1_000_000]; 3]
-}
-
 // Ensure that __rust_alloc_zeroed gets the right attributes for LLVM to optimize it away.
 // CHECK: declare noalias noundef ptr @{{.*}}__rust_alloc_zeroed(i64 noundef, i64 allocalign noundef) unnamed_addr [[RUST_ALLOC_ZEROED_ATTRS:#[0-9]+]]