Merge from rustc

Author: The Miri Conjob Bot

.reuse/dep5

@@ -52,7 +52,7 @@ Copyright: 2019 The Crossbeam Project Developers
  The Rust Project Developers (see https://thanks.rust-lang.org)
 License: MIT OR Apache-2.0
 
-Files: library/std/src/sys/pal/unix/locks/fuchsia_mutex.rs
+Files: library/std/src/sys/locks/mutex/fuchsia.rs
 Copyright: 2016 The Fuchsia Authors
  The Rust Project Developers (see https://thanks.rust-lang.org)
 License: BSD-2-Clause AND (MIT OR Apache-2.0)

Cargo.lock

@@ -2627,6 +2627,7 @@ dependencies = [
 "rustc-std-workspace-alloc",
 "rustc-std-workspace-core",
 "ruzstd",
+"wasmparser",
 ]
 
 [[package]]
@@ -4047,7 +4048,6 @@ dependencies = [
 name = "rustc_interface"
 version = "0.0.0"
 dependencies = [
-"libloading",
 "rustc-rayon",
 "rustc-rayon-core",
 "rustc_ast",
@@ -6128,6 +6128,16 @@ version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
 
+[[package]]
+name = "wasmparser"
+version = "0.118.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77f1154f1ab868e2a01d9834a805faca7bf8b50d041b4ca714d005d0dab1c50c"
+dependencies = [
+"indexmap",
+"semver",
+]
+
 [[package]]
 name = "web-sys"
 version = "0.3.68"

compiler/rustc_arena/src/lib.rs

@@ -95,7 +95,7 @@ impl<T> ArenaChunk<T> {
 unsafe{
 if mem::size_of::<T>() == 0{
 // A pointer as large as possible for zero-sized elements.
- ptr::invalid_mut(!0)
+ ptr::without_provenance_mut(!0)
 }else{
 self.start().add(self.storage.len())
 }

compiler/rustc_ast_lowering/src/errors.rs

@@ -1,5 +1,6 @@
 use rustc_errors::{
- codes::*,AddToDiagnostic,Diagnostic,DiagnosticArgFromDisplay,SubdiagnosticMessageOp,
+ codes::*,AddToDiagnostic,DiagnosticArgFromDisplay,DiagnosticBuilder,EmissionGuarantee,
+SubdiagnosticMessageOp,
 };
 use rustc_macros::{Diagnostic,Subdiagnostic};
 use rustc_span::{symbol::Ident,Span,Symbol};
@@ -41,7 +42,11 @@ pub struct InvalidAbi {
 pubstructInvalidAbiReason(pub&'staticstr);
 
 implAddToDiagnosticforInvalidAbiReason{
-fnadd_to_diagnostic_with<F:SubdiagnosticMessageOp>(self,diag:&mutDiagnostic, _:F){
+fnadd_to_diagnostic_with<G:EmissionGuarantee,F:SubdiagnosticMessageOp<G>>(
+self,
+diag:&mutDiagnosticBuilder<'_,G>,
+ _:F,
+){
 #[allow(rustc::untranslatable_diagnostic)]
  diag.note(self.0);
 }

compiler/rustc_ast_lowering/src/lib.rs

@@ -1636,9 +1636,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
 ifletSome(old_def_id) = self.orig_opt_local_def_id(param){
  old_def_id
 }else{
-self.dcx()
-.span_delayed_bug(lifetime.ident.span,"no def-id for fresh lifetime");
-continue;
+self.dcx().span_bug(lifetime.ident.span,"no def-id for fresh lifetime");
 }
 }
 

compiler/rustc_ast_passes/src/ast_validation.rs

@@ -881,9 +881,10 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
 &item.vis,
  errors::VisibilityNotPermittedNote::TraitImpl,
 );
-// njn: use Dummy here
-ifletTyKind::Err(_) = self_ty.kind{
- this.dcx().emit_err(errors::ObsoleteAuto{span: item.span});
+ifletTyKind::Dummy = self_ty.kind{
+// Abort immediately otherwise the `TyKind::Dummy` will reach HIR lowering,
+// which isn't allowed. Not a problem for this obscure, obsolete syntax.
+ this.dcx().emit_fatal(errors::ObsoleteAuto{span: item.span});
 }
 iflet(&Unsafe::Yes(span),&ImplPolarity::Negative(sp)) = (unsafety, polarity)
 {

compiler/rustc_ast_passes/src/errors.rs

@@ -1,7 +1,10 @@
 //! Errors emitted by ast_passes.
 
 use rustc_ast::ParamKindOrd;
-use rustc_errors::{codes::*,AddToDiagnostic,Applicability,Diagnostic,SubdiagnosticMessageOp};
+use rustc_errors::{
+ codes::*,AddToDiagnostic,Applicability,DiagnosticBuilder,EmissionGuarantee,
+SubdiagnosticMessageOp,
+};
 use rustc_macros::{Diagnostic,Subdiagnostic};
 use rustc_span::{symbol::Ident,Span,Symbol};
 
@@ -372,7 +375,11 @@ pub struct EmptyLabelManySpans(pub Vec<Span>);
 
 // The derive for `Vec<Span>` does multiple calls to `span_label`, adding commas between each
 implAddToDiagnosticforEmptyLabelManySpans{
-fnadd_to_diagnostic_with<F:SubdiagnosticMessageOp>(self,diag:&mutDiagnostic, _:F){
+fnadd_to_diagnostic_with<G:EmissionGuarantee,F:SubdiagnosticMessageOp<G>>(
+self,
+diag:&mutDiagnosticBuilder<'_,G>,
+ _:F,
+){
  diag.span_labels(self.0,"");
 }
 }
@@ -729,7 +736,11 @@ pub struct StableFeature {
 }
 
 implAddToDiagnosticforStableFeature{
-fnadd_to_diagnostic_with<F:SubdiagnosticMessageOp>(self,diag:&mutDiagnostic, _:F){
+fnadd_to_diagnostic_with<G:EmissionGuarantee,F:SubdiagnosticMessageOp<G>>(
+self,
+diag:&mutDiagnosticBuilder<'_,G>,
+ _:F,
+){
  diag.arg("name",self.name);
  diag.arg("since",self.since);
  diag.help(fluent::ast_passes_stable_since);

compiler/rustc_ast_passes/src/feature_gate.rs

@@ -22,6 +22,9 @@ macro_rules! gate {
 }};
 ($visitor:expr, $feature:ident, $span:expr, $explain:expr, $help:expr) => {{
 if !$visitor.features.$feature && !$span.allows_unstable(sym::$feature){
+// FIXME: make this translatable
+ #[allow(rustc::diagnostic_outside_of_impl)]
+ #[allow(rustc::untranslatable_diagnostic)]
  feature_err(&$visitor.sess, sym::$feature, $span, $explain).with_help($help).emit();
 }
 }};

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

@@ -6,9 +6,7 @@
 use either::Either;
 use rustc_data_structures::captures::Captures;
 use rustc_data_structures::fx::FxIndexSet;
-use rustc_errors::{
- codes::*, struct_span_code_err,Applicability,Diagnostic,DiagnosticBuilder,MultiSpan,
-};
+use rustc_errors::{codes::*, struct_span_code_err,Applicability,DiagnosticBuilder,MultiSpan};
 use rustc_hir as hir;
 use rustc_hir::def::{DefKind,Res};
 use rustc_hir::intravisit::{walk_block, walk_expr,Visitor};
@@ -635,7 +633,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
 
 fnsuggest_assign_value(
 &self,
-err:&mutDiagnostic,
+err:&mutDiagnosticBuilder<'_>,
 moved_place:PlaceRef<'tcx>,
 sugg_span:Span,
 ){
@@ -674,7 +672,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
 
 fnsuggest_borrow_fn_like(
 &self,
-err:&mutDiagnostic,
+err:&mutDiagnosticBuilder<'_>,
 ty:Ty<'tcx>,
 move_sites:&[MoveSite],
 value_name:&str,
@@ -742,7 +740,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
 
 fnsuggest_cloning(
 &self,
-err:&mutDiagnostic,
+err:&mutDiagnosticBuilder<'_>,
 ty:Ty<'tcx>,
 expr:&hir::Expr<'_>,
 span:Span,
@@ -778,7 +776,12 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
 }
 }
 
-fnsuggest_adding_copy_bounds(&self,err:&mutDiagnostic,ty:Ty<'tcx>,span:Span){
+fnsuggest_adding_copy_bounds(
+&self,
+err:&mutDiagnosticBuilder<'_>,
+ty:Ty<'tcx>,
+span:Span,
+){
 let tcx = self.infcx.tcx;
 let generics = tcx.generics_of(self.mir_def_id());
 
@@ -1225,7 +1228,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
 #[instrument(level = "debug", skip(self, err))]
 fnsuggest_using_local_if_applicable(
 &self,
-err:&mutDiagnostic,
+err:&mutDiagnosticBuilder<'_>,
 location:Location,
 issued_borrow:&BorrowData<'tcx>,
 explanation:BorrowExplanation<'tcx>,
@@ -1321,7 +1324,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
 
 fnsuggest_slice_method_if_applicable(
 &self,
-err:&mutDiagnostic,
+err:&mutDiagnosticBuilder<'_>,
 place:Place<'tcx>,
 borrowed_place:Place<'tcx>,
 ){
@@ -1430,7 +1433,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
 /// ```
 pub(crate)fnexplain_iterator_advancement_in_for_loop_if_applicable(
 &self,
-err:&mutDiagnostic,
+err:&mutDiagnosticBuilder<'_>,
 span:Span,
 issued_spans:&UseSpans<'tcx>,
 ){
@@ -1617,7 +1620,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
 /// ```
 fnsuggest_using_closure_argument_instead_of_capture(
 &self,
-err:&mutDiagnostic,
+err:&mutDiagnosticBuilder<'_>,
 borrowed_place:Place<'tcx>,
 issued_spans:&UseSpans<'tcx>,
 ){
@@ -1751,7 +1754,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
 
 fnsuggest_binding_for_closure_capture_self(
 &self,
-err:&mutDiagnostic,
+err:&mutDiagnosticBuilder<'_>,
 issued_spans:&UseSpans<'tcx>,
 ){
 letUseSpans::ClosureUse{ capture_kind_span, .. } = issued_spans else{return};
@@ -2997,7 +3000,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
 self.buffer_error(err);
 }
 
-fnexplain_deref_coercion(&mutself,loan:&BorrowData<'tcx>,err:&mutDiagnostic){
+fnexplain_deref_coercion(&mutself,loan:&BorrowData<'tcx>,err:&mutDiagnosticBuilder<'_>){
 let tcx = self.infcx.tcx;
 iflet(
 Some(Terminator{
@@ -3532,7 +3535,11 @@ enum AnnotatedBorrowFnSignature<'tcx> {
 impl<'tcx>AnnotatedBorrowFnSignature<'tcx>{
 /// Annotate the provided diagnostic with information about borrow from the fn signature that
 /// helps explain.
-pub(crate)fnemit(&self,cx:&mutMirBorrowckCtxt<'_,'tcx>,diag:&mutDiagnostic) -> String{
+pub(crate)fnemit(
+&self,
+cx:&mutMirBorrowckCtxt<'_,'tcx>,
+diag:&mutDiagnosticBuilder<'_>,
+) -> String{
 matchself{
 &AnnotatedBorrowFnSignature::Closure{ argument_ty, argument_span } => {
  diag.span_label(

compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs

@@ -3,7 +3,7 @@
 #![allow(rustc::diagnostic_outside_of_impl)]
 #![allow(rustc::untranslatable_diagnostic)]
 
-use rustc_errors::{Applicability,Diagnostic};
+use rustc_errors::{Applicability,DiagnosticBuilder};
 use rustc_hir as hir;
 use rustc_hir::intravisit::Visitor;
 use rustc_index::IndexSlice;
@@ -65,7 +65,7 @@ impl<'tcx> BorrowExplanation<'tcx> {
 tcx:TyCtxt<'tcx>,
 body:&Body<'tcx>,
 local_names:&IndexSlice<Local,Option<Symbol>>,
-err:&mutDiagnostic,
+err:&mutDiagnosticBuilder<'_>,
 borrow_desc:&str,
 borrow_span:Option<Span>,
 multiple_borrow_span:Option<(Span,Span)>,
@@ -306,7 +306,7 @@ impl<'tcx> BorrowExplanation<'tcx> {
 fnadd_object_lifetime_default_note(
 &self,
 tcx:TyCtxt<'tcx>,
-err:&mutDiagnostic,
+err:&mutDiagnosticBuilder<'_>,
 unsize_ty:Ty<'tcx>,
 ){
 iflet ty::Adt(def, args) = unsize_ty.kind(){
@@ -359,7 +359,7 @@ impl<'tcx> BorrowExplanation<'tcx> {
 
 fnadd_lifetime_bound_suggestion_to_diagnostic(
 &self,
-err:&mutDiagnostic,
+err:&mutDiagnosticBuilder<'_>,
 category:&ConstraintCategory<'tcx>,
 span:Span,
 region_name:&RegionName,