From 4677efd01a55ef769933a5dcfdeb394d27d24be2 Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Thu, 29 Jul 2021 19:22:59 -0500 Subject: [PATCH] Bump LLVM for RegAllocFast bugfix Fixes #83854 --- src/llvm-project | 2 +- .../issue-64655-allow-unwind-when-calling-panic-directly.rs | 4 +--- .../ui/extern/issue-64655-extern-rust-must-allow-unwind.rs | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/llvm-project b/src/llvm-project index bdb386270f5..260e0f86820 160000 --- a/src/llvm-project +++ b/src/llvm-project @@ -1 +1 @@ -Subproject commit bdb386270f55cb8e95793daa296f27a95a6d4834 +Subproject commit 260e0f8682098faab68af9c608534756ad378365 diff --git a/src/test/ui/extern/issue-64655-allow-unwind-when-calling-panic-directly.rs b/src/test/ui/extern/issue-64655-allow-unwind-when-calling-panic-directly.rs index 7b731a1d71d..74c6e501c91 100644 --- a/src/test/ui/extern/issue-64655-allow-unwind-when-calling-panic-directly.rs +++ b/src/test/ui/extern/issue-64655-allow-unwind-when-calling-panic-directly.rs @@ -19,9 +19,7 @@ // revisions: no thin fat //[no]compile-flags: -C lto=no -// FIXME(#83854) running this revision with 1 CGU triggers llvm assert in register allocator -// when executed in i686-gnu-nopt runner. -//[thin]compile-flags: -C lto=thin -Ccodegen-units=2 +//[thin]compile-flags: -C lto=thin //[fat]compile-flags: -C lto=fat #![feature(core_panic)] diff --git a/src/test/ui/extern/issue-64655-extern-rust-must-allow-unwind.rs b/src/test/ui/extern/issue-64655-extern-rust-must-allow-unwind.rs index 32e6d0c90b2..bc15fcb0e39 100644 --- a/src/test/ui/extern/issue-64655-extern-rust-must-allow-unwind.rs +++ b/src/test/ui/extern/issue-64655-extern-rust-must-allow-unwind.rs @@ -40,9 +40,7 @@ //[no1]compile-flags: -C opt-level=1 -C lto=no //[no2]compile-flags: -C opt-level=2 -C lto=no //[no3]compile-flags: -C opt-level=3 -C lto=no -// FIXME(#83854) running this revision with 1 CGU triggers llvm assert in register allocator -// when executed in dist-i586-gnu-i586-i686-musl runner. -//[thin0]compile-flags: -C opt-level=0 -C lto=thin -Ccodegen-units=2 +//[thin0]compile-flags: -C opt-level=0 -C lto=thin //[thin1]compile-flags: -C opt-level=1 -C lto=thin //[thin2]compile-flags: -C opt-level=2 -C lto=thin //[thin3]compile-flags: -C opt-level=3 -C lto=thin