about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-07-31 17:09:02 +0000
committerbors <bors@rust-lang.org>2021-07-31 17:09:02 +0000
commit29f8de06d18cf197fbd229accdce82da62ba22e9 (patch)
treef19f787ce538eec3756b6427ee965ff64fec4a96 /src/test
parent337181e07d3cd33c0aec2f17c12279bc9afca88f (diff)
parent4677efd01a55ef769933a5dcfdeb394d27d24be2 (diff)
downloadrust-29f8de06d18cf197fbd229accdce82da62ba22e9.tar.gz
rust-29f8de06d18cf197fbd229accdce82da62ba22e9.zip
Auto merge of #87610 - Aaron1011:bump-llvm-bugfix, r=cuviper
Bump LLVM for RegAllocFast bugfix

Fixes #83854

cc `@cuviper`
Diffstat (limited to 'src/test')
-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
2 files changed, 2 insertions, 6 deletions
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