Skip to content

Commit d7da183

Browse files
borsbors
committed
Auto merge of #128784 - tdittr:check-abi-on-fn-ptr, r=<try>
Check ABI target compatibility for function pointers Related tracking issue: #87678 Compatibility of an ABI for a target was previously only performed on function definitions and `extern` blocks. This PR adds it also to function pointers to be consistent. This might have broken some of the `tests/ui/` depending on the platform, so a try run seems like a good idea. Also this might break existing code, because we now emit extra errors. Does this require a crater run? # Example ```rust // build with: --target=x86_64-unknown-linux-gnu // These raise E0570 extern "thiscall" fn foo() {} extern "thiscall" { fn bar() } // This did not raise any error fn baz(f: extern "thiscall" fn()) { f() } ``` # Places to check in the tests: * [x] Check if we can use another ABI here ``` tests/debuginfo/type-names.rs 20:// gdb-check:type = type_names::GenericStruct<type_names::Struct1, extern "fastcall" fn(isize) -> usize> 375: let generic_struct2: GenericStruct<Struct1, extern "fastcall" fn(isize) -> usize> = ``` try-job: aarch64-gnu try-job: aarch64-apple try-job: x86_64-msvc try-job: x86_64-mingw try-job: i686-msvc try-job: i686-mingw try-job: test-various try-job: armhf-gnu
2 parents d626fbd + b2be5a8 commit d7da183

18 files changed

+773
-84
lines changed

‎compiler/rustc_hir_analysis/src/check/check.rs

-11
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,6 @@ pub fn check_abi(tcx: TyCtxt<'_>, hir_id: hir::HirId, span: Span, abi: Abi) {
5151
});
5252
}
5353
}
54-
55-
// This ABI is only allowed on function pointers
56-
if abi == Abi::CCmseNonSecureCall {
57-
struct_span_code_err!(
58-
tcx.dcx(),
59-
span,
60-
E0781,
61-
"the `\"C-cmse-nonsecure-call\"` ABI is only allowed on function pointers"
62-
)
63-
.emit();
64-
}
6554
}
6655

6756
fn check_struct(tcx: TyCtxt<'_>, def_id: LocalDefId) {

‎compiler/rustc_hir_analysis/src/hir_ty_lowering/cmse.rs

+15-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
use rustc_errors::DiagCtxtHandle;
2-
use rustc_hir as hir;
3-
use rustc_hir::HirId;
1+
use rustc_errors::{struct_span_code_err, DiagCtxtHandle, E0781};
2+
use rustc_hir::{self as hir, HirId};
43
use rustc_middle::ty::layout::LayoutError;
54
use rustc_middle::ty::{self, ParamEnv, TyCtxt};
65
use rustc_span::Span;
@@ -26,7 +25,19 @@ pub fn validate_cmse_abi<'tcx>(
2625
..
2726
}) = hir_node
2827
else {
29-
// might happen when this ABI is used incorrectly. That will be handled elsewhere
28+
let span = match tcx.parent_hir_node(hir_id) {
29+
hir::Node::Item(hir::Item {
30+
kind: hir::ItemKind::ForeignMod { .. }, span, ..
31+
}) => *span,
32+
_ => tcx.hir().span(hir_id),
33+
};
34+
struct_span_code_err!(
35+
tcx.dcx(),
36+
span,
37+
E0781,
38+
"the `\"C-cmse-nonsecure-call\"` ABI is only allowed on function pointers"
39+
)
40+
.emit();
3041
return;
3142
};
3243

‎compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

+6
Original file line numberDiff line numberDiff line change
@@ -2309,6 +2309,12 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
23092309
let fn_ty = tcx.mk_fn_sig(input_tys, output_ty, decl.c_variadic, safety, abi);
23102310
let bare_fn_ty = ty::Binder::bind_with_vars(fn_ty, bound_vars);
23112311

