Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 9459fc2

Browse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of rust-lang#126843 - workingjubilee:allow-variadics-in-c-unwind, r=nnethercote
Allow "C-unwind" fn to have C variadics Fixes rust-lang#126836
2 parents 08d2fc7 + 43a6b01 commit 9459fc2

File tree

9 files changed

+56
-46
lines changed

9 files changed

+56
-46
lines changed

‎compiler/rustc_ast_passes/messages.ftl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ast_passes_auto_super_lifetime = auto traits cannot have super traits or lifetim
2828
.label = {ast_passes_auto_super_lifetime}
2929
.suggestion = remove the super traits or lifetime bounds
3030
31-
ast_passes_bad_c_variadic = only foreign or `unsafe extern "C"` functions may be C-variadic
31+
ast_passes_bad_c_variadic = only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
3232
3333
ast_passes_bare_fn_invalid_safety = function pointers cannot be declared with `safe` safety qualifier
3434
.suggestion = remove safe from this item

‎compiler/rustc_ast_passes/src/ast_validation.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -637,6 +637,7 @@ impl<'a> AstValidator<'a> {
637637
(Some(FnCtxt::Foreign), _) => return,
638638
(Some(FnCtxt::Free), Some(header)) => match header.ext {
639639
Extern::Explicit(StrLit { symbol_unescaped: sym::C, .. }, _)
640+
| Extern::Explicit(StrLit { symbol_unescaped: sym::C_dash_unwind, .. }, _)
640641
| Extern::Implicit(_)
641642
if matches!(header.safety, Safety::Unsafe(_)) =>
642643
{

‎compiler/rustc_span/src/symbol.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ symbols! {
167167
Break,
168168
C,
169169
CStr,
170+
C_dash_unwind: "C-unwind",
170171
CallOnceFuture,
171172
CallRefFuture,
172173
Capture,

‎tests/ui/abi/variadic-ffi.rs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ pub unsafe extern "C" fn test_valist_forward(n: u64, mut ap: ...) -> f64 {
1414
rust_valist_interesting_average(n, ap.as_va_list())
1515
}
1616

17+
pub unsafe extern "C-unwind" fn c_unwind_can_forward(n: u64, mut ap: ...) -> f64 {
18+
rust_valist_interesting_average(n, ap.as_va_list())
19+
}
20+
1721
pub unsafe extern "C" fn test_va_copy(_: u64, mut ap: ...) {
1822
let mut ap2 = ap.clone();
1923
assert_eq!(rust_valist_interesting_average(2, ap2.as_va_list()) as i64, 30);
@@ -72,6 +76,10 @@ pub fn main() {
7276
assert_eq!(test_valist_forward(2, 10i64, 10f64, 20i64, 20f64) as i64, 30);
7377
}
7478

79+
unsafe {
80+
assert_eq!(c_unwind_can_forward(2, 10i64, 10f64, 20i64, 20f64) as i64, 30);
81+
}
82+
7583
unsafe {
7684
test_va_copy(4, 10i64, 10f64, 20i64, 20f64, 30i64, 30f64, 40i64, 40f64);
7785
}

‎tests/ui/c-variadic/issue-86053-1.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ error: `...` must be the last argument of a C-variadic function
4646
LL | self , ... , self , self , ... ) where F : FnOnce ( & 'a & 'b usize ) {
4747
| ^^^
4848

49-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
49+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
5050
--> $DIR/issue-86053-1.rs:11:12
5151
|
5252
LL | self , ... , self , self , ... ) where F : FnOnce ( & 'a & 'b usize ) {

‎tests/ui/mir/issue-83499-input-output-iteration-ice.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
fn main() {}
66

77
fn foo(_: Bar, ...) -> impl {}
8-
//~^ ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
8+
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
99
//~| ERROR cannot find type `Bar` in this scope
1010
//~| ERROR at least one trait must be specified

‎tests/ui/mir/issue-83499-input-output-iteration-ice.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
1+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
22
--> $DIR/issue-83499-input-output-iteration-ice.rs:7:16
33
|
44
LL | fn foo(_: Bar, ...) -> impl {}

‎tests/ui/parser/variadic-ffi-semantic-restrictions.rs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@
44
fn main() {}
55

66
fn f1_1(x: isize, ...) {}
7-
//~^ ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
7+
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
88

99
fn f1_2(...) {}
10-
//~^ ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
10+
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
1111

1212
extern "C" fn f2_1(x: isize, ...) {}
13-
//~^ ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
13+
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
1414

1515
extern "C" fn f2_2(...) {}
16-
//~^ ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
16+
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
1717

1818
extern "C" fn f2_3(..., x: isize) {}
19-
//~^ ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
19+
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
2020
//~| ERROR `...` must be the last argument of a C-variadic function
2121

2222
extern "C" fn f3_1(x: isize, ...) {}
23-
//~^ ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
23+
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
2424

2525
extern "C" fn f3_2(...) {}
26-
//~^ ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
26+
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
2727

2828
extern "C" fn f3_3(..., x: isize) {}
29-
//~^ ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
29+
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
3030
//~| ERROR `...` must be the last argument of a C-variadic function
3131

3232
const unsafe extern "C" fn f4_1(x: isize, ...) {}
@@ -35,12 +35,12 @@ const unsafe extern "C" fn f4_1(x: isize, ...) {}
3535

3636
const extern "C" fn f4_2(x: isize, ...) {}
3737
//~^ ERROR functions cannot be both `const` and C-variadic
38-
//~| ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
38+
//~| ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
3939
//~| ERROR destructor of `VaListImpl<'_>` cannot be evaluated at compile-time
4040

4141
const extern "C" fn f4_3(..., x: isize, ...) {}
4242
//~^ ERROR functions cannot be both `const` and C-variadic
43-
//~| ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
43+
//~| ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
4444
//~| ERROR `...` must be the last argument of a C-variadic function
4545

4646
extern "C" {
@@ -52,34 +52,34 @@ struct X;
5252

5353
impl X {
5454
fn i_f1(x: isize, ...) {}
55-
//~^ ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
55+
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
5656
fn i_f2(...) {}
57-
//~^ ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
57+
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
5858
fn i_f3(..., x: isize, ...) {}
59-
//~^ ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
59+
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
6060
//~| ERROR `...` must be the last argument of a C-variadic function
6161
fn i_f4(..., x: isize, ...) {}
62-
//~^ ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
62+
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
6363
//~| ERROR `...` must be the last argument of a C-variadic function
6464
const fn i_f5(x: isize, ...) {}
65-
//~^ ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
65+
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
6666
//~| ERROR functions cannot be both `const` and C-variadic
6767
//~| ERROR destructor of `VaListImpl<'_>` cannot be evaluated at compile-time
6868
}
6969

7070
trait T {
7171
fn t_f1(x: isize, ...) {}
72-
//~^ ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
72+
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
7373
fn t_f2(x: isize, ...);
74-
//~^ ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
74+
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
7575
fn t_f3(...) {}
76-
//~^ ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
76+
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
7777
fn t_f4(...);
78-
//~^ ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
78+
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
7979
fn t_f5(..., x: isize) {}
80-
//~^ ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
80+
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
8181
//~| ERROR `...` must be the last argument of a C-variadic function
8282
fn t_f6(..., x: isize);
83-
//~^ ERROR only foreign or `unsafe extern "C"` functions may be C-variadic
83+
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
8484
//~| ERROR `...` must be the last argument of a C-variadic function
8585
}

‎tests/ui/parser/variadic-ffi-semantic-restrictions.stderr‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
1+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
22
--> $DIR/variadic-ffi-semantic-restrictions.rs:6:19
33
|
44
LL | fn f1_1(x: isize, ...) {}
55
| ^^^
66

7-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
7+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
88
--> $DIR/variadic-ffi-semantic-restrictions.rs:9:9
99
|
1010
LL | fn f1_2(...) {}
1111
| ^^^
1212

13-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
13+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
1414
--> $DIR/variadic-ffi-semantic-restrictions.rs:12:30
1515
|
1616
LL | extern "C" fn f2_1(x: isize, ...) {}
1717
| ^^^
1818

19-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
19+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
2020
--> $DIR/variadic-ffi-semantic-restrictions.rs:15:20
2121
|
2222
LL | extern "C" fn f2_2(...) {}
@@ -28,19 +28,19 @@ error: `...` must be the last argument of a C-variadic function
2828
LL | extern "C" fn f2_3(..., x: isize) {}
2929
| ^^^
3030

31-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
31+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
3232
--> $DIR/variadic-ffi-semantic-restrictions.rs:18:20
3333
|
3434
LL | extern "C" fn f2_3(..., x: isize) {}
3535
| ^^^
3636

37-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
37+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
3838
--> $DIR/variadic-ffi-semantic-restrictions.rs:22:30
3939
|
4040
LL | extern "C" fn f3_1(x: isize, ...) {}
4141
| ^^^
4242

43-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
43+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
4444
--> $DIR/variadic-ffi-semantic-restrictions.rs:25:20
4545
|
4646
LL | extern "C" fn f3_2(...) {}
@@ -52,7 +52,7 @@ error: `...` must be the last argument of a C-variadic function
5252
LL | extern "C" fn f3_3(..., x: isize) {}
5353
| ^^^
5454

55-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
55+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
5656
--> $DIR/variadic-ffi-semantic-restrictions.rs:28:20
5757
|
5858
LL | extern "C" fn f3_3(..., x: isize) {}
@@ -70,7 +70,7 @@ error: functions cannot be both `const` and C-variadic
7070
LL | const extern "C" fn f4_2(x: isize, ...) {}
7171
| ^^^^^ `const` because of this ^^^ C-variadic because of this
7272

73-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
73+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
7474
--> $DIR/variadic-ffi-semantic-restrictions.rs:36:36
7575
|
7676
LL | const extern "C" fn f4_2(x: isize, ...) {}
@@ -91,7 +91,7 @@ LL | const extern "C" fn f4_3(..., x: isize, ...) {}
9191
| | C-variadic because of this
9292
| `const` because of this
9393

94-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
94+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
9595
--> $DIR/variadic-ffi-semantic-restrictions.rs:41:26
9696
|
9797
LL | const extern "C" fn f4_3(..., x: isize, ...) {}
@@ -103,13 +103,13 @@ error: `...` must be the last argument of a C-variadic function
103103
LL | fn e_f2(..., x: isize);
104104
| ^^^
105105

106-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
106+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
107107
--> $DIR/variadic-ffi-semantic-restrictions.rs:54:23
108108
|
109109
LL | fn i_f1(x: isize, ...) {}
110110
| ^^^
111111

112-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
112+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
113113
--> $DIR/variadic-ffi-semantic-restrictions.rs:56:13
114114
|
115115
LL | fn i_f2(...) {}
@@ -121,7 +121,7 @@ error: `...` must be the last argument of a C-variadic function
121121
LL | fn i_f3(..., x: isize, ...) {}
122122
| ^^^
123123

124-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
124+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
125125
--> $DIR/variadic-ffi-semantic-restrictions.rs:58:13
126126
|
127127
LL | fn i_f3(..., x: isize, ...) {}
@@ -133,7 +133,7 @@ error: `...` must be the last argument of a C-variadic function
133133
LL | fn i_f4(..., x: isize, ...) {}
134134
| ^^^
135135

136-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
136+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
137137
--> $DIR/variadic-ffi-semantic-restrictions.rs:61:13
138138
|
139139
LL | fn i_f4(..., x: isize, ...) {}
@@ -147,31 +147,31 @@ LL | const fn i_f5(x: isize, ...) {}
147147
| |
148148
| `const` because of this
149149

150-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
150+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
151151
--> $DIR/variadic-ffi-semantic-restrictions.rs:64:29
152152
|
153153
LL | const fn i_f5(x: isize, ...) {}
154154
| ^^^
155155

156-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
156+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
157157
--> $DIR/variadic-ffi-semantic-restrictions.rs:71:23
158158
|
159159
LL | fn t_f1(x: isize, ...) {}
160160
| ^^^
161161

162-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
162+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
163163
--> $DIR/variadic-ffi-semantic-restrictions.rs:73:23
164164
|
165165
LL | fn t_f2(x: isize, ...);
166166
| ^^^
167167

168-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
168+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
169169
--> $DIR/variadic-ffi-semantic-restrictions.rs:75:13
170170
|
171171
LL | fn t_f3(...) {}
172172
| ^^^
173173

174-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
174+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
175175
--> $DIR/variadic-ffi-semantic-restrictions.rs:77:13
176176
|
177177
LL | fn t_f4(...);
@@ -183,7 +183,7 @@ error: `...` must be the last argument of a C-variadic function
183183
LL | fn t_f5(..., x: isize) {}
184184
| ^^^
185185

186-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
186+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
187187
--> $DIR/variadic-ffi-semantic-restrictions.rs:79:13
188188
|
189189
LL | fn t_f5(..., x: isize) {}
@@ -195,7 +195,7 @@ error: `...` must be the last argument of a C-variadic function
195195
LL | fn t_f6(..., x: isize);
196196
| ^^^
197197

198-
error: only foreign or `unsafe extern "C"` functions may be C-variadic
198+
error: only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
199199
--> $DIR/variadic-ffi-semantic-restrictions.rs:82:13
200200
|
201201
LL | fn t_f6(..., x: isize);

0 commit comments

Comments
 (0)