Skip to content

Commit 418a776

Browse files
Rollup merge of rust-lang#40168 - topecongiro:compile-fail-test-abi-ptx, r=petrochenkov
Add compile fail test for abi_ptx Issue rust-lang#39059.
2 parents b1bd60b + 9141b7b commit 418a776

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

src/test/compile-fail/feature-gate-abi.rs

+8
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@
1111
// gate-test-intrinsics
1212
// gate-test-platform_intrinsics
1313
// gate-test-abi_vectorcall
14+
// gate-test-abi_ptx
1415

1516
// Functions
1617
extern "rust-intrinsic" fn f1() {} //~ ERROR intrinsics are subject to change
1718
extern "platform-intrinsic" fn f2() {} //~ ERROR platform intrinsics are experimental
1819
extern "vectorcall" fn f3() {} //~ ERROR vectorcall is experimental and subject to change
1920
extern "rust-call" fn f4() {} //~ ERROR rust-call ABI is subject to change
2021
extern "msp430-interrupt" fn f5() {} //~ ERROR msp430-interrupt ABI is experimental
22+
extern "ptx-kernel" fn f6() {} //~ ERROR PTX ABIs are experimental and subject to change
2123

2224
// Methods in trait definition
2325
trait Tr {
@@ -26,12 +28,14 @@ trait Tr {
2628
extern "vectorcall" fn m3(); //~ ERROR vectorcall is experimental and subject to change
2729
extern "rust-call" fn m4(); //~ ERROR rust-call ABI is subject to change
2830
extern "msp430-interrupt" fn m5(); //~ ERROR msp430-interrupt ABI is experimental
31+
extern "ptx-kernel" fn m6(); //~ ERROR PTX ABIs are experimental and subject to change
2932

3033
extern "rust-intrinsic" fn dm1() {} //~ ERROR intrinsics are subject to change
3134
extern "platform-intrinsic" fn dm2() {} //~ ERROR platform intrinsics are experimental
3235
extern "vectorcall" fn dm3() {} //~ ERROR vectorcall is experimental and subject to change
3336
extern "rust-call" fn dm4() {} //~ ERROR rust-call ABI is subject to change
3437
extern "msp430-interrupt" fn dm5() {} //~ ERROR msp430-interrupt ABI is experimental
38+
extern "ptx-kernel" fn dm6() {} //~ ERROR PTX ABIs are experimental and subject to change
3539
}
3640

3741
struct S;
@@ -43,6 +47,7 @@ impl Tr for S {
4347
extern "vectorcall" fn m3() {} //~ ERROR vectorcall is experimental and subject to change
4448
extern "rust-call" fn m4() {} //~ ERROR rust-call ABI is subject to change
4549
extern "msp430-interrupt" fn m5() {} //~ ERROR msp430-interrupt ABI is experimental
50+
extern "ptx-kernel" fn m6() {} //~ ERROR PTX ABIs are experimental and subject to change
4651
}
4752

4853
// Methods in inherent impl
@@ -52,6 +57,7 @@ impl S {
5257
extern "vectorcall" fn im3() {} //~ ERROR vectorcall is experimental and subject to change
5358
extern "rust-call" fn im4() {} //~ ERROR rust-call ABI is subject to change
5459
extern "msp430-interrupt" fn im5() {} //~ ERROR msp430-interrupt ABI is experimental
60+
extern "ptx-kernel" fn im6() {} //~ ERROR PTX ABIs are experimental and subject to change
5561
}
5662

5763
// Function pointer types
@@ -60,12 +66,14 @@ type A2 = extern "platform-intrinsic" fn(); //~ ERROR platform intrinsics are ex
6066
type A3 = extern "vectorcall" fn(); //~ ERROR vectorcall is experimental and subject to change
6167
type A4 = extern "rust-call" fn(); //~ ERROR rust-call ABI is subject to change
6268
type A5 = extern "msp430-interrupt" fn(); //~ ERROR msp430-interrupt ABI is experimental
69+
type A6 = extern "ptx-kernel" fn (); //~ ERROR PTX ABIs are experimental and subject to change
6370

6471
// Foreign modules
6572
extern "rust-intrinsic" {} //~ ERROR intrinsics are subject to change
6673
extern "platform-intrinsic" {} //~ ERROR platform intrinsics are experimental
6774
extern "vectorcall" {} //~ ERROR vectorcall is experimental and subject to change
6875
extern "rust-call" {} //~ ERROR rust-call ABI is subject to change
6976
extern "msp430-interrupt" {} //~ ERROR msp430-interrupt ABI is experimental
77+
extern "ptx-kernel" {} //~ ERROR PTX ABIs are experimental and subject to change
7078

7179
fn main() {}

src/tools/tidy/src/features.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ pub fn check(path: &Path, bad: &mut bool) {
167167

168168
// FIXME get this whitelist empty.
169169
let whitelist = vec![
170-
"abi_ptx", "simd",
170+
"simd",
171171
"stmt_expr_attributes",
172172
"cfg_target_thread_local", "unwind_attributes",
173173
];

0 commit comments

Comments
 (0)