2312+
if let hir::Node::Ty(hir::Ty { kind: hir::TyKind::BareFn(bare_fn_ty), span, .. }) =
2313+
tcx.hir_node(hir_id)
2314+
{
2315+
crate::check::check_abi(tcx, hir_id, *span, bare_fn_ty.abi);
2316+
}
2317+
23122318
// reject function types that violate cmse ABI requirements
23132319
cmse::validate_cmse_abi(self.tcx(), self.dcx(), hir_id, abi, bare_fn_ty);
23142320

‎tests/debuginfo/type-names.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// gdb-check:type = type_names::GenericStruct<type_names::mod1::Struct2, type_names::mod1::mod2::Struct3>
1818

1919
// gdb-command:whatis generic_struct2
20-
// gdb-check:type = type_names::GenericStruct<type_names::Struct1, extern "fastcall" fn(isize) -> usize>
20+
// gdb-check:type = type_names::GenericStruct<type_names::Struct1, extern "system" fn(isize) -> usize>
2121

2222
// gdb-command:whatis mod_struct
2323
// gdb-check:type = type_names::mod1::Struct2
@@ -372,7 +372,7 @@ fn main() {
372372
let simple_struct = Struct1;
373373
let generic_struct1: GenericStruct<mod1::Struct2, mod1::mod2::Struct3> =
374374
GenericStruct(PhantomData);
375-
let generic_struct2: GenericStruct<Struct1, extern "fastcall" fn(isize) -> usize> =
375+
let generic_struct2: GenericStruct<Struct1, extern "system" fn(isize) -> usize> =
376376
GenericStruct(PhantomData);
377377
let mod_struct = mod1::Struct2;
378378

‎tests/ui/abi/unsupported.aarch64.stderr

+112-10
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,157 @@
11
error[E0570]: `"ptx-kernel"` is not a supported ABI for the current target
2-
--> $DIR/unsupported.rs:28:1
2+
--> $DIR/unsupported.rs:34:15
3+
|
4+
LL | fn ptx_ptr(f: extern "ptx-kernel" fn()) {
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^
6+
7+
error[E0570]: `"ptx-kernel"` is not a supported ABI for the current target
8+
--> $DIR/unsupported.rs:38:1
9+
|
10+
LL | extern "ptx-kernel" {}
11+
| ^^^^^^^^^^^^^^^^^^^^^^
12+
13+
error[E0570]: `"aapcs"` is not a supported ABI for the current target
14+
--> $DIR/unsupported.rs:47:17
15+
|
16+
LL | fn aapcs_ptr(f: extern "aapcs" fn()) {
17+
| ^^^^^^^^^^^^^^^^^^^
18+
19+
error[E0570]: `"aapcs"` is not a supported ABI for the current target
20+
--> $DIR/unsupported.rs:55:1
21+
|
22+
LL | extern "aapcs" {}
23+
| ^^^^^^^^^^^^^^^^^
24+
25+
error[E0570]: `"msp430-interrupt"` is not a supported ABI for the current target
26+
--> $DIR/unsupported.rs:64:18
27+
|
28+
LL | fn msp430_ptr(f: extern "msp430-interrupt" fn()) {
29+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
30+
31+
error[E0570]: `"msp430-interrupt"` is not a supported ABI for the current target
32+
--> $DIR/unsupported.rs:68:1
33+
|
34+
LL | extern "msp430-interrupt" {}
35+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
36+
37+
error[E0570]: `"avr-interrupt"` is not a supported ABI for the current target
38+
--> $DIR/unsupported.rs:73:15
39+
|
40+
LL | fn avr_ptr(f: extern "avr-interrupt" fn()) {
41+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
42+
43+
error[E0570]: `"avr-interrupt"` is not a supported ABI for the current target
44+
--> $DIR/unsupported.rs:77:1
45+
|
46+
LL | extern "avr-interrupt" {}
47+
| ^^^^^^^^^^^^^^^^^^^^^^^^^
48+
49+
error[E0570]: `"riscv-interrupt-m"` is not a supported ABI for the current target
50+
--> $DIR/unsupported.rs:85:17
51+
|
52+
LL | fn riscv_ptr(f: extern "riscv-interrupt-m" fn()) {
53+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
54+
55+
error[E0570]: `"riscv-interrupt-m"` is not a supported ABI for the current target
56+
--> $DIR/unsupported.rs:92:1
57+
|
58+
LL | extern "riscv-interrupt-m" {}
59+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
60+
61+
error[E0570]: `"x86-interrupt"` is not a supported ABI for the current target
62+
--> $DIR/unsupported.rs:103:15
63+
|
64+
LL | fn x86_ptr(f: extern "x86-interrupt" fn()) {
65+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
66+
67+
error[E0570]: `"x86-interrupt"` is not a supported ABI for the current target
68+
--> $DIR/unsupported.rs:110:1
69+
|
70+
LL | extern "x86-interrupt" {}
71+
| ^^^^^^^^^^^^^^^^^^^^^^^^^
72+
73+
error[E0570]: `"thiscall"` is not a supported ABI for the current target
74+
--> $DIR/unsupported.rs:122:20
75+
|
76+
LL | fn thiscall_ptr(f: extern "thiscall" fn()) {
77+
| ^^^^^^^^^^^^^^^^^^^^^^
78+
79+
error[E0570]: `"thiscall"` is not a supported ABI for the current target
80+
--> $DIR/unsupported.rs:130:1
81+
|
82+
LL | extern "thiscall" {}
83+
| ^^^^^^^^^^^^^^^^^^^^
84+
85+
warning: use of calling convention not supported on this target
86+
--> $DIR/unsupported.rs:148:19
87+
|
88+
LL | fn stdcall_ptr(f: extern "stdcall" fn()) {
89+
| ^^^^^^^^^^^^^^^^^^^^^
90+
|
91+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
92+
= note: for more information, see issue #87678 <https://github.com/rust-lang/rust/issues/87678>
93+
= note: `#[warn(unsupported_calling_conventions)]` on by default
94+
95+
warning: use of calling convention not supported on this target
96+
--> $DIR/unsupported.rs:161:1
97+
|
98+
LL | extern "stdcall" {}
99+
| ^^^^^^^^^^^^^^^^^^^
100+
|
101+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
102+
= note: for more information, see issue #87678 <https://github.com/rust-lang/rust/issues/87678>
103+
104+
error[E0570]: `"ptx-kernel"` is not a supported ABI for the current target
105+
--> $DIR/unsupported.rs:32:1
3106
|
4107
LL | extern "ptx-kernel" fn ptx() {}
5108
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6109

7110
error[E0570]: `"aapcs"` is not a supported ABI for the current target
8-
--> $DIR/unsupported.rs:30:1
111+
--> $DIR/unsupported.rs:41:1
9112
|
10113
LL | extern "aapcs" fn aapcs() {}
11114
| ^^^^^^^^^^^^^^^^^^^^^^^^^
12115

13116
error[E0570]: `"msp430-interrupt"` is not a supported ABI for the current target
14-
--> $DIR/unsupported.rs:36:1
117+
--> $DIR/unsupported.rs:62:1
15118
|
16119
LL | extern "msp430-interrupt" fn msp430() {}
17120
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
18121

19122
error[E0570]: `"avr-interrupt"` is not a supported ABI for the current target
20-
--> $DIR/unsupported.rs:38:1
123+
--> $DIR/unsupported.rs:71:1
21124
|
22125
LL | extern "avr-interrupt" fn avr() {}
23126
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
24127

25128
error[E0570]: `"riscv-interrupt-m"` is not a supported ABI for the current target
26-
--> $DIR/unsupported.rs:40:1
129+
--> $DIR/unsupported.rs:80:1
27130
|
28131
LL | extern "riscv-interrupt-m" fn riscv() {}
29132
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
30133

31134
error[E0570]: `"x86-interrupt"` is not a supported ABI for the current target
32-
--> $DIR/unsupported.rs:45:1
135+
--> $DIR/unsupported.rs:98:1
33136
|
34137
LL | extern "x86-interrupt" fn x86() {}
35138
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
36139

37140
error[E0570]: `"thiscall"` is not a supported ABI for the current target
38-
--> $DIR/unsupported.rs:50:1
141+
--> $DIR/unsupported.rs:116:1
39142
|
40143
LL | extern "thiscall" fn thiscall() {}
41144
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
42145

43146
warning: use of calling convention not supported on this target
44-
--> $DIR/unsupported.rs:56:1
147+
--> $DIR/unsupported.rs:137:1
45148
|
46149
LL | extern "stdcall" fn stdcall() {}
47150
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
48151
|
49152
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
50153
= note: for more information, see issue #87678 <https://github.com/rust-lang/rust/issues/87678>
51-
= note: `#[warn(unsupported_calling_conventions)]` on by default
52154

53-
error: aborting due to 7 previous errors; 1 warning emitted
155+
error: aborting due to 21 previous errors; 3 warnings emitted
54156

55157
For more information about this error, try `rustc --explain E0570`.

‎tests/ui/abi/unsupported.arm.stderr

+99-9
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,139 @@
11
error[E0570]: `"ptx-kernel"` is not a supported ABI for the current target
2-
--> $DIR/unsupported.rs:28:1
2+
--> $DIR/unsupported.rs:34:15
3+
|
4+
LL | fn ptx_ptr(f: extern "ptx-kernel" fn()) {
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^
6+
7+
error[E0570]: `"ptx-kernel"` is not a supported ABI for the current target
8+
--> $DIR/unsupported.rs:38:1
9+
|
10+
LL | extern "ptx-kernel" {}
11+
| ^^^^^^^^^^^^^^^^^^^^^^
12+
13+
error[E0570]: `"msp430-interrupt"` is not a supported ABI for the current target
14+
--> $DIR/unsupported.rs:64:18
15+
|
16+
LL | fn msp430_ptr(f: extern "msp430-interrupt" fn()) {
17+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
18+
19+
error[E0570]: `"msp430-interrupt"` is not a supported ABI for the current target
20+
--> $DIR/unsupported.rs:68:1
21+
|
22+
LL | extern "msp430-interrupt" {}
23+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
24+
25+
error[E0570]: `"avr-interrupt"` is not a supported ABI for the current target
26+
--> $DIR/unsupported.rs:73:15
27+
|
28+
LL | fn avr_ptr(f: extern "avr-interrupt" fn()) {
29+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
30+
31+
error[E0570]: `"avr-interrupt"` is not a supported ABI for the current target
32+
--> $DIR/unsupported.rs:77:1
33+
|
34+
LL | extern "avr-interrupt" {}
35+
| ^^^^^^^^^^^^^^^^^^^^^^^^^
36+
37+
error[E0570]: `"riscv-interrupt-m"` is not a supported ABI for the current target
38+
--> $DIR/unsupported.rs:85:17
39+
|
40+
LL | fn riscv_ptr(f: extern "riscv-interrupt-m" fn()) {
41+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
42+
43+
error[E0570]: `"riscv-interrupt-m"` is not a supported ABI for the current target
44+
--> $DIR/unsupported.rs:92:1
45+
|
46+
LL | extern "riscv-interrupt-m" {}
47+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
48+
49+
error[E0570]: `"x86-interrupt"` is not a supported ABI for the current target
50+
--> $DIR/unsupported.rs:103:15
51+
|
52+
LL | fn x86_ptr(f: extern "x86-interrupt" fn()) {
53+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
54+
55+
error[E0570]: `"x86-interrupt"` is not a supported ABI for the current target
56+
--> $DIR/unsupported.rs:110:1
57+
|
58+
LL | extern "x86-interrupt" {}
59+
| ^^^^^^^^^^^^^^^^^^^^^^^^^
60+
61+
error[E0570]: `"thiscall"` is not a supported ABI for the current target
62+
--> $DIR/unsupported.rs:122:20
63+
|
64+
LL | fn thiscall_ptr(f: extern "thiscall" fn()) {
65+
| ^^^^^^^^^^^^^^^^^^^^^^
66+
67+
error[E0570]: `"thiscall"` is not a supported ABI for the current target
68+
--> $DIR/unsupported.rs:130:1
69+
|
70+
LL | extern "thiscall" {}
71+
| ^^^^^^^^^^^^^^^^^^^^
72+
73+
warning: use of calling convention not supported on this target
74+
--> $DIR/unsupported.rs:148:19
75+
|
76+
LL | fn stdcall_ptr(f: extern "stdcall" fn()) {
77+
| ^^^^^^^^^^^^^^^^^^^^^
78+
|
79+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
80+
= note: for more information, see issue #87678 <https://github.com/rust-lang/rust/issues/87678>
81+
= note: `#[warn(unsupported_calling_conventions)]` on by default
82+
83+
warning: use of calling convention not supported on this target
84+
--> $DIR/unsupported.rs:161:1
85+
|
86+
LL | extern "stdcall" {}
87+
| ^^^^^^^^^^^^^^^^^^^
88+
|
89+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
90+
= note: for more information, see issue #87678 <https://github.com/rust-lang/rust/issues/87678>
91+
92+
error[E0570]: `"ptx-kernel"` is not a supported ABI for the current target
93+
--> $DIR/unsupported.rs:32:1
394
|
495
LL | extern "ptx-kernel" fn ptx() {}
596
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
697

798
error[E0570]: `"msp430-interrupt"` is not a supported ABI for the current target
8-
--> $DIR/unsupported.rs:36:1
99+
--> $DIR/unsupported.rs:62:1
9100
|
10101
LL | extern "msp430-interrupt" fn msp430() {}
11102
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
12103

13104
error[E0570]: `"avr-interrupt"` is not a supported ABI for the current target
14-
--> $DIR/unsupported.rs:38:1
105+
--> $DIR/unsupported.rs:71:1
15106
|
16107
LL | extern "avr-interrupt" fn avr() {}
17108
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
18109

19110
error[E0570]: `"riscv-interrupt-m"` is not a supported ABI for the current target
20-
--> $DIR/unsupported.rs:40:1
111+
--> $DIR/unsupported.rs:80:1
21112
|
22113
LL | extern "riscv-interrupt-m" fn riscv() {}
23114
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
24115

25116
error[E0570]: `"x86-interrupt"` is not a supported ABI for the current target
26-
--> $DIR/unsupported.rs:45:1
117+
--> $DIR/unsupported.rs:98:1
27118
|
28119
LL | extern "x86-interrupt" fn x86() {}
29120
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
30121

31122
error[E0570]: `"thiscall"` is not a supported ABI for the current target
32-
--> $DIR/unsupported.rs:50:1
123+
--> $DIR/unsupported.rs:116:1
33124
|
34125
LL | extern "thiscall" fn thiscall() {}
35126
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
36127

37128
warning: use of calling convention not supported on this target
38-
--> $DIR/unsupported.rs:56:1
129+
--> $DIR/unsupported.rs:137:1
39130
|
40131
LL | extern "stdcall" fn stdcall() {}
41132
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
42133
|
43134
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
44135
= note: for more information, see issue #87678 <https://github.com/rust-lang/rust/issues/87678>
45-
= note: `#[warn(unsupported_calling_conventions)]` on by default
46136

47-
error: aborting due to 6 previous errors; 1 warning emitted
137+
error: aborting due to 18 previous errors; 3 warnings emitted
48138

49139
For more information about this error, try `rustc --explain E0570`.

0 commit comments

Comments
 (0)