Skip to content

Commit 05468cf

Browse files
borsbors
committed
Auto merge of #126855 - matthiaskrgr:rollup-ap5m2l6, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #126720 (Ignore `branch-protection-check-IBT` run-make test) - #126779 (Try to clarify the confusingly-named `RustDev` and `RustcDev` steps) - #126782 (Support absolute source paths in bootstrap) - #126783 (Fix issue number for the `tcplistener_into_incoming` feature) - #126843 (Allow "C-unwind" fn to have C variadics) r? `@ghost` `@rustbot` modify labels: rollup
2 parents d4cc01c + 9459fc2 commit 05468cf

File tree

16 files changed

+136
-60
lines changed

16 files changed

+136
-60
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,

‎library/std/src/net/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use crate::io::{self, ErrorKind};
2727
pub use self::ip_addr::{IpAddr, Ipv4Addr, Ipv6Addr, Ipv6MulticastScope};
2828
#[stable(feature = "rust1", since = "1.0.0")]
2929
pub use self::socket_addr::{SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs};
30-
#[unstable(feature = "tcplistener_into_incoming", issue = "88339")]
30+
#[unstable(feature = "tcplistener_into_incoming", issue = "88373")]
3131
pub use self::tcp::IntoIncoming;
3232
#[stable(feature = "rust1", since = "1.0.0")]
3333
pub use self::tcp::{Incoming, TcpListener, TcpStream};

