Skip to content

Commit 0c61c7a

Browse files
committed
Auto merge of rust-lang#109474 - nikic:llvm-16-again, r=cuviper
Upgrade to LLVM 16, again Relative to the previous attempt in rust-lang#107224: * Update to GCC 8.5 on dist-x86_64-linux, to avoid std::optional ABI-incompatibility between libstdc++ 7 and 8. * Cherry-pick llvm/llvm-project@96df79a. * Cherry-pick llvm/llvm-project@6fc670e. r? `@cuviper`
2 parents 2d429f3 + 58ac25b commit 0c61c7a

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
[submodule "src/llvm-project"]
2626
path = src/llvm-project
2727
url = https://github.com/rust-lang/llvm-project.git
28-
branch = rustc/15.0-2022-12-07
28+
branch = rustc/16.0-2023-03-06
2929
[submodule "src/doc/embedded-book"]
3030
path = src/doc/embedded-book
3131
url = https://github.com/rust-embedded/book.git

src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -ex
33

44
source shared.sh
55

6-
GCC=7.5.0
6+
GCC=8.5.0
77

88
curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC/gcc-$GCC.tar.xz | xzcat | tar xf -
99
cd gcc-$GCC

src/llvm-project

tests/codegen/array-map.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ pub fn short_integer_zip_map(x: [u32; 8], y: [u32; 8]) -> [u32; 8] {
3838
//
3939
// CHECK-LABEL: @long_integer_map
4040
#[no_mangle]
41-
pub fn long_integer_map(x: [u32; 64]) -> [u32; 64] {
41+
pub fn long_integer_map(x: [u32; 512]) -> [u32; 512] {
4242
// CHECK: start:
43-
// CHECK-NEXT: alloca [64 x i32]
44-
// CHECK-NEXT: alloca %"core::mem::manually_drop::ManuallyDrop<[u32; 64]>"
43+
// CHECK-NEXT: alloca [512 x i32]
44+
// CHECK-NEXT: alloca %"core::mem::manually_drop::ManuallyDrop<[u32; 512]>"
4545
// CHECK-NOT: alloca
4646
// CHECK: mul <{{[0-9]+}} x i32>
4747
// CHECK: add <{{[0-9]+}} x i32>

0 commit comments

Comments
 (0)