Skip to content

Commit 38bb530

Browse files
committed
Re-enable parallel frontend tests for post-monomorphization errors
These were marked ignore-parallel-frontend because the spurious instantiation note made their output nondeterministic under -Zthreads. With that fixed they pass reliably, so remove the directive and bless the line numbers that shift from removing it.
1 parent 9448c2d commit 38bb530

75 files changed

Lines changed: 140 additions & 169 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

tests/ui/abi/simd-abi-checks-avx.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
//@ only-x86_64
22
//@ build-fail
33
//@ compile-flags: -C target-feature=-avx
4-
//@ ignore-parallel-frontend post-monomorphization errors
54
#![feature(portable_simd)]
65
#![feature(simd_ffi)]
76
#![allow(improper_ctypes_definitions)]

tests/ui/abi/simd-abi-checks-avx.stderr

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,93 @@
11
error: this function call uses SIMD vector type `std::arch::x86_64::__m256` which (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
2-
--> $DIR/simd-abi-checks-avx.rs:59:11
2+
--> $DIR/simd-abi-checks-avx.rs:58:11
33
|
44
LL | f(g());
55
| ^^^ function called here
66
|
77
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
88

99
error: this function call uses SIMD vector type `std::arch::x86_64::__m256` which (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
10-
--> $DIR/simd-abi-checks-avx.rs:59:9
10+
--> $DIR/simd-abi-checks-avx.rs:58:9
1111
|
1212
LL | f(g());
1313
| ^^^^^^ function called here
1414
|
1515
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
1616

1717
error: this function call uses SIMD vector type `std::arch::x86_64::__m256` which (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
18-
--> $DIR/simd-abi-checks-avx.rs:65:14
18+
--> $DIR/simd-abi-checks-avx.rs:64:14
1919
|
2020
LL | gavx(favx());
2121
| ^^^^^^ function called here
2222
|
2323
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
2424

2525
error: this function call uses SIMD vector type `std::arch::x86_64::__m256` which (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
26-
--> $DIR/simd-abi-checks-avx.rs:65:9
26+
--> $DIR/simd-abi-checks-avx.rs:64:9
2727
|
2828
LL | gavx(favx());
2929
| ^^^^^^^^^^^^ function called here
3030
|
3131
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
3232

3333
error: this function call uses SIMD vector type `std::arch::x86_64::__m256` which (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
34-
--> $DIR/simd-abi-checks-avx.rs:75:19
34+
--> $DIR/simd-abi-checks-avx.rs:74:19
3535
|
3636
LL | w(Wrapper(g()));
3737
| ^^^ function called here
3838
|
3939
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
4040

4141
error: this function call uses SIMD vector type `Wrapper` which (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
42-
--> $DIR/simd-abi-checks-avx.rs:75:9
42+
--> $DIR/simd-abi-checks-avx.rs:74:9
4343
|
4444
LL | w(Wrapper(g()));
4545
| ^^^^^^^^^^^^^^^ function called here
4646
|
4747
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
4848

4949
error: this function call uses SIMD vector type `std::arch::x86_64::__m256` which (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
50-
--> $DIR/simd-abi-checks-avx.rs:89:9
50+
--> $DIR/simd-abi-checks-avx.rs:88:9
5151
|
5252
LL | some_extern();
5353
| ^^^^^^^^^^^^^ function called here
5454
|
5555
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
5656

5757
error: this function definition uses SIMD vector type `std::arch::x86_64::__m256` which (with the chosen ABI) requires the `avx` target feature, which is not enabled
58-
--> $DIR/simd-abi-checks-avx.rs:24:1
58+
--> $DIR/simd-abi-checks-avx.rs:23:1
5959
|
6060
LL | unsafe extern "C" fn g() -> __m256 {
6161
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ function defined here
6262
|
6363
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
6464

6565
error: this function definition uses SIMD vector type `std::arch::x86_64::__m256` which (with the chosen ABI) requires the `avx` target feature, which is not enabled
66-
--> $DIR/simd-abi-checks-avx.rs:19:1
66+
--> $DIR/simd-abi-checks-avx.rs:18:1
6767
|
6868
LL | unsafe extern "C" fn f(_: __m256) {
6969
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ function defined here
7070
|
7171
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
7272

7373
error: this function definition uses SIMD vector type `Wrapper` which (with the chosen ABI) requires the `avx` target feature, which is not enabled
74-
--> $DIR/simd-abi-checks-avx.rs:14:1
74+
--> $DIR/simd-abi-checks-avx.rs:13:1
7575
|
7676
LL | unsafe extern "C" fn w(_: Wrapper) {
7777
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ function defined here
7878
|
7979
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
8080

8181
error: this function call uses SIMD vector type `std::arch::x86_64::__m256` which (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
82-
--> $DIR/simd-abi-checks-avx.rs:53:8
82+
--> $DIR/simd-abi-checks-avx.rs:52:8
8383
|
8484
LL | || g()
8585
| ^^^ function called here
8686
|
8787
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
8888

8989
note: the above error was encountered while instantiating `fn in_closure::{closure#0}`
90-
--> $DIR/simd-abi-checks-avx.rs:81:9
90+
--> $DIR/simd-abi-checks-avx.rs:80:9
9191
|
9292
LL | in_closure()();
9393
| ^^^^^^^^^^^^^^

tests/ui/consts/const-eval/index-out-of-bounds-never-type.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//@ build-fail
2-
//@ ignore-parallel-frontend post-monomorphization errors
32
// Regression test for #66975
43
#![warn(unconditional_panic)]
54
#![feature(never_type)]

tests/ui/consts/const-eval/index-out-of-bounds-never-type.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
error[E0080]: index out of bounds: the length is 0 but the index is 0
2-
--> $DIR/index-out-of-bounds-never-type.rs:10:61
2+
--> $DIR/index-out-of-bounds-never-type.rs:9:61
33
|
44
LL | const VOID: ! = { let x = 0 * std::mem::size_of::<T>(); [][x] };
55
| ^^^^^ evaluation of `PrintName::<()>::VOID` failed here
66

77
note: erroneous constant encountered
8-
--> $DIR/index-out-of-bounds-never-type.rs:16:13
8+
--> $DIR/index-out-of-bounds-never-type.rs:15:13
99
|
1010
LL | let _ = PrintName::<T>::VOID;
1111
| ^^^^^^^^^^^^^^^^^^^^
1212

1313
note: the above error was encountered while instantiating `fn f::<()>`
14-
--> $DIR/index-out-of-bounds-never-type.rs:20:5
14+
--> $DIR/index-out-of-bounds-never-type.rs:19:5
1515
|
1616
LL | f::<()>();
1717
| ^^^^^^^^^

tests/ui/consts/const-eval/issue-50814-2.mir-opt.stderr

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
error[E0080]: index out of bounds: the length is 3 but the index is 42
2-
--> $DIR/issue-50814-2.rs:17:24
2+
--> $DIR/issue-50814-2.rs:16:24
33
|
44
LL | const BAR: usize = [5, 6, 7][T::BOO];
55
| ^^^^^^^^^^^^^^^^^ evaluation of `<A<()> as Foo<()>>::BAR` failed here
66

77
note: erroneous constant encountered
8-
--> $DIR/issue-50814-2.rs:21:6
8+
--> $DIR/issue-50814-2.rs:20:6
99
|
1010
LL | &<A<T> as Foo<T>>::BAR
1111
| ^^^^^^^^^^^^^^^^^^^^^
1212

1313
note: erroneous constant encountered
14-
--> $DIR/issue-50814-2.rs:21:5
14+
--> $DIR/issue-50814-2.rs:20:5
1515
|
1616
LL | &<A<T> as Foo<T>>::BAR
1717
| ^^^^^^^^^^^^^^^^^^^^^^
1818

1919
note: erroneous constant encountered
20-
--> $DIR/issue-50814-2.rs:21:5
20+
--> $DIR/issue-50814-2.rs:20:5
2121
|
2222
LL | &<A<T> as Foo<T>>::BAR
2323
| ^^^^^^^^^^^^^^^^^^^^^^
2424
|
2525
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
2626

2727
note: erroneous constant encountered
28-
--> $DIR/issue-50814-2.rs:21:5
28+
--> $DIR/issue-50814-2.rs:20:5
2929
|
3030
LL | &<A<T> as Foo<T>>::BAR
3131
| ^^^^^^^^^^^^^^^^^^^^^^
3232
|
3333
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
3434

3535
note: erroneous constant encountered
36-
--> $DIR/issue-50814-2.rs:21:5
36+
--> $DIR/issue-50814-2.rs:20:5
3737
|
3838
LL | &<A<T> as Foo<T>>::BAR
3939
| ^^^^^^^^^^^^^^^^^^^^^^
4040
|
4141
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
4242

4343
note: erroneous constant encountered
44-
--> $DIR/issue-50814-2.rs:21:6
44+
--> $DIR/issue-50814-2.rs:20:6
4545
|
4646
LL | &<A<T> as Foo<T>>::BAR
4747
| ^^^^^^^^^^^^^^^^^^^^^
4848
|
4949
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
5050

5151
note: erroneous constant encountered
52-
--> $DIR/issue-50814-2.rs:21:6
52+
--> $DIR/issue-50814-2.rs:20:6
5353
|
5454
LL | &<A<T> as Foo<T>>::BAR
5555
| ^^^^^^^^^^^^^^^^^^^^^

tests/ui/consts/const-eval/issue-50814-2.normal.stderr

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
error[E0080]: index out of bounds: the length is 3 but the index is 42
2-
--> $DIR/issue-50814-2.rs:17:24
2+
--> $DIR/issue-50814-2.rs:16:24
33
|
44
LL | const BAR: usize = [5, 6, 7][T::BOO];
55
| ^^^^^^^^^^^^^^^^^ evaluation of `<A<()> as Foo<()>>::BAR` failed here
66

77
note: erroneous constant encountered
8-
--> $DIR/issue-50814-2.rs:21:6
8+
--> $DIR/issue-50814-2.rs:20:6
99
|
1010
LL | &<A<T> as Foo<T>>::BAR
1111
| ^^^^^^^^^^^^^^^^^^^^^
1212

1313
note: erroneous constant encountered
14-
--> $DIR/issue-50814-2.rs:21:5
14+
--> $DIR/issue-50814-2.rs:20:5
1515
|
1616
LL | &<A<T> as Foo<T>>::BAR
1717
| ^^^^^^^^^^^^^^^^^^^^^^
1818

1919
note: erroneous constant encountered
20-
--> $DIR/issue-50814-2.rs:21:6
20+
--> $DIR/issue-50814-2.rs:20:6
2121
|
2222
LL | &<A<T> as Foo<T>>::BAR
2323
| ^^^^^^^^^^^^^^^^^^^^^
2424
|
2525
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
2626

2727
note: the above error was encountered while instantiating `fn foo::<()>`
28-
--> $DIR/issue-50814-2.rs:33:22
28+
--> $DIR/issue-50814-2.rs:32:22
2929
|
3030
LL | println!("{:x}", foo::<()>() as *const usize as usize);
3131
| ^^^^^^^^^^^

tests/ui/consts/const-eval/issue-50814-2.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
//@ revisions: normal mir-opt
33
//@ [mir-opt]compile-flags: -Zmir-opt-level=4
44
//@ dont-require-annotations: NOTE
5-
//@ ignore-parallel-frontend post-monomorphization errors
65
trait C {
76
const BOO: usize;
87
}

tests/ui/consts/const-eval/issue-50814.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//@ build-fail
22
//@ dont-require-annotations: NOTE
3-
//@ ignore-parallel-frontend post-monomorphization errors
43
trait Unsigned {
54
const MAX: u8;
65
}

tests/ui/consts/const-eval/issue-50814.stderr

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11
error[E0080]: attempt to compute `u8::MAX + u8::MAX`, which would overflow
2-
--> $DIR/issue-50814.rs:16:21
2+
--> $DIR/issue-50814.rs:15:21
33
|
44
LL | const MAX: u8 = A::MAX + B::MAX;
55
| ^^^^^^^^^^^^^^^ evaluation of `<Sum<U8, U8> as Unsigned>::MAX` failed here
66

77
note: erroneous constant encountered
8-
--> $DIR/issue-50814.rs:22:6
8+
--> $DIR/issue-50814.rs:21:6
99
|
1010
LL | &Sum::<U8, U8>::MAX
1111
| ^^^^^^^^^^^^^^^^^^
1212

1313
error[E0080]: attempt to compute `u8::MAX + u8::MAX`, which would overflow
14-
--> $DIR/issue-50814.rs:16:21
14+
--> $DIR/issue-50814.rs:15:21
1515
|
1616
LL | const MAX: u8 = A::MAX + B::MAX;
1717
| ^^^^^^^^^^^^^^^ evaluation of `<Sum<U8, U8> as Unsigned>::MAX` failed here
1818
|
1919
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
2020

2121
note: erroneous constant encountered
22-
--> $DIR/issue-50814.rs:22:6
22+
--> $DIR/issue-50814.rs:21:6
2323
|
2424
LL | &Sum::<U8, U8>::MAX
2525
| ^^^^^^^^^^^^^^^^^^
2626
|
2727
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
2828

2929
note: erroneous constant encountered
30-
--> $DIR/issue-50814.rs:22:5
30+
--> $DIR/issue-50814.rs:21:5
3131
|
3232
LL | &Sum::<U8, U8>::MAX
3333
| ^^^^^^^^^^^^^^^^^^^
3434

3535
note: erroneous constant encountered
36-
--> $DIR/issue-50814.rs:22:6
36+
--> $DIR/issue-50814.rs:21:6
3737
|
3838
LL | &Sum::<U8, U8>::MAX
3939
| ^^^^^^^^^^^^^^^^^^
4040
|
4141
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
4242

4343
note: the above error was encountered while instantiating `fn foo::<i32>`
44-
--> $DIR/issue-50814.rs:27:5
44+
--> $DIR/issue-50814.rs:26:5
4545
|
4646
LL | foo(0);
4747
| ^^^^^^

tests/ui/consts/mono-reachable-invalid-const.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//@ build-fail
2-
//@ ignore-parallel-frontend post-monomorphization errors
32
struct Bar<const BITS: usize>;
43

54
impl<const BITS: usize> Bar<BITS> {

0 commit comments

Comments
 (0)