Skip to content

Commit 330e196

Browse files
authored
Rollup merge of rust-lang#80796 - cuviper:llvm-11.0.1, r=nikic
Update to LLVM 11.0.1 This updates to a new LLVM branch, rebased on the upstream `llvmorg-11.0.1`. All our patches applied cleanly except the fortanix unwind changes, which just needed a small adjustment in cmake files. r? `@nikic` Fixes rust-lang#73722
2 parents e73ee1d + 9756838 commit 330e196

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
[submodule "src/llvm-project"]
3838
path = src/llvm-project
3939
url = https://github.com/rust-lang/llvm-project.git
40-
branch = rustc/11.0-2020-10-12
40+
branch = rustc/11.0-2021-01-05
4141
[submodule "src/doc/embedded-book"]
4242
path = src/doc/embedded-book
4343
url = https://github.com/rust-embedded/book.git

src/llvm-project

Submodule llvm-project updated 186 files

src/test/ui/extern/extern-compare-with-return-type.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
// Tests that we can compare various kinds of extern fn signatures.
33
#![allow(non_camel_case_types)]
44

5-
extern fn voidret1() {}
6-
extern fn voidret2() {}
5+
// `dbg!()` differentiates these functions to ensure they won't be merged.
6+
extern fn voidret1() { dbg!() }
7+
extern fn voidret2() { dbg!() }
78

89
extern fn uintret() -> usize { 22 }
910

0 commit comments

Comments
 (0)