diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2021-01-13 03:20:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-13 03:20:19 +0100 |
| commit | 330e196c492ec22f50786bf75676dd837d61b967 (patch) | |
| tree | c09d1781349781c357ecc798e25a4920b7b044df | |
| parent | e73ee1dde270cf1f7dc0e3f3eb3366c6fdc391c6 (diff) | |
| parent | 9756838f612da2ef6c359aaea8bf0a69ad76716a (diff) | |
| download | rust-330e196c492ec22f50786bf75676dd837d61b967.tar.gz rust-330e196c492ec22f50786bf75676dd837d61b967.zip | |
Rollup merge of #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 https://github.com/rust-lang/rust/issues/73722
| -rw-r--r-- | .gitmodules | 2 | ||||
| m--------- | src/llvm-project | 0 | ||||
| -rw-r--r-- | src/test/ui/extern/extern-compare-with-return-type.rs | 5 |
3 files changed, 4 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 984113151de..40e6fc2c19d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,7 +37,7 @@ [submodule "src/llvm-project"] path = src/llvm-project url = https://github.com/rust-lang/llvm-project.git - branch = rustc/11.0-2020-10-12 + branch = rustc/11.0-2021-01-05 [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 fb115ee43b77601b237717c21ab0a8f5b5b9d50 +Subproject f9a8d70b6e0365ac2172ca6b7f1de0341297458 diff --git a/src/test/ui/extern/extern-compare-with-return-type.rs b/src/test/ui/extern/extern-compare-with-return-type.rs index 6c9ed3760f6..52b51bb943a 100644 --- a/src/test/ui/extern/extern-compare-with-return-type.rs +++ b/src/test/ui/extern/extern-compare-with-return-type.rs @@ -2,8 +2,9 @@ // Tests that we can compare various kinds of extern fn signatures. #![allow(non_camel_case_types)] -extern fn voidret1() {} -extern fn voidret2() {} +// `dbg!()` differentiates these functions to ensure they won't be merged. +extern fn voidret1() { dbg!() } +extern fn voidret2() { dbg!() } extern fn uintret() -> usize { 22 } |