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

Author: bors

compiler/rustc_abi/src/layout.rs

@@ -958,7 +958,7 @@ fn univariant<
  #[cfg(feature = "randomize")]
  {
  use rand::{seq::SliceRandom, SeedableRng};
- // `ReprOptions.layout_seed` is a deterministic seed we can use to randomize field
+ // `ReprOptions.field_shuffle_seed` is a deterministic seed we can use to randomize field
  // ordering.
  let mut rng =
  rand_xoshiro::Xoshiro128StarStar::seed_from_u64(repr.field_shuffle_seed);

compiler/rustc_abi/src/lib.rs

@@ -41,7 +41,7 @@ bitflags! {
  // Internal only for now. If true, don't reorder fields.
  const IS_LINEAR = 1 << 3;
  // If true, the type's layout can be randomized using
- // the seed stored in `ReprOptions.layout_seed`
+ // the seed stored in `ReprOptions.field_shuffle_seed`
  const RANDOMIZE_LAYOUT = 1 << 4;
  // Any of these flags being set prevent field reordering optimisation.
  const IS_UNOPTIMISABLE = ReprFlags::IS_C.bits()

compiler/rustc_codegen_llvm/src/back/write.rs

@@ -36,7 +36,7 @@ use rustc_span::InnerSpan;
 use rustc_target::spec::{CodeModel, RelocModel, SanitizerSet, SplitDebuginfo, TlsModel};
 
 use crate::llvm::diagnostic::OptimizationDiagnosticKind;
-use libc::{c_char, c_int, c_uint, c_void, size_t};
+use libc::{c_char, c_int, c_void, size_t};
 use std::ffi::CString;
 use std::fs;
 use std::io::{self, Write};
@@ -406,7 +406,7 @@ fn report_inline_asm(
  cgcx: &CodegenContext<LlvmCodegenBackend>,
  msg: String,
  level: llvm::DiagnosticLevel,
- mut cookie: c_uint,
+ mut cookie: u64,
  source: Option<(String, Vec<InnerSpan>)>,
 ) {
  // In LTO build we may get srcloc values from other crates which are invalid
@@ -420,7 +420,7 @@ fn report_inline_asm(
  llvm::DiagnosticLevel::Warning => Level::Warning,
  llvm::DiagnosticLevel::Note | llvm::DiagnosticLevel::Remark => Level::Note,
  };
- cgcx.diag_emitter.inline_asm_error(cookie as u32, msg, level, source);
+ cgcx.diag_emitter.inline_asm_error(cookie.try_into().unwrap(), msg, level, source);
 }
 
 unsafe extern "C" fn diagnostic_handler(info: &DiagnosticInfo, user: *mut c_void) {

compiler/rustc_codegen_llvm/src/llvm/diagnostic.rs

@@ -123,7 +123,7 @@ impl SrcMgrDiagnostic {
 #[derive(Clone)]
 pub struct InlineAsmDiagnostic {
  pub level: super::DiagnosticLevel,
- pub cookie: c_uint,
+ pub cookie: u64,
  pub message: String,
  pub source: Option<(String, Vec<InnerSpan>)>,
 }
@@ -149,7 +149,7 @@ impl InlineAsmDiagnostic {
  let smdiag = SrcMgrDiagnostic::unpack(super::LLVMRustGetSMDiagnostic(di, &mut cookie));
  InlineAsmDiagnostic {
  level: smdiag.level,
- cookie,
+ cookie: cookie.into(),
  message: smdiag.message,
  source: smdiag.source,
  }

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

@@ -2256,7 +2256,7 @@ extern "C" {
  pub fn LLVMRustUnpackInlineAsmDiagnostic<'a>(
  DI: &'a DiagnosticInfo,
  level_out: &mut DiagnosticLevel,
- cookie_out: &mut c_uint,
+ cookie_out: &mut u64,
  message_out: &mut Option<&'a Twine>,
  );
 

compiler/rustc_feature/src/builtin_attrs.rs

@@ -277,25 +277,35 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
  ungated!(cfg_attr, Normal, template!(List: "predicate, attr1, attr2, ..."), DuplicatesOk),
 
  // Testing:
- ungated!(ignore, Normal, template!(Word, NameValueStr: "reason"), WarnFollowing),
+ ungated!(
+ ignore, Normal, template!(Word, NameValueStr: "reason"), WarnFollowing,
+ @only_local: true,
+ ),
  ungated!(
  should_panic, Normal,
  template!(Word, List: r#"expected = "reason""#, NameValueStr: "reason"), FutureWarnFollowing,
+ @only_local: true,
  ),
  // FIXME(Centril): This can be used on stable but shouldn't.
- ungated!(reexport_test_harness_main, CrateLevel, template!(NameValueStr: "name"), ErrorFollowing),
+ ungated!(
+ reexport_test_harness_main, CrateLevel, template!(NameValueStr: "name"), ErrorFollowing,
+ @only_local: true,
+ ),
 
  // Macros:
  ungated!(automatically_derived, Normal, template!(Word), WarnFollowing),
- ungated!(macro_use, Normal, template!(Word, List: "name1, name2, ..."), WarnFollowingWordOnly),
- ungated!(macro_escape, Normal, template!(Word), WarnFollowing), // Deprecated synonym for `macro_use`.
+ ungated!(
+ macro_use, Normal, template!(Word, List: "name1, name2, ..."), WarnFollowingWordOnly,
+ @only_local: true,
+ ),
+ ungated!(macro_escape, Normal, template!(Word), WarnFollowing, @only_local: true), // Deprecated synonym for `macro_use`.
  ungated!(macro_export, Normal, template!(Word, List: "local_inner_macros"), WarnFollowing),
- ungated!(proc_macro, Normal, template!(Word), ErrorFollowing),
+ ungated!(proc_macro, Normal, template!(Word), ErrorFollowing, @only_local: true),
  ungated!(
- proc_macro_derive, Normal,
- template!(List: "TraitName, /*opt*/ attributes(name1, name2, ...)"), ErrorFollowing,
+ proc_macro_derive, Normal, template!(List: "TraitName, /*opt*/ attributes(name1, name2, ...)"),
+ ErrorFollowing, @only_local: true,
  ),
- ungated!(proc_macro_attribute, Normal, template!(Word), ErrorFollowing),
+ ungated!(proc_macro_attribute, Normal, template!(Word), ErrorFollowing, @only_local: true),
 
  // Lints:
  ungated!(
@@ -308,7 +318,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
  ),
  gated!(
  expect, Normal, template!(List: r#"lint1, lint2, ..., /*opt*/ reason = "...""#), DuplicatesOk,
- lint_reasons, experimental!(expect)
+ @only_local: true, lint_reasons, experimental!(expect)
  ),
  ungated!(
  forbid, Normal, template!(List: r#"lint1, lint2, ..., /*opt*/ reason = "...""#),
@@ -334,32 +344,48 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
  ),
 
  // Crate properties:
- ungated!(crate_name, CrateLevel, template!(NameValueStr: "name"), FutureWarnFollowing),
- ungated!(crate_type, CrateLevel, template!(NameValueStr: "bin|lib|..."), DuplicatesOk),
+ ungated!(
+ crate_name, CrateLevel, template!(NameValueStr: "name"), FutureWarnFollowing,
+ @only_local: true,
+ ),
+ ungated!(
+ crate_type, CrateLevel, template!(NameValueStr: "bin|lib|..."), DuplicatesOk,
+ @only_local: true,
+ ),
  // crate_id is deprecated
- ungated!(crate_id, CrateLevel, template!(NameValueStr: "ignored"), FutureWarnFollowing),
+ ungated!(
+ crate_id, CrateLevel, template!(NameValueStr: "ignored"), FutureWarnFollowing,
+ @only_local: true,
+ ),
 
  // ABI, linking, symbols, and FFI
  ungated!(
  link, Normal,
  template!(List: r#"name = "...", /*opt*/ kind = "dylib|static|...", /*opt*/ wasm_import_module = "...", /*opt*/ import_name_type = "decorated|noprefix|undecorated""#),
  DuplicatesOk,
+ @only_local: true,
  ),
  ungated!(link_name, Normal, template!(NameValueStr: "name"), FutureWarnPreceding),
- ungated!(no_link, Normal, template!(Word), WarnFollowing),
+ ungated!(no_link, Normal, template!(Word), WarnFollowing, @only_local: true),
  ungated!(repr, Normal, template!(List: "C"), DuplicatesOk, @only_local: true),
- ungated!(export_name, Normal, template!(NameValueStr: "name"), FutureWarnPreceding),
- ungated!(link_section, Normal, template!(NameValueStr: "name"), FutureWarnPreceding),
+ ungated!(export_name, Normal, template!(NameValueStr: "name"), FutureWarnPreceding, @only_local: true),
+ ungated!(link_section, Normal, template!(NameValueStr: "name"), FutureWarnPreceding, @only_local: true),
  ungated!(no_mangle, Normal, template!(Word), WarnFollowing, @only_local: true),
  ungated!(used, Normal, template!(Word, List: "compiler|linker"), WarnFollowing, @only_local: true),
  ungated!(link_ordinal, Normal, template!(List: "ordinal"), ErrorPreceding),
 
  // Limits:
- ungated!(recursion_limit, CrateLevel, template!(NameValueStr: "N"), FutureWarnFollowing),
- ungated!(type_length_limit, CrateLevel, template!(NameValueStr: "N"), FutureWarnFollowing),
+ ungated!(
+ recursion_limit, CrateLevel, template!(NameValueStr: "N"), FutureWarnFollowing,
+ @only_local: true
+ ),
+ ungated!(
+ type_length_limit, CrateLevel, template!(NameValueStr: "N"), FutureWarnFollowing,
+ @only_local: true
+ ),
  gated!(
  move_size_limit, CrateLevel, template!(NameValueStr: "N"), ErrorFollowing,
- large_assignments, experimental!(move_size_limit)
+ @only_local: true, large_assignments, experimental!(move_size_limit)
  ),
 
  // Entry point:

compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp

@@ -67,7 +67,7 @@ typedef RustArchiveIterator *LLVMRustArchiveIteratorRef;
 
 extern "C" LLVMRustArchiveRef LLVMRustOpenArchive(char *Path) {
  ErrorOr<std::unique_ptr<MemoryBuffer>> BufOr =
- MemoryBuffer::getFile(Path, -1, false);
+ MemoryBuffer::getFile(Path, /*IsText*/false, /*RequiresNullTerminator=*/false);
  if (!BufOr) {
  LLVMRustSetLastError(BufOr.getError().message().c_str());
  return nullptr;

compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp

@@ -1262,7 +1262,7 @@ enum class LLVMRustDiagnosticLevel {
 extern "C" void
 LLVMRustUnpackInlineAsmDiagnostic(LLVMDiagnosticInfoRef DI,
  LLVMRustDiagnosticLevel *LevelOut,
- unsigned *CookieOut,
+ uint64_t *CookieOut,
  LLVMTwineRef *MessageOut) {
  // Undefined to call this not on an inline assembly diagnostic!
  llvm::DiagnosticInfoInlineAsm *IA =

compiler/rustc_mir_transform/src/known_panics_lint.rs

@@ -585,20 +585,32 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
  val.into()
  }
 
- Aggregate(ref kind, ref fields) => Value::Aggregate {
- fields: fields
- .iter()
- .map(|field| self.eval_operand(field).map_or(Value::Uninit, Value::Immediate))
- .collect(),
- variant: match **kind {
- AggregateKind::Adt(_, variant, _, _, _) => variant,
- AggregateKind::Array(_)
- | AggregateKind::Tuple
- | AggregateKind::Closure(_, _)
- | AggregateKind::Coroutine(_, _)
- | AggregateKind::CoroutineClosure(_, _) => VariantIdx::new(0),
- },
- },
+ Aggregate(ref kind, ref fields) => {
+ // Do not const pop union fields as they can be
+ // made to produce values that don't match their
+ // underlying layout's type (see ICE #121534).
+ // If the last element of the `Adt` tuple
+ // is `Some` it indicates the ADT is a union
+ if let AggregateKind::Adt(_, _, _, _, Some(_)) = **kind {
+ return None;
+ };
+ Value::Aggregate {
+ fields: fields
+ .iter()
+ .map(|field| {
+ self.eval_operand(field).map_or(Value::Uninit, Value::Immediate)
+ })
+ .collect(),
+ variant: match **kind {
+ AggregateKind::Adt(_, variant, _, _, _) => variant,
+ AggregateKind::Array(_)
+ | AggregateKind::Tuple
+ | AggregateKind::Closure(_, _)
+ | AggregateKind::Coroutine(_, _)
+ | AggregateKind::CoroutineClosure(_, _) => VariantIdx::new(0),
+ },
+ }
+ }
 
  Repeat(ref op, n) => {
  trace!(?op, ?n);

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

@@ -934,7 +934,8 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
  (trait_ref, Ty::from_closure_kind(tcx, ty::ClosureKind::Fn))
  }
  ty::Closure(_, args) => {
- let sig = args.as_closure().sig();
+ let args = args.as_closure();
+ let sig = args.sig();
  let trait_ref = sig.map_bound(|sig| {
  ty::TraitRef::new(
  self.tcx(),
@@ -950,7 +951,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
  ty::TraitRef::new(tcx, future_trait_def_id, [sig.output()])
  }),
  ));
- (trait_ref, Ty::from_closure_kind(tcx, ty::ClosureKind::Fn))
+ (trait_ref, args.kind_ty())
  }
  _ => bug!("expected callable type for AsyncFn candidate"),
  };