Skip to content

Commit 829308e

Browse files
borsbors
committed
Auto merge of rust-lang#121636 - matthiaskrgr:rollup-1tt2o5n, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - rust-lang#121389 (llvm-wrapper: fix few warnings) - rust-lang#121493 (By changing some attributes to only_local, reducing encoding attributes in the crate metadate.) - rust-lang#121615 (Move `emit_stashed_diagnostic` call in rustfmt.) - rust-lang#121617 (Actually use the right closure kind when checking async Fn goals) - rust-lang#121628 (Do not const prop unions) - rust-lang#121629 (fix some references to no-longer-existing ReprOptions.layout_seed) r? `@ghost` `@rustbot` modify labels: rollup
2 parents b79db43 + 81eddb3 commit 829308e

File tree

18 files changed

+169
-68
lines changed

18 files changed

+169
-68
lines changed

‎compiler/rustc_abi/src/layout.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -958,7 +958,7 @@ fn univariant<
958958
#[cfg(feature = "randomize")]
959959
{
960960
use rand::{seq::SliceRandom, SeedableRng};
961-
// `ReprOptions.layout_seed` is a deterministic seed we can use to randomize field
961+
// `ReprOptions.field_shuffle_seed` is a deterministic seed we can use to randomize field
962962
// ordering.
963963
let mut rng =
964964
rand_xoshiro::Xoshiro128StarStar::seed_from_u64(repr.field_shuffle_seed);

‎compiler/rustc_abi/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ bitflags! {
4141
// Internal only for now. If true, don't reorder fields.
4242
const IS_LINEAR = 1 << 3;
4343
// If true, the type's layout can be randomized using
44-
// the seed stored in `ReprOptions.layout_seed`
44+
// the seed stored in `ReprOptions.field_shuffle_seed`
4545
const RANDOMIZE_LAYOUT = 1 << 4;
4646
// Any of these flags being set prevent field reordering optimisation.
4747
const IS_UNOPTIMISABLE = ReprFlags::IS_C.bits()

‎compiler/rustc_codegen_llvm/src/back/write.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ use rustc_span::InnerSpan;
3636
use rustc_target::spec::{CodeModel, RelocModel, SanitizerSet, SplitDebuginfo, TlsModel};
3737

3838
use crate::llvm::diagnostic::OptimizationDiagnosticKind;
39-
use libc::{c_char, c_int, c_uint, c_void, size_t};
39+
use libc::{c_char, c_int, c_void, size_t};
4040
use std::ffi::CString;
4141
use std::fs;
4242
use std::io::{self, Write};
@@ -406,7 +406,7 @@ fn report_inline_asm(
406406
cgcx: &CodegenContext<LlvmCodegenBackend>,
407407
msg: String,
408408
level: llvm::DiagnosticLevel,
409-
mut cookie: c_uint,
409+
mut cookie: u64,
410410
source: Option<(String, Vec<InnerSpan>)>,
411411
) {
412412
// In LTO build we may get srcloc values from other crates which are invalid
@@ -420,7 +420,7 @@ fn report_inline_asm(
420420
llvm::DiagnosticLevel::Warning => Level::Warning,
421421
llvm::DiagnosticLevel::Note | llvm::DiagnosticLevel::Remark => Level::Note,
422422
};
423-
cgcx.diag_emitter.inline_asm_error(cookie as u32, msg, level, source);
423+
cgcx.diag_emitter.inline_asm_error(cookie.try_into().unwrap(), msg, level, source);
424424
}
425425

426426
unsafe extern "C" fn diagnostic_handler(info: &DiagnosticInfo, user: *mut c_void) {

‎compiler/rustc_codegen_llvm/src/llvm/diagnostic.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ impl SrcMgrDiagnostic {
123123
#[derive(Clone)]
124124
pub struct InlineAsmDiagnostic {
125125
pub level: super::DiagnosticLevel,
126-
pub cookie: c_uint,
126+
pub cookie: u64,
127127
pub message: String,
128128
pub source: Option<(String, Vec<InnerSpan>)>,
129129
}
@@ -149,7 +149,7 @@ impl InlineAsmDiagnostic {
149149
let smdiag = SrcMgrDiagnostic::unpack(super::LLVMRustGetSMDiagnostic(di, &mut cookie));
150150
InlineAsmDiagnostic {
151151
level: smdiag.level,
152-
cookie,
152+
cookie: cookie.into(),
153153
message: smdiag.message,
154154
source: smdiag.source,
155155
}

‎compiler/rustc_codegen_llvm/src/llvm/ffi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2256,7 +2256,7 @@ extern "C" {
22562256
pub fn LLVMRustUnpackInlineAsmDiagnostic<'a>(
22572257
DI: &'a DiagnosticInfo,
22582258
level_out: &mut DiagnosticLevel,
2259-
cookie_out: &mut c_uint,
2259+
cookie_out: &mut u64,
22602260
message_out: &mut Option<&'a Twine>,
22612261
);
22622262

‎compiler/rustc_feature/src/builtin_attrs.rs

Lines changed: 44 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -277,25 +277,35 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
277277
ungated!(cfg_attr, Normal, template!(List: "predicate, attr1, attr2, ..."), DuplicatesOk),
278278

279279
// Testing:
280-
ungated!(ignore, Normal, template!(Word, NameValueStr: "reason"), WarnFollowing),
280+
ungated!(
281+
ignore, Normal, template!(Word, NameValueStr: "reason"), WarnFollowing,
282+
@only_local: true,
283+
),
281284
ungated!(
282285
should_panic, Normal,
283286
template!(Word, List: r#"expected = "reason""#, NameValueStr: "reason"), FutureWarnFollowing,
287+
@only_local: true,
284288
),
285289
// FIXME(Centril): This can be used on stable but shouldn't.
286-
ungated!(reexport_test_harness_main, CrateLevel, template!(NameValueStr: "name"), ErrorFollowing),
290+
ungated!(
291+
reexport_test_harness_main, CrateLevel, template!(NameValueStr: "name"), ErrorFollowing,
292+
@only_local: true,
293+
),
287294

288295
// Macros:
289296
ungated!(automatically_derived, Normal, template!(Word), WarnFollowing),
290-
ungated!(macro_use, Normal, template!(Word, List: "name1, name2, ..."), WarnFollowingWordOnly),
291-
ungated!(macro_escape, Normal, template!(Word), WarnFollowing), // Deprecated synonym for `macro_use`.
297+
ungated!(
298+
macro_use, Normal, template!(Word, List: "name1, name2, ..."), WarnFollowingWordOnly,
299+
@only_local: true,
300+
),
301+
ungated!(macro_escape, Normal, template!(Word), WarnFollowing, @only_local: true), // Deprecated synonym for `macro_use`.
292302
ungated!(macro_export, Normal, template!(Word, List: "local_inner_macros"), WarnFollowing),
293-
ungated!(proc_macro, Normal, template!(Word), ErrorFollowing),
303+
ungated!(proc_macro, Normal, template!(Word), ErrorFollowing, @only_local: true),
294304
ungated!(
295-
proc_macro_derive, Normal,
296-
template!(List: "TraitName, /*opt*/ attributes(name1, name2, ...)"), ErrorFollowing,
305+
proc_macro_derive, Normal, template!(List: "TraitName, /*opt*/ attributes(name1, name2, ...)"),
306+
ErrorFollowing, @only_local: true,
297307
),
298-
ungated!(proc_macro_attribute, Normal, template!(Word), ErrorFollowing),
308+
ungated!(proc_macro_attribute, Normal, template!(Word), ErrorFollowing, @only_local: true),
299309

300310
// Lints:
301311
ungated!(
@@ -308,7 +318,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
308318
),
309319
gated!(
310320
expect, Normal, template!(List: r#"lint1, lint2, ..., /*opt*/ reason = "...""#), DuplicatesOk,
311-
lint_reasons, experimental!(expect)
321+
@only_local: true, lint_reasons, experimental!(expect)
312322
),
313323
ungated!(
314324
forbid, Normal, template!(List: r#"lint1, lint2, ..., /*opt*/ reason = "...""#),
@@ -334,32 +344,48 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
334344
),
335345

336346
// Crate properties:
337-
ungated!(crate_name, CrateLevel, template!(NameValueStr: "name"), FutureWarnFollowing),
338-
ungated!(crate_type, CrateLevel, template!(NameValueStr: "bin|lib|..."), DuplicatesOk),
347+
ungated!(
348+
crate_name, CrateLevel, template!(NameValueStr: "name"), FutureWarnFollowing,
349+
@only_local: true,
350+
),
351+
ungated!(
352+
crate_type, CrateLevel, template!(NameValueStr: "bin|lib|..."), DuplicatesOk,
353+
@only_local: true,
354+
),
339355
// crate_id is deprecated
340-
ungated!(crate_id, CrateLevel, template!(NameValueStr: "ignored"), FutureWarnFollowing),
356+
ungated!(
357+
crate_id, CrateLevel, template!(NameValueStr: "ignored"), FutureWarnFollowing,
358+
@only_local: true,
359+
),
341360

342361
// ABI, linking, symbols, and FFI
343362
ungated!(
344363
link, Normal,
345364
template!(List: r#"name = "...", /*opt*/ kind = "dylib|static|...", /*opt*/ wasm_import_module = "...", /*opt*/ import_name_type = "decorated|noprefix|undecorated""#),
346365
DuplicatesOk,
366+
@only_local: true,
347367
),
348368
ungated!(link_name, Normal, template!(NameValueStr: "name"), FutureWarnPreceding),
349-
ungated!(no_link, Normal, template!(Word), WarnFollowing),
369+
ungated!(no_link, Normal, template!(Word), WarnFollowing, @only_local: true),
350370
ungated!(repr, Normal, template!(List: "C"), DuplicatesOk, @only_local: true),
351-
ungated!(export_name, Normal, template!(NameValueStr: "name"), FutureWarnPreceding),
352-
ungated!(link_section, Normal, template!(NameValueStr: "name"), FutureWarnPreceding),
371+
ungated!(export_name, Normal, template!(NameValueStr: "name"), FutureWarnPreceding, @only_local: true),
372+
ungated!(link_section, Normal, template!(NameValueStr: "name"), FutureWarnPreceding, @only_local: true),
353373
ungated!(no_mangle, Normal, template!(Word), WarnFollowing, @only_local: true),
354374
ungated!(used, Normal, template!(Word, List: "compiler|linker"), WarnFollowing, @only_local: true),
355375
ungated!(link_ordinal, Normal, template!(List: "ordinal"), ErrorPreceding),
356376

357377
// Limits:
358-
ungated!(recursion_limit, CrateLevel, template!(NameValueStr: "N"), FutureWarnFollowing),
359-
ungated!(type_length_limit, CrateLevel, template!(NameValueStr: "N"), FutureWarnFollowing),
378+
ungated!(
379+
recursion_limit, CrateLevel, template!(NameValueStr: "N"), FutureWarnFollowing,
380+
@only_local: true
381+
),
382+
ungated!(
383+
type_length_limit, CrateLevel, template!(NameValueStr: "N"), FutureWarnFollowing,
384+
@only_local: true
385+
),
360386
gated!(
361387
move_size_limit, CrateLevel, template!(NameValueStr: "N"), ErrorFollowing,
362-
large_assignments, experimental!(move_size_limit)
388+
@only_local: true, large_assignments, experimental!(move_size_limit)
363389
),
364390

365391
// Entry point:

‎compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ typedef RustArchiveIterator *LLVMRustArchiveIteratorRef;
6767

6868
extern "C" LLVMRustArchiveRef LLVMRustOpenArchive(char *Path) {
6969
ErrorOr<std::unique_ptr<MemoryBuffer>> BufOr =
70-
MemoryBuffer::getFile(Path, -1, false);
70+
MemoryBuffer::getFile(Path, /*IsText*/false, /*RequiresNullTerminator=*/false);
7171
if (!BufOr) {
7272
LLVMRustSetLastError(BufOr.getError().message().c_str());
7373
return nullptr;

‎compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1262,7 +1262,7 @@ enum class LLVMRustDiagnosticLevel {
12621262
extern "C" void
12631263
LLVMRustUnpackInlineAsmDiagnostic(LLVMDiagnosticInfoRef DI,
12641264
LLVMRustDiagnosticLevel *LevelOut,
1265-
unsigned *CookieOut,
1265+
uint64_t *CookieOut,
12661266
LLVMTwineRef *MessageOut) {
12671267
// Undefined to call this not on an inline assembly diagnostic!
12681268
llvm::DiagnosticInfoInlineAsm *IA =

‎compiler/rustc_mir_transform/src/known_panics_lint.rs

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -585,20 +585,32 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
585585
val.into()
586586
}
587587

588-
Aggregate(ref kind, ref fields) => Value::Aggregate {
589-
fields: fields
590-
.iter()
591-
.map(|field| self.eval_operand(field).map_or(Value::Uninit, Value::Immediate))
592-
.collect(),
593-
variant: match **kind {
594-
AggregateKind::Adt(_, variant, _, _, _) => variant,
595-
AggregateKind::Array(_)
596-
| AggregateKind::Tuple
597-
| AggregateKind::Closure(_, _)
598-
| AggregateKind::Coroutine(_, _)
599-
| AggregateKind::CoroutineClosure(_, _) => VariantIdx::new(0),
600-
},
601-
},
588+
Aggregate(ref kind, ref fields) => {
589+
// Do not const pop union fields as they can be
590+
// made to produce values that don't match their
591+
// underlying layout's type (see ICE #121534).
592+
// If the last element of the `Adt` tuple
593+
// is `Some` it indicates the ADT is a union
594+
if let AggregateKind::Adt(_, _, _, _, Some(_)) = **kind {
595+
return None;
596+
};
597+
Value::Aggregate {
598+
fields: fields
599+
.iter()
600+
.map(|field| {
601+
self.eval_operand(field).map_or(Value::Uninit, Value::Immediate)
602+
})
603+
.collect(),
604+
variant: match **kind {
605+
AggregateKind::Adt(_, variant, _, _, _) => variant,
606+
AggregateKind::Array(_)
607+
| AggregateKind::Tuple
608+
| AggregateKind::Closure(_, _)
609+
| AggregateKind::Coroutine(_, _)
610+
| AggregateKind::CoroutineClosure(_, _) => VariantIdx::new(0),
611+
},
612+
}
613+
}
602614

603615
Repeat(ref op, n) => {
604616
trace!(?op, ?n);

‎compiler/rustc_trait_selection/src/traits/select/confirmation.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,8 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
934934
(trait_ref, Ty::from_closure_kind(tcx, ty::ClosureKind::Fn))
935935
}
936936
ty::Closure(_, args) => {
937-
let sig = args.as_closure().sig();
937+
let args = args.as_closure();
938+
let sig = args.sig();
938939
let trait_ref = sig.map_bound(|sig| {
939940
ty::TraitRef::new(
940941
self.tcx(),
@@ -950,7 +951,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
950951
ty::TraitRef::new(tcx, future_trait_def_id, [sig.output()])
951952
}),
952953
));
953-
(trait_ref, Ty::from_closure_kind(tcx, ty::ClosureKind::Fn))
954+
(trait_ref, args.kind_ty())
954955
}
955956
_ => bug!("expected callable type for AsyncFn candidate"),
956957
};

‎src/tools/rustfmt/src/formatting.rs

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,19 +109,29 @@ fn format_project<T: FormatHandler>(
109109
let main_file = input.file_name();
110110
let input_is_stdin = main_file == FileName::Stdin;
111111

112-
let parse_session = ParseSess::new(config)?;
112+
let mut parse_session = ParseSess::new(config)?;
113113
if config.skip_children() && parse_session.ignore_file(&main_file) {
114114
return Ok(FormatReport::new());
115115
}
116116

117117
// Parse the crate.
118118
let mut report = FormatReport::new();
119119
let directory_ownership = input.to_directory_ownership();
120-
let krate = match Parser::parse_crate(input, &parse_session) {
121-
Ok(krate) => krate,
122-
// Surface parse error via Session (errors are merged there from report)
123-
Err(e) => {
124-
let forbid_verbose = input_is_stdin || e != ParserError::ParsePanicError;
120+
121+
// rustfmt doesn't use `run_compiler` like other tools, so it must emit any
122+
// stashed diagnostics itself, otherwise the `DiagCtxt` will assert when
123+
// dropped. The final result here combines the parsing result and the
124+
// `emit_stashed_diagnostics` result.
125+
let parse_res = Parser::parse_crate(input, &parse_session);
126+
let stashed_res = parse_session.emit_stashed_diagnostics();
127+
let krate = match (parse_res, stashed_res) {
128+
(Ok(krate), None) => krate,
129+
(parse_res, _) => {
130+
// Surface parse error via Session (errors are merged there from report).
131+
let forbid_verbose = match parse_res {
132+
Err(e) if e != ParserError::ParsePanicError => true,
133+
_ => input_is_stdin,
134+
};
125135
should_emit_verbose(forbid_verbose, config, || {
126136
eprintln!("The Rust parser panicked");
127137
});

‎src/tools/rustfmt/src/parse/parser.rs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -162,22 +162,14 @@ impl<'a> Parser<'a> {
162162

163163
fn parse_crate_mod(&mut self) -> Result<ast::Crate, ParserError> {
164164
let mut parser = AssertUnwindSafe(&mut self.parser);
165-
166-
// rustfmt doesn't use `run_compiler` like other tools, so it must emit
167-
// any stashed diagnostics itself, otherwise the `DiagCtxt` will assert
168-
// when dropped. The final result here combines the parsing result and
169-
// the `emit_stashed_diagnostics` result.
170-
let parse_res = catch_unwind(move || parser.parse_crate_mod());
171-
let stashed_res = self.parser.dcx().emit_stashed_diagnostics();
172165
let err = Err(ParserError::ParsePanicError);
173-
match (parse_res, stashed_res) {
174-
(Ok(Ok(k)), None) => Ok(k),
175-
(Ok(Ok(_)), Some(_guar)) => err,
176-
(Ok(Err(db)), _) => {
166+
match catch_unwind(move || parser.parse_crate_mod()) {
167+
Ok(Ok(k)) => Ok(k),
168+
Ok(Err(db)) => {
177169
db.emit();
178170
err
179171
}
180-
(Err(_), _) => err,
172+
Err(_) => err,
181173
}
182174
}
183175
}

‎src/tools/rustfmt/src/parse/session.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use rustc_data_structures::sync::{IntoDynSyncSend, Lrc};
66
use rustc_errors::emitter::{DynEmitter, Emitter, HumanEmitter};
77
use rustc_errors::translation::Translate;
88
use rustc_errors::{
9-
ColorConfig, DiagCtxt, Diagnostic, DiagnosticBuilder, Level as DiagnosticLevel,
9+
ColorConfig, DiagCtxt, Diagnostic, DiagnosticBuilder, ErrorGuaranteed, Level as DiagnosticLevel,
1010
};
1111
use rustc_session::parse::ParseSess as RawParseSess;
1212
use rustc_span::{
@@ -230,6 +230,10 @@ impl ParseSess {
230230
self.ignore_path_set.as_ref().is_match(path)
231231
}
232232

233+
pub(crate) fn emit_stashed_diagnostics(&mut self) -> Option<ErrorGuaranteed> {
234+
self.parse_sess.dcx.emit_stashed_diagnostics()
235+
}
236+
233237
pub(crate) fn set_silent_emitter(&mut self) {
234238
self.parse_sess.dcx = DiagCtxt::with_emitter(silent_emitter());
235239
}

‎src/tools/rustfmt/src/test/parser.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,10 @@ fn crate_parsing_stashed_diag() {
6262
let filename = "tests/parser/stashed-diag.rs";
6363
assert_parser_error(filename);
6464
}
65+
66+
#[test]
67+
fn crate_parsing_stashed_diag2() {
68+
// See also https://github.com/rust-lang/rust/issues/121517
69+
let filename = "tests/parser/stashed-diag2.rs";
70+
assert_parser_error(filename);
71+
}

‎src/tools/rustfmt/tests/parser/stashed-diag2.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
trait Trait<'1> { s> {}
2+
3+
fn main() {}

‎tests/ui/async-await/async-closures/wrong-fn-kind.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
//@ edition:2021
22

3-
// FIXME(async_closures): This needs a better error message!
4-
53
#![feature(async_closure)]
64

75
fn main() {
@@ -12,4 +10,10 @@ fn main() {
1210
//~^ ERROR expected a closure that implements the `async Fn` trait, but this closure only implements `async FnMut`
1311
x += 1;
1412
});
13+
14+
let x = String::new();
15+
needs_async_fn(move || async move {
16+
//~^ ERROR expected a closure that implements the `async Fn` trait, but this closure only implements `async FnOnce`
17+
println!("{x}");
18+
});
1519
}

0 commit comments

Comments
 (0)