‎library/std/src/net/tcp.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ pub struct Incoming<'a> {
105105
///
106106
/// [`accept`]: TcpListener::accept
107107
#[derive(Debug)]
108-
#[unstable(feature = "tcplistener_into_incoming", issue = "88339")]
108+
#[unstable(feature = "tcplistener_into_incoming", issue = "88373")]
109109
pub struct IntoIncoming {
110110
listener: TcpListener,
111111
}
@@ -894,7 +894,7 @@ impl TcpListener {
894894
/// }
895895
/// ```
896896
#[must_use = "`self` will be dropped if the result is not used"]
897-
#[unstable(feature = "tcplistener_into_incoming", issue = "88339")]
897+
#[unstable(feature = "tcplistener_into_incoming", issue = "88373")]
898898
pub fn into_incoming(self) -> IntoIncoming {
899899
IntoIncoming { listener: self }
900900
}
@@ -1033,15 +1033,15 @@ impl<'a> Iterator for Incoming<'a> {
10331033
#[stable(feature = "tcp_listener_incoming_fused_iterator", since = "1.64.0")]
10341034
impl FusedIterator for Incoming<'_> {}
10351035

1036-
#[unstable(feature = "tcplistener_into_incoming", issue = "88339")]
1036+
#[unstable(feature = "tcplistener_into_incoming", issue = "88373")]
10371037
impl Iterator for IntoIncoming {
10381038
type Item = io::Result<TcpStream>;
10391039
fn next(&mut self) -> Option<io::Result<TcpStream>> {
10401040
Some(self.listener.accept().map(|p| p.0))
10411041
}
10421042
}
10431043

1044-
#[unstable(feature = "tcplistener_into_incoming", issue = "88339")]
1044+
#[unstable(feature = "tcplistener_into_incoming", issue = "88373")]
10451045
impl FusedIterator for IntoIncoming {}
10461046

10471047
impl AsInner<net_imp::TcpListener> for TcpListener {

‎src/bootstrap/src/core/build_steps/dist.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -665,6 +665,10 @@ impl Step for Std {
665665
}
666666
}
667667

668+
/// Tarball containing the compiler that gets downloaded and used by
669+
/// `rust.download-rustc`.
670+
///
671+
/// (Don't confuse this with [`RustDev`], without the `c`!)
668672
#[derive(Debug, PartialOrd, Ord, Clone, Hash, PartialEq, Eq)]
669673
pub struct RustcDev {
670674
pub compiler: Compiler,
@@ -2225,6 +2229,11 @@ impl Step for LlvmBitcodeLinker {
22252229
/// Tarball intended for internal consumption to ease rustc/std development.
22262230
///
22272231
/// Should not be considered stable by end users.
2232+
///
2233+
/// In practice, this is the tarball that gets downloaded and used by
2234+
/// `llvm.download-ci-llvm`.
2235+
///
2236+
/// (Don't confuse this with [`RustcDev`], with a `c`!)
22282237
#[derive(Clone, Debug, Eq, Hash, PartialEq)]
22292238
pub struct RustDev {
22302239
pub target: TargetSelection,

‎src/bootstrap/src/core/builder.rs

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ impl PathSet {
274274
/// This is used for `StepDescription::krate`, which passes all matching crates at once to
275275
/// `Step::make_run`, rather than calling it many times with a single crate.
276276
/// See `tests.rs` for examples.
277-
fn intersection_removing_matches(&self, needles: &mut Vec<&Path>, module: Kind) -> PathSet {
277+
fn intersection_removing_matches(&self, needles: &mut Vec<PathBuf>, module: Kind) -> PathSet {
278278
let mut check = |p| {
279279
for (i, n) in needles.iter().enumerate() {
280280
let matched = Self::check(p, n, module);
@@ -346,7 +346,7 @@ const PATH_REMAP: &[(&str, &[&str])] = &[
346346
),
347347
];
348348

349-
fn remap_paths(paths: &mut Vec<&Path>) {
349+
fn remap_paths(paths: &mut Vec<PathBuf>) {
350350
let mut remove = vec![];
351351
let mut add = vec![];
352352
for (i, path) in paths.iter().enumerate().filter_map(|(i, path)| path.to_str().map(|s| (i, s)))
@@ -355,7 +355,7 @@ fn remap_paths(paths: &mut Vec<&Path>) {
355355
// Remove leading and trailing slashes so `tests/` and `tests` are equivalent
356356
if path.trim_matches(std::path::is_separator) == search {
357357
remove.push(i);
358-
add.extend(replace.iter().map(Path::new));
358+
add.extend(replace.iter().map(PathBuf::from));
359359
break;
360360
}
361361
}
@@ -438,8 +438,25 @@ impl StepDescription {
438438
}
439439
}
440440

441-
// strip CurDir prefix if present
442-
let mut paths: Vec<_> = paths.iter().map(|p| p.strip_prefix(".").unwrap_or(p)).collect();
441+
// Attempt to resolve paths to be relative to the builder source directory.
442+
let mut paths: Vec<PathBuf> = paths
443+
.iter()
444+
.map(|p| {
445+
// If the path does not exist, it may represent the name of a Step, such as `tidy` in `x test tidy`
446+
if !p.exists() {
447+
return p.clone();
448+
}
449+
450+
// Make the path absolute, strip the prefix, and convert to a PathBuf.
451+
match std::path::absolute(p) {
452+
Ok(p) => p.strip_prefix(&builder.src).unwrap_or(&p).to_path_buf(),
453+
Err(e) => {
454+
eprintln!("ERROR: {:?}", e);
455+
panic!("Due to the above error, failed to resolve path: {:?}", p);
456+
}
457+
}
458+
})
459+
.collect();
443460

444461
remap_paths(&mut paths);
445462

@@ -629,7 +646,7 @@ impl<'a> ShouldRun<'a> {
629646
/// (for now, just `all_krates` and `paths`, but we may want to add an `aliases` function in the future?)
630647
fn pathset_for_paths_removing_matches(
631648
&self,
632-
paths: &mut Vec<&Path>,
649+
paths: &mut Vec<PathBuf>,
633650
kind: Kind,
634651
) -> Vec<PathSet> {
635652
let mut sets = vec![];

‎src/bootstrap/src/core/builder/tests.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,14 @@ fn test_intersection() {
122122
PathSet::Set(paths.into_iter().map(|p| TaskPath { path: p.into(), kind: None }).collect())
123123
};
124124
let library_set = set(&["library/core", "library/alloc", "library/std"]);
125-
let mut command_paths =
126-
vec![Path::new("library/core"), Path::new("library/alloc"), Path::new("library/stdarch")];
125+
let mut command_paths = vec![
126+
PathBuf::from("library/core"),
127+
PathBuf::from("library/alloc"),
128+
PathBuf::from("library/stdarch"),
129+
];
127130
let subset = library_set.intersection_removing_matches(&mut command_paths, Kind::Build);
128131
assert_eq!(subset, set(&["library/core", "library/alloc"]),);
129-
assert_eq!(command_paths, vec![Path::new("library/stdarch")]);
132+
assert_eq!(command_paths, vec![PathBuf::from("library/stdarch")]);
130133
}
131134

132135
#[test]

‎tests/run-make/branch-protection-check-IBT/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ include ../tools.mk
77

88
# only-x86_64
99

10+
# ignore-test
11+
# FIXME(jieyouxu): This test never runs because the `ifeq` check on line 17
12+
# compares `x86` to `x86_64`, which always evaluates to false.
13+
# When the test does run, the compilation does not include `.note.gnu.property`.
14+
# See https://github.com/rust-lang/rust/pull/126720 for more information.
15+
1016
all:
1117
ifeq ($(filter x86,$(LLVM_COMPONENTS)),x86_64)
1218
$(RUSTC) --target x86_64-unknown-linux-gnu -Z cf-protection=branch -L$(TMPDIR) -C link-args='-nostartfiles' -C save-temps ./main.rs -o $(TMPDIR)/rsmain

‎tests/run-make/branch-protection-check-IBT/_rmake.rs

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// Check for GNU Property Note
2+
3+
// How to run this
4+
// python3 x.py test --target x86_64-unknown-linux-gnu tests/run-make/branch-protection-check-IBT/
5+
6+
//@ only-x86_64
7+
8+
//@ ignore-test
9+
// FIXME(jieyouxu): see the FIXME in the Makefile
10+
11+
use run_make_support::llvm_readobj;
12+
use run_make_support::rustc;
13+
use run_make_support::{cwd, env_var};
14+
15+
fn main() {
16+
let llvm_components = env_var("LLVM_COMPONENTS");
17+
if !format!(" {llvm_components} ").contains(" x86 ") {
18+
return;
19+
}
20+
21+
rustc()
22+
.input("main.rs")
23+
.target("x86_64-unknown-linux-gnu")
24+
.arg("-Zcf-protection=branch")
25+
.arg(format!("-L{}", cwd().display()))
26+
.arg("-Clink-args=-nostartfiles")
27+
.arg("-Csave-temps")
28+
.run();
29+
30+
llvm_readobj().arg("-nW").input("main").run().assert_stdout_contains(".note.gnu.property");
31+
}

‎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
}

0 commit comments

Comments
 (0)