about summary refs log tree commit diff
diff options
context:
space:
mode:
m---------src/llvm-project0
-rw-r--r--src/test/ui/extern/issue-64655-allow-unwind-when-calling-panic-directly.rs4
-rw-r--r--src/test/ui/extern/issue-64655-extern-rust-must-allow-unwind.rs4
3 files changed, 2 insertions, 6 deletions
diff --git a/src/llvm-project b/src/llvm-project
-Subproject bdb386270f55cb8e95793daa296f27a95a6d483
+Subproject 260e0f8682098faab68af9c608534756ad37836
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