Skip to content

Commit 35b658f

Browse files
borsbors
committed
Auto merge of #127489 - GuillaumeGomez:rollup-rhqfeom, r=GuillaumeGomez
Rollup of 4 pull requests Successful merges: - #126427 (Rewrite `intrinsic-unreachable`, `sepcomp-cci-copies`, `sepcomp-inlining` and `sepcomp-separate` `run-make` tests to rmake.rs) - #127237 (Improve code of `run-make/llvm-ident`) - #127325 (Migrate `target-cpu-native`, `target-specs` and `target-without-atomic-cas` `run-make` tests to rmake) - #127482 (Infer async closure signature from (old-style) two-part `Fn` + `Future` bounds) Failed merges: - #127357 (Remove `StructuredDiag`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 32e6926 + 72199b2 commit 35b658f

File tree

20 files changed

+329
-124
lines changed

20 files changed

+329
-124
lines changed

‎compiler/rustc_hir_typeck/src/closure.rs

+94-8
Original file line numberDiff line numberDiff line change
@@ -424,9 +424,10 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
424424
if let Some(trait_def_id) = trait_def_id {
425425
let found_kind = match closure_kind {
426426
hir::ClosureKind::Closure => self.tcx.fn_trait_kind_from_def_id(trait_def_id),
427-
hir::ClosureKind::CoroutineClosure(hir::CoroutineDesugaring::Async) => {
428-
self.tcx.async_fn_trait_kind_from_def_id(trait_def_id)
429-
}
427+
hir::ClosureKind::CoroutineClosure(hir::CoroutineDesugaring::Async) => self
428+
.tcx
429+
.async_fn_trait_kind_from_def_id(trait_def_id)
430+
.or_else(|| self.tcx.fn_trait_kind_from_def_id(trait_def_id)),
430431
_ => None,
431432
};
432433

@@ -470,14 +471,37 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
470471
// for closures and async closures, respectively.
471472
match closure_kind {
472473
hir::ClosureKind::Closure
473-
if self.tcx.fn_trait_kind_from_def_id(trait_def_id).is_some() => {}
474+
if self.tcx.fn_trait_kind_from_def_id(trait_def_id).is_some() =>
475+
{
476+
self.extract_sig_from_projection(cause_span, projection)
477+
}
478+
hir::ClosureKind::CoroutineClosure(hir::CoroutineDesugaring::Async)
479+
if self.tcx.async_fn_trait_kind_from_def_id(trait_def_id).is_some() =>
480+
{
481+
self.extract_sig_from_projection(cause_span, projection)
482+
}
483+
// It's possible we've passed the closure to a (somewhat out-of-fashion)
484+
// `F: FnOnce() -> Fut, Fut: Future<Output = T>` style bound. Let's still
485+
// guide inference here, since it's beneficial for the user.
474486
hir::ClosureKind::CoroutineClosure(hir::CoroutineDesugaring::Async)
475-
if self.tcx.async_fn_trait_kind_from_def_id(trait_def_id).is_some() => {}
476-
_ => return None,
487+
if self.tcx.fn_trait_kind_from_def_id(trait_def_id).is_some() =>
488+
{
489+
self.extract_sig_from_projection_and_future_bound(cause_span, projection)
490+
}
491+
_ => None,
477492
}
493+
}
494+
495+
/// Given an `FnOnce::Output` or `AsyncFn::Output` projection, extract the args
496+
/// and return type to infer a [`ty::PolyFnSig`] for the closure.
497+
fn extract_sig_from_projection(
498+
&self,
499+
cause_span: Option<Span>,
500+
projection: ty::PolyProjectionPredicate<'tcx>,
501+
) -> Option<ExpectedSig<'tcx>> {
502+
let projection = self.resolve_vars_if_possible(projection);
478503

479504
let arg_param_ty = projection.skip_binder().projection_term.args.type_at(1);
480-
let arg_param_ty = self.resolve_vars_if_possible(arg_param_ty);
481505
debug!(?arg_param_ty);
482506

483507
let ty::Tuple(input_tys) = *arg_param_ty.kind() else {
@@ -486,7 +510,6 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
486510

487511
// Since this is a return parameter type it is safe to unwrap.
488512
let ret_param_ty = projection.skip_binder().term.expect_type();
489-
let ret_param_ty = self.resolve_vars_if_possible(ret_param_ty);
490513
debug!(?ret_param_ty);
491514

492515
let sig = projection.rebind(self.tcx.mk_fn_sig(
@@ -500,6 +523,69 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
500523
Some(ExpectedSig { cause_span, sig })
501524
}
502525

526+
/// When an async closure is passed to a function that has a "two-part" `Fn`
527+
/// and `Future` trait bound, like:
528+
///
529+
/// ```rust
530+
/// use std::future::Future;
531+
///
532+
/// fn not_exactly_an_async_closure<F, Fut>(_f: F)
533+
/// where
534+
/// F: FnOnce(String, u32) -> Fut,
535+
/// Fut: Future<Output = i32>,
536+
/// {}
537+
/// ```
538+
///
539+
/// The we want to be able to extract the signature to guide inference in the async
540+
/// closure. We will have two projection predicates registered in this case. First,
541+
/// we identify the `FnOnce<Args, Output = ?Fut>` bound, and if the output type is
542+
/// an inference variable `?Fut`, we check if that is bounded by a `Future<Output = Ty>`
543+
/// projection.
544+
fn extract_sig_from_projection_and_future_bound(
545+
&self,
546+
cause_span: Option<Span>,
547+
projection: ty::PolyProjectionPredicate<'tcx>,
548+
) -> Option<ExpectedSig<'tcx>> {
549+
let projection = self.resolve_vars_if_possible(projection);
550+
551+
let arg_param_ty = projection.skip_binder().projection_term.args.type_at(1);
552+
debug!(?arg_param_ty);
553+
554+
let ty::Tuple(input_tys) = *arg_param_ty.kind() else {
555+
return None;
556+
};
557+
558+
// If the return type is a type variable, look for bounds on it.
559+
// We could theoretically support other kinds of return types here,
560+
// but none of them would be useful, since async closures return
561+
// concrete anonymous future types, and their futures are not coerced
562+
// into any other type within the body of the async closure.
563+
let ty::Infer(ty::TyVar(return_vid)) = *projection.skip_binder().term.expect_type().kind()
564+
else {
565+
return None;
566+
};
567+
568+
// FIXME: We may want to elaborate here, though I assume this will be exceedingly rare.
569+
for bound in self.obligations_for_self_ty(return_vid) {
570+
if let Some(ret_projection) = bound.predicate.as_projection_clause()
571+
&& let Some(ret_projection) = ret_projection.no_bound_vars()
572+
&& self.tcx.is_lang_item(ret_projection.def_id(), LangItem::FutureOutput)
573+
{
574+
let sig = projection.rebind(self.tcx.mk_fn_sig(
575+
input_tys,
576+
ret_projection.term.expect_type(),
577+
false,
578+
hir::Safety::Safe,
579+
Abi::Rust,
580+
));
581+
582+
return Some(ExpectedSig { cause_span, sig });
583+
}
584+
}
585+
586+
None
587+
}
588+
503589
fn sig_of_closure(
504590
&self,
505591
expr_def_id: LocalDefId,

‎src/tools/run-make-support/src/fs_wrapper.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::fs;
22
use std::path::Path;
33

4-
/// A wrapper around [`std::fs::remove_file`] which includes the file path in the panic message..
4+
/// A wrapper around [`std::fs::remove_file`] which includes the file path in the panic message.
55
#[track_caller]
66
pub fn remove_file<P: AsRef<Path>>(path: P) {
77
fs::remove_file(path.as_ref())
@@ -18,21 +18,21 @@ pub fn copy<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) {
1818
));
1919
}
2020

21-
/// A wrapper around [`std::fs::File::create`] which includes the file path in the panic message..
21+
/// A wrapper around [`std::fs::File::create`] which includes the file path in the panic message.
2222
#[track_caller]
2323
pub fn create_file<P: AsRef<Path>>(path: P) {
2424
fs::File::create(path.as_ref())
2525
.expect(&format!("the file in path \"{}\" could not be created", path.as_ref().display()));
2626
}
2727

28-
/// A wrapper around [`std::fs::read`] which includes the file path in the panic message..
28+
/// A wrapper around [`std::fs::read`] which includes the file path in the panic message.
2929
#[track_caller]
3030
pub fn read<P: AsRef<Path>>(path: P) -> Vec<u8> {
3131
fs::read(path.as_ref())
3232
.expect(&format!("the file in path \"{}\" could not be read", path.as_ref().display()))
3333
}
3434

35-
/// A wrapper around [`std::fs::read_to_string`] which includes the file path in the panic message..
35+
/// A wrapper around [`std::fs::read_to_string`] which includes the file path in the panic message.
3636
#[track_caller]
3737
pub fn read_to_string<P: AsRef<Path>>(path: P) -> String {
3838
fs::read_to_string(path.as_ref()).expect(&format!(
@@ -41,14 +41,14 @@ pub fn read_to_string<P: AsRef<Path>>(path: P) -> String {
4141
))
4242
}
4343

44-
/// A wrapper around [`std::fs::read_dir`] which includes the file path in the panic message..
44+
/// A wrapper around [`std::fs::read_dir`] which includes the file path in the panic message.
4545
#[track_caller]
4646
pub fn read_dir<P: AsRef<Path>>(path: P) -> fs::ReadDir {
4747
fs::read_dir(path.as_ref())
4848
.expect(&format!("the directory in path \"{}\" could not be read", path.as_ref().display()))
4949
}
5050

51-
/// A wrapper around [`std::fs::write`] which includes the file path in the panic message..
51+
/// A wrapper around [`std::fs::write`] which includes the file path in the panic message.
5252
#[track_caller]
5353
pub fn write<P: AsRef<Path>, C: AsRef<[u8]>>(path: P, contents: C) {
5454
fs::write(path.as_ref(), contents.as_ref()).expect(&format!(
@@ -57,7 +57,7 @@ pub fn write<P: AsRef<Path>, C: AsRef<[u8]>>(path: P, contents: C) {
5757
));
5858
}
5959

60-
/// A wrapper around [`std::fs::remove_dir_all`] which includes the file path in the panic message..
60+
/// A wrapper around [`std::fs::remove_dir_all`] which includes the file path in the panic message.
6161
#[track_caller]
6262
pub fn remove_dir_all<P: AsRef<Path>>(path: P) {
6363
fs::remove_dir_all(path.as_ref()).expect(&format!(
@@ -66,7 +66,7 @@ pub fn remove_dir_all<P: AsRef<Path>>(path: P) {
6666
));
6767
}
6868

69-
/// A wrapper around [`std::fs::create_dir`] which includes the file path in the panic message..
69+
/// A wrapper around [`std::fs::create_dir`] which includes the file path in the panic message.
7070
#[track_caller]
7171
pub fn create_dir<P: AsRef<Path>>(path: P) {
7272
fs::create_dir(path.as_ref()).expect(&format!(
@@ -75,7 +75,7 @@ pub fn create_dir<P: AsRef<Path>>(path: P) {
7575
));
7676
}
7777

78-
/// A wrapper around [`std::fs::create_dir_all`] which includes the file path in the panic message..
78+
/// A wrapper around [`std::fs::create_dir_all`] which includes the file path in the panic message.
7979
#[track_caller]
8080
pub fn create_dir_all<P: AsRef<Path>>(path: P) {
8181
fs::create_dir_all(path.as_ref()).expect(&format!(
@@ -84,7 +84,7 @@ pub fn create_dir_all<P: AsRef<Path>>(path: P) {
8484
));
8585
}
8686

87-
/// A wrapper around [`std::fs::metadata`] which includes the file path in the panic message..
87+
/// A wrapper around [`std::fs::metadata`] which includes the file path in the panic message.
8888
#[track_caller]
8989
pub fn metadata<P: AsRef<Path>>(path: P) -> fs::Metadata {
9090
fs::metadata(path.as_ref()).expect(&format!(

‎src/tools/run-make-support/src/lib.rs

+14
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,20 @@ pub fn filename_not_in_denylist<P: AsRef<Path>, V: AsRef<[String]>>(path: P, exp
303303
.is_some_and(|name| !expected.contains(&name.to_str().unwrap().to_owned()))
304304
}
305305

306+
/// Gathers all files in the current working directory that have the extension `ext`, and counts
307+
/// the number of lines within that contain a match with the regex pattern `re`.
308+
pub fn count_regex_matches_in_files_with_extension(re: &regex::Regex, ext: &str) -> usize {
309+
let fetched_files = shallow_find_files(cwd(), |path| has_extension(path, ext));
310+
311+
let mut count = 0;
312+
for file in fetched_files {
313+
let content = fs_wrapper::read_to_string(file);
314+
count += content.lines().filter(|line| re.is_match(&line)).count();
315+
}
316+
317+
count
318+
}
319+
306320
/// Use `cygpath -w` on a path to get a Windows path string back. This assumes that `cygpath` is
307321
/// available on the platform!
308322
#[track_caller]

‎src/tools/tidy/src/allowed_run_make_makefiles.txt

-7
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ run-make/foreign-rust-exceptions/Makefile
4747
run-make/incr-add-rust-src-component/Makefile
4848
run-make/incr-foreign-head-span/Makefile
4949
run-make/interdependent-c-libraries/Makefile
50-
run-make/intrinsic-unreachable/Makefile
5150
run-make/issue-107094/Makefile
5251
run-make/issue-109934-lto-debuginfo/Makefile
5352
run-make/issue-14698/Makefile
@@ -130,9 +129,6 @@ run-make/rustc-macro-dep-files/Makefile
130129
run-make/sanitizer-cdylib-link/Makefile
131130
run-make/sanitizer-dylib-link/Makefile
132131
run-make/sanitizer-staticlib-link/Makefile
133-
run-make/sepcomp-cci-copies/Makefile
134-
run-make/sepcomp-inlining/Makefile
135-
run-make/sepcomp-separate/Makefile
136132
run-make/share-generics-dylib/Makefile
137133
run-make/silly-file-names/Makefile
138134
run-make/simd-ffi/Makefile
@@ -147,9 +143,6 @@ run-make/symbol-mangling-hashed/Makefile
147143
run-make/symbol-visibility/Makefile
148144
run-make/symbols-include-type-name/Makefile
149145
run-make/sysroot-crates-are-unstable/Makefile
150-
run-make/target-cpu-native/Makefile
151-
run-make/target-specs/Makefile
152-
run-make/target-without-atomic-cas/Makefile
153146
run-make/test-benches/Makefile
154147
run-make/thumb-none-cortex-m/Makefile
155148
run-make/thumb-none-qemu/Makefile

‎tests/run-make/intrinsic-unreachable/Makefile

-12
This file was deleted.

‎tests/run-make/intrinsic-unreachable/rmake.rs

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// intrinsics::unreachable tells the compiler that a certain point in the code
2+
// is not reachable by any means, which enables some useful optimizations.
3+
// In this test, exit-unreachable contains this instruction and exit-ret does not,
4+
// which means the emitted artifacts should be shorter in length.
5+
// See https://github.com/rust-lang/rust/pull/16970
6+
7+
//@ needs-asm-support
8+
//@ ignore-windows
9+
// Reason: Because of Windows exception handling, the code is not necessarily any shorter.
10+
11+
use run_make_support::{fs_wrapper, rustc};
12+
13+
fn main() {
14+
rustc().opt().emit("asm").input("exit-ret.rs").run();
15+
rustc().opt().emit("asm").input("exit-unreachable.rs").run();
16+
assert!(
17+
fs_wrapper::read_to_string("exit-unreachable.s").lines().count()
18+
< fs_wrapper::read_to_string("exit-ret.s").lines().count()
19+
);
20+
}

‎tests/run-make/llvm-ident/rmake.rs

+8-14
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
//@ ignore-cross-compile
33

44
use run_make_support::llvm::llvm_bin_dir;
5-
use run_make_support::{cmd, env_var, llvm_filecheck, read_dir, rustc, source_root};
6-
7-
use std::ffi::OsStr;
5+
use run_make_support::{
6+
cmd, env_var, has_extension, llvm_filecheck, rustc, shallow_find_files, source_root,
7+
};
88

99
fn main() {
1010
// `-Ccodegen-units=16 -Copt-level=2` is used here to trigger thin LTO
@@ -22,20 +22,14 @@ fn main() {
2222

2323
// `llvm-dis` is used here since `--emit=llvm-ir` does not emit LLVM IR
2424
// for temporary outputs.
25-
let mut files = Vec::new();
26-
read_dir(".", |path| {
27-
if path.is_file() && path.extension().is_some_and(|ext| ext == OsStr::new("bc")) {
28-
files.push(path.to_path_buf());
29-
}
30-
});
25+
let files = shallow_find_files(".", |path| has_extension(path, "bc"));
3126
cmd(llvm_bin_dir().join("llvm-dis")).args(files).run();
3227

3328
// Check LLVM IR files (including temporary outputs) have `!llvm.ident`
3429
// named metadata, reusing the related codegen test.
3530
let llvm_ident_path = source_root().join("tests/codegen/llvm-ident.rs");
36-
read_dir(".", |path| {
37-
if path.is_file() && path.extension().is_some_and(|ext| ext == OsStr::new("ll")) {
38-
llvm_filecheck().input_file(path).arg(&llvm_ident_path).run();
39-
}
40-
});
31+
let files = shallow_find_files(".", |path| has_extension(path, "ll"));
32+
for file in files {
33+
llvm_filecheck().input_file(file).arg(&llvm_ident_path).run();
34+
}
4135
}

‎tests/run-make/sepcomp-cci-copies/Makefile

-12
This file was deleted.

‎tests/run-make/sepcomp-cci-copies/rmake.rs

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Check that cross-crate inlined items are inlined in all compilation units
2+
// that refer to them, and not in any other compilation units.
3+
// Note that we have to pass `-C codegen-units=6` because up to two CGUs may be
4+
// created for each source module (see `rustc_const_eval::monomorphize::partitioning`).
5+
// See https://github.com/rust-lang/rust/pull/16367
6+
7+
use run_make_support::{
8+
count_regex_matches_in_files_with_extension, cwd, fs_wrapper, has_extension, regex, rustc,
9+
shallow_find_files,
10+
};
11+
12+
fn main() {
13+
rustc().input("cci_lib.rs").run();
14+
rustc().input("foo.rs").emit("llvm-ir").codegen_units(6).arg("-Zinline-in-all-cgus").run();
15+
let re = regex::Regex::new(r#"define\ .*cci_fn"#).unwrap();
16+
assert_eq!(count_regex_matches_in_files_with_extension(&re, "ll"), 2);
17+
}

‎tests/run-make/sepcomp-inlining/Makefile

-15
This file was deleted.

0 commit comments

Comments
 (0)