diff options
| author | bors <bors@rust-lang.org> | 2023-03-25 19:55:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-25 19:55:10 +0000 |
| commit | 0c61c7a978fe9f7b77a1d667c77d2202dadd1c10 (patch) | |
| tree | 7dea040ed128faf54d092df5b3a9a2727a484275 | |
| parent | 2d429f3064cb67710fe64dee293329089871d92b (diff) | |
| parent | 58ac25b453793662f92784dc94143ab19f1fd700 (diff) | |
| download | rust-0c61c7a978fe9f7b77a1d667c77d2202dadd1c10.tar.gz rust-0c61c7a978fe9f7b77a1d667c77d2202dadd1c10.zip | |
Auto merge of #109474 - nikic:llvm-16-again, r=cuviper
Upgrade to LLVM 16, again Relative to the previous attempt in https://github.com/rust-lang/rust/pull/107224: * Update to GCC 8.5 on dist-x86_64-linux, to avoid std::optional ABI-incompatibility between libstdc++ 7 and 8. * Cherry-pick https://github.com/llvm/llvm-project/commit/96df79af029b85616ab90e73143e0e8ae89c7b46. * Cherry-pick https://github.com/llvm/llvm-project/commit/6fc670e5e370e90759b5adecd9980b63609dc2f8. r? `@cuviper`
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rwxr-xr-x | src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh | 2 | ||||
| m--------- | src/llvm-project | 0 | ||||
| -rw-r--r-- | tests/codegen/array-map.rs | 6 |
4 files changed, 5 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules index e79f2f089c1..0bbccb57130 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/15.0-2022-12-07 + branch = rustc/16.0-2023-03-06 [submodule "src/doc/embedded-book"] path = src/doc/embedded-book url = https://github.com/rust-embedded/book.git diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh index 9932b250566..41ca1385c75 100755 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh @@ -3,7 +3,7 @@ set -ex source shared.sh -GCC=7.5.0 +GCC=8.5.0 curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC/gcc-$GCC.tar.xz | xzcat | tar xf - cd gcc-$GCC diff --git a/src/llvm-project b/src/llvm-project -Subproject fd949f3034f8a422ecfffa889c2823485dde4bd +Subproject 2b9c52f66815bb8d6ea74a4b26df3410602be9b diff --git a/tests/codegen/array-map.rs b/tests/codegen/array-map.rs index 9298e89e397..7b8ab2c79a7 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; 64]) -> [u32; 64] { +pub fn long_integer_map(x: [u32; 512]) -> [u32; 512] { // CHECK: start: - // CHECK-NEXT: alloca [64 x i32] - // CHECK-NEXT: alloca %"core::mem::manually_drop::ManuallyDrop<[u32; 64]>" + // CHECK-NEXT: alloca [512 x i32] + // CHECK-NEXT: alloca %"core::mem::manually_drop::ManuallyDrop<[u32; 512]>" // CHECK-NOT: alloca // CHECK: mul <{{[0-9]+}} x i32> // CHECK: add <{{[0-9]+}} x i32> |