summary refs log tree commit diff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2023-03-18 23:12:09 +0100
committerNikita Popov <nikita.ppv@gmail.com>2023-03-18 23:49:24 +0100
commit4192743ab7bb5339c911a541f3aad5d3ec79c43b (patch)
tree7142638fed89ad44da757135f7af32d6797788d8
parent4a04d086cac54a41517d5657b59d5fe2caca2d71 (diff)
downloadrust-4192743ab7bb5339c911a541f3aad5d3ec79c43b.tar.gz
rust-4192743ab7bb5339c911a541f3aad5d3ec79c43b.zip
Revert "Auto merge of #107224 - nikic:llvm-16, r=cuviper"
This reverts commit 4a04d086cac54a41517d5657b59d5fe2caca2d71, reversing
changes made to 2d0a7def330ed90f416a3429dbb44c5ee2a914e5.
-rw-r--r--.gitmodules2
m---------src/llvm-project0
-rw-r--r--tests/codegen/array-map.rs6
3 files changed, 4 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules
index 0bbccb57130..e79f2f089c1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,7 +25,7 @@
 [submodule "src/llvm-project"]
 	path = src/llvm-project
 	url = https://github.com/rust-lang/llvm-project.git
-	branch = rustc/16.0-2023-03-06
+	branch = rustc/15.0-2022-12-07
 [submodule "src/doc/embedded-book"]
 	path = src/doc/embedded-book
 	url = https://github.com/rust-embedded/book.git
diff --git a/src/llvm-project b/src/llvm-project
-Subproject 4bb5eab6ac3faea4ab4e53c432a1643c3acec87
+Subproject fd949f3034f8a422ecfffa889c2823485dde4bd
diff --git a/tests/codegen/array-map.rs b/tests/codegen/array-map.rs
index 7b8ab2c79a7..9298e89e397 100644
--- a/tests/codegen/array-map.rs
+++ b/tests/codegen/array-map.rs
@@ -38,10 +38,10 @@ pub fn short_integer_zip_map(x: [u32; 8], y: [u32; 8]) -> [u32; 8] {
 //
 // CHECK-LABEL: @long_integer_map
 #[no_mangle]
-pub fn long_integer_map(x: [u32; 512]) -> [u32; 512] {
+pub fn long_integer_map(x: [u32; 64]) -> [u32; 64] {
     // CHECK: start:
-    // CHECK-NEXT: alloca [512 x i32]
-    // CHECK-NEXT: alloca %"core::mem::manually_drop::ManuallyDrop<[u32; 512]>"
+    // CHECK-NEXT: alloca [64 x i32]
+    // CHECK-NEXT: alloca %"core::mem::manually_drop::ManuallyDrop<[u32; 64]>"
     // CHECK-NOT: alloca
     // CHECK: mul <{{[0-9]+}} x i32>
     // CHECK: add <{{[0-9]+}} x i32>