Merge #67

67: Automated pull from upstream `stable` r=pietroalbini a=github-actions[bot] This PR pulls the following changes from the upstream repository: * rust-lang/rust#116364 * rust-lang/rust#116279 * rust-lang/rust#115819 * rust-lang/rust#116044 * rust-lang/rust#115901 * rust-lang/rust#115722 * rust-lang/rust#115442 * rust-lang/rust#115282 * rust-lang/rust#115195 * rust-lang/rust#115056 Co-authored-by: Mark Rousskov <[email protected]> Co-authored-by: bors <[email protected]> Co-authored-by: Josh Stone <[email protected]> Co-authored-by: Jack Huey <31162821 [email protected]> Co-authored-by: Weihang Lo <[email protected]> Co-authored-by: Tomasz Miąsko <[email protected]> Co-authored-by: David Tolnay <[email protected]> Co-authored-by: Scott McMurray <[email protected]> Co-authored-by: Camille GILLOT <[email protected]> Co-authored-by: Michael Howell <[email protected]> Co-authored-by: lcnr <[email protected]> Co-authored-by: klensy <[email protected]> Co-authored-by: León Orell Valerian Liehr <[email protected]> Co-authored-by: Oli Scherer <[email protected]> Co-authored-by: bohan <[email protected]> Co-authored-by: ouz-a <[email protected]> Co-authored-by: Georgii Rylov <[email protected]> Co-authored-by: Michael Goulet <[email protected]>
ferrocene · Oct 26, 2023 · 78b3b5b · 78b3b5b
2 parents f07bc96 78388c5
commit 78b3b5b
Show file tree

Hide file tree

Showing 193 changed files with 1,130 additions and 872 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -36,7 36,7 @@
 [submodule "src/llvm-project"]
  path = src/llvm-project
  url = https://github.com/rust-lang/llvm-project.git
- branch = rustc/17.0-2023-07-29
  branch = rustc/17.0-2023-09-19
  shallow = true
 [submodule "src/doc/embedded-book"]
  path = src/doc/embedded-book

diff --git a/RELEASES.md b/RELEASES.md
@@ -1,3 1,130 @@
 Version 1.73.0 (2023-10-05)
 ==========================
 
 <a id="1.73.0-Language"></a>
 
 Language
 --------
 
 - [Uplift `clippy::fn_null_check` lint as `useless_ptr_null_checks`.](https://github.com/rust-lang/rust/pull/111717/)
 - [Make `noop_method_call` warn by default.](https://github.com/rust-lang/rust/pull/111916/)
 - [Support interpolated block for `try` and `async` in macros.](https://github.com/rust-lang/rust/pull/112953/)
 - [Make `unconditional_recursion` lint detect recursive drops.](https://github.com/rust-lang/rust/pull/113902/)
 - [Future compatibility warning for some impls being incorrectly considered not overlapping.](https://github.com/rust-lang/rust/pull/114023/)
  - [The `invalid_reference_casting` lint is now **deny-by-default** (instead of allow-by-default)](https://github.com/rust-lang/rust/pull/112431)
 
 <a id="1.73.0-Compiler"></a>
 
 Compiler
 --------
 
 - [Write version information in a `.comment` section like GCC/Clang.](https://github.com/rust-lang/rust/pull/97550/)
 - [Add documentation on v0 symbol mangling.](https://github.com/rust-lang/rust/pull/97571/)
 - [Stabilize `extern "thiscall"` and `"thiscall-unwind"` ABIs.](https://github.com/rust-lang/rust/pull/114562/)
 - [Only check outlives goals on impl compared to trait.](https://github.com/rust-lang/rust/pull/109356/)
 - [Infer type in irrefutable slice patterns with fixed length as array.](https://github.com/rust-lang/rust/pull/113199/)
 - [Discard default auto trait impls if explicit ones exist.](https://github.com/rust-lang/rust/pull/113312/)
 - Add several new tier 3 targets:
  - [`aarch64-unknown-teeos`](https://github.com/rust-lang/rust/pull/113480/)
  - [`csky-unknown-linux-gnuabiv2`](https://github.com/rust-lang/rust/pull/113658/)
  - [`riscv64-linux-android`](https://github.com/rust-lang/rust/pull/112858/)
  - [`riscv64gc-unknown-hermit`](https://github.com/rust-lang/rust/pull/114004/)
  - [`x86_64-unikraft-linux-musl`](https://github.com/rust-lang/rust/pull/113411/)
  - [`x86_64-unknown-linux-ohos`](https://github.com/rust-lang/rust/pull/113061/)
 - [Add `wasm32-wasi-preview1-threads` as a tier 2 target.](https://github.com/rust-lang/rust/pull/112922/)
 
 Refer to Rust's [platform support page][platform-support-doc]
 for more information on Rust's tiered platform support.
 
 <a id="1.73.0-Libraries"></a>
 
 Libraries
 ---------
 
 - [Add `Read`, `Write` and `Seek` impls for `Arc<File>`.](https://github.com/rust-lang/rust/pull/94748/)
 - [Merge functionality of `io::Sink` into `io::Empty`.](https://github.com/rust-lang/rust/pull/98154/)
 - [Implement `RefUnwindSafe` for `Backtrace`](https://github.com/rust-lang/rust/pull/100455/)
 - [Make `ExitStatus` implement `Default`](https://github.com/rust-lang/rust/pull/106425/)
 - [`impl SliceIndex<str> for (Bound<usize>, Bound<usize>)`](https://github.com/rust-lang/rust/pull/111081/)
 - [Change default panic handler message format.](https://github.com/rust-lang/rust/pull/112849/)
 - [Cleaner `assert_eq!` & `assert_ne!` panic messages.](https://github.com/rust-lang/rust/pull/111071/)
 - [Correct the (deprecated) Android `stat` struct definitions.](https://github.com/rust-lang/rust/pull/113130/)
 
 <a id="1.73.0-Stabilized-APIs"></a>
 
 Stabilized APIs
 ---------------
 
 - [Unsigned `{integer}::div_ceil`](https://doc.rust-lang.org/stable/std/primitive.u32.html#method.div_ceil)
 - [Unsigned `{integer}::next_multiple_of`](https://doc.rust-lang.org/stable/std/primitive.u32.html#method.next_multiple_of)
 - [Unsigned `{integer}::checked_next_multiple_of`](https://doc.rust-lang.org/stable/std/primitive.u32.html#method.checked_next_multiple_of)
 - [`std::ffi::FromBytesUntilNulError`](https://doc.rust-lang.org/stable/std/ffi/struct.FromBytesUntilNulError.html)
 - [`std::os::unix::fs::chown`](https://doc.rust-lang.org/stable/std/os/unix/fs/fn.chown.html)
 - [`std::os::unix::fs::fchown`](https://doc.rust-lang.org/stable/std/os/unix/fs/fn.fchown.html)
 - [`std::os::unix::fs::lfchown`](https://doc.rust-lang.org/stable/std/os/unix/fs/fn.lchown.html)
 - [`LocalKey::<Cell<T>>::get`](https://doc.rust-lang.org/stable/std/thread/struct.LocalKey.html#method.get)
 - [`LocalKey::<Cell<T>>::set`](https://doc.rust-lang.org/stable/std/thread/struct.LocalKey.html#method.set)
 - [`LocalKey::<Cell<T>>::take`](https://doc.rust-lang.org/stable/std/thread/struct.LocalKey.html#method.take)
 - [`LocalKey::<Cell<T>>::replace`](https://doc.rust-lang.org/stable/std/thread/struct.LocalKey.html#method.replace)
 - [`LocalKey::<RefCell<T>>::with_borrow`](https://doc.rust-lang.org/stable/std/thread/struct.LocalKey.html#method.with_borrow)
 - [`LocalKey::<RefCell<T>>::with_borrow_mut`](https://doc.rust-lang.org/stable/std/thread/struct.LocalKey.html#method.with_borrow_mut)
 - [`LocalKey::<RefCell<T>>::set`](https://doc.rust-lang.org/stable/std/thread/struct.LocalKey.html#method.set-1)
 - [`LocalKey::<RefCell<T>>::take`](https://doc.rust-lang.org/stable/std/thread/struct.LocalKey.html#method.take-1)
 - [`LocalKey::<RefCell<T>>::replace`](https://doc.rust-lang.org/stable/std/thread/struct.LocalKey.html#method.replace-1)
 
 These APIs are now stable in const contexts:
 
 - [`rc::Weak::new`](https://doc.rust-lang.org/stable/alloc/rc/struct.Weak.html#method.new)
 - [`sync::Weak::new`](https://doc.rust-lang.org/stable/alloc/sync/struct.Weak.html#method.new)
 - [`NonNull::as_ref`](https://doc.rust-lang.org/stable/core/ptr/struct.NonNull.html#method.as_ref)
 
 <a id="1.73.0-Cargo"></a>
 
 Cargo
 -----
 
 - [Encode URL params correctly for `SourceId` in `Cargo.lock`.](https://github.com/rust-lang/cargo/pull/12280/)
 - [Bail out an error when using `cargo::` in custom build script.](https://github.com/rust-lang/cargo/pull/12332/)
 
 <a id="1.73.0-Misc"></a>
 
 Misc
 ----
 
 <a id="1.73.0-Compatibility-Notes"></a>
 
 Compatibility Notes
 -------------------
 
 - [Update the minimum external LLVM to 15.](https://github.com/rust-lang/rust/pull/114148/)
 - [Check for non-defining uses of return position `impl Trait`.](https://github.com/rust-lang/rust/pull/112842/)
 
 <a id="1.73.0-Internal-Changes"></a>
 
 Internal Changes
 ----------------
 
 These changes do not affect any public interfaces of Rust, but they represent
 significant improvements to the performance or internals of rustc and related
 tools.
 
 - [Remove LLVM pointee types, supporting only opaque pointers.](https://github.com/rust-lang/rust/pull/105545/)
 - [Port PGO/LTO/BOLT optimized build pipeline to Rust.](https://github.com/rust-lang/rust/pull/112235/)
 - [Replace in-tree `rustc_apfloat` with the new version of the crate.](https://github.com/rust-lang/rust/pull/113843/)
 - [Update to LLVM 17.](https://github.com/rust-lang/rust/pull/114048/)
 - [Add `internal_features` lint for internal unstable features.](https://github.com/rust-lang/rust/pull/108955/)
 - [Mention style for new syntax in tracking issue template.](https://github.com/rust-lang/rust/pull/113586/)
 
 Version 1.72.1 (2023-09-19)
 ===========================
 
 - [Adjust codegen change to improve LLVM codegen](https://github.com/rust-lang/rust/pull/115236)
 - [rustdoc: Fix self ty params in objects with lifetimes](https://github.com/rust-lang/rust/pull/115276)
 - [Fix regression in compile times](https://github.com/rust-lang/rust/pull/114948)
 - Resolve some ICE regressions in the compiler:
  - [#115215](https://github.com/rust-lang/rust/pull/115215)
  - [#115559](https://github.com/rust-lang/rust/pull/115559)
 
 Version 1.72.0 (2023-08-24)
 ==========================
 
@@ -10,9 137,9 @@ Language
 - [expand: Change how `#![cfg(FALSE)]` behaves on crate root](https://github.com/rust-lang/rust/pull/110141/)
 - [Stabilize inline asm for LoongArch64](https://github.com/rust-lang/rust/pull/111235/)
 - [Uplift `clippy::undropped_manually_drops` lint](https://github.com/rust-lang/rust/pull/111530/)
-- [Uplift `clippy::invalid_utf8_in_unchecked` lint](https://github.com/rust-lang/rust/pull/111543/)
-- [Uplift `clippy::cast_ref_to_mut` lint](https://github.com/rust-lang/rust/pull/111567/)
-- [Uplift `clippy::cmp_nan` lint](https://github.com/rust-lang/rust/pull/111818/)
 - [Uplift `clippy::invalid_utf8_in_unchecked` lint](https://github.com/rust-lang/rust/pull/111543/) as `invalid_from_utf8_unchecked` and `invalid_from_utf8`
 - [Uplift `clippy::cast_ref_to_mut` lint](https://github.com/rust-lang/rust/pull/111567/) as `invalid_reference_casting`
 - [Uplift `clippy::cmp_nan` lint](https://github.com/rust-lang/rust/pull/111818/) as `invalid_nan_comparisons`
 - [resolve: Remove artificial import ambiguity errors](https://github.com/rust-lang/rust/pull/112086/)
 - [Don't require associated types with Self: Sized bounds in `dyn Trait` objects](https://github.com/rust-lang/rust/pull/112319/)
 
@@ -65,16 192,16 @@ Rustdoc
 Stabilized APIs
 ---------------
 
-- [`impl<T: Send> Sync for mpsc::Sender<T>`](https://doc.rust-lang.org/nightly/std/sync/mpsc/struct.Sender.html#impl-Sync-for-Sender)
-- [`impl TryFrom<&OsStr> for &str`](https://doc.rust-lang.org/nightly/std/primitive.str.html#impl-TryFrom<&'a OsStr>-for-&'a str)
-- [`String::leak`](https://doc.rust-lang.org/nightly/alloc/string/struct.String.html#method.leak)
 - [`impl<T: Send> Sync for mpsc::Sender<T>`](https://doc.rust-lang.org/stable/std/sync/mpsc/struct.Sender.html#impl-Sync-for-Sender)
 - [`impl TryFrom<&OsStr> for &str`](https://doc.rust-lang.org/stable/std/primitive.str.html#impl-TryFrom<&'a OsStr>-for-&'a str)
 - [`String::leak`](https://doc.rust-lang.org/stable/alloc/string/struct.String.html#method.leak)
 
 These APIs are now stable in const contexts:
 
-- [`CStr::from_bytes_with_nul`](https://doc.rust-lang.org/nightly/std/ffi/struct.CStr.html#method.from_bytes_with_nul)
-- [`CStr::to_bytes`](https://doc.rust-lang.org/nightly/std/ffi/struct.CStr.html#method.from_bytes_with_nul)
-- [`CStr::to_bytes_with_nul`](https://doc.rust-lang.org/nightly/std/ffi/struct.CStr.html#method.from_bytes_with_nul)
-- [`CStr::to_str`](https://doc.rust-lang.org/nightly/std/ffi/struct.CStr.html#method.from_bytes_with_nul)
 - [`CStr::from_bytes_with_nul`](https://doc.rust-lang.org/stable/std/ffi/struct.CStr.html#method.from_bytes_with_nul)
 - [`CStr::to_bytes`](https://doc.rust-lang.org/stable/std/ffi/struct.CStr.html#method.to_bytes)
 - [`CStr::to_bytes_with_nul`](https://doc.rust-lang.org/stable/std/ffi/struct.CStr.html#method.to_bytes_with_nul)
 - [`CStr::to_str`](https://doc.rust-lang.org/stable/std/ffi/struct.CStr.html#method.to_str)
 
 <a id="1.72.0-Cargo"></a>
 
@@ -103,6 230,16 @@ Compatibility Notes
  to a registry.
  [#12291](https://github.com/rust-lang/cargo/pull/12291)
 
 Version 1.71.1 (2023-08-03)
 ===========================
 
 - [Fix CVE-2023-38497: Cargo did not respect the umask when extracting dependencies](https://github.com/rust-lang/cargo/security/advisories/GHSA-j3xp-wfr4-hx87)
 - [Fix bash completion for users of Rustup](https://github.com/rust-lang/rust/pull/113579)
 - [Do not show `suspicious_double_ref_op` lint when calling `borrow()`](https://github.com/rust-lang/rust/pull/112517)
 - [Fix ICE: substitute types before checking inlining compatibility](https://github.com/rust-lang/rust/pull/113802)
 - [Fix ICE: don't use `can_eq` in `derive(..)` suggestion for missing method](https://github.com/rust-lang/rust/pull/111516)
 - [Fix building Rust 1.71.0 from the source tarball](https://github.com/rust-lang/rust/issues/113678)
 
 Version 1.71.0 (2023-07-13)
 ==========================
 

diff --git a/compiler/rustc_codegen_llvm/src/type_of.rs b/compiler/rustc_codegen_llvm/src/type_of.rs
@@ -405,7 405,11 @@ impl<'tcx> LayoutLlvmExt<'tcx> for TyAndLayout<'tcx> {
 
  // Vectors, even for non-power-of-two sizes, have the same layout as
  // arrays but don't count as aggregate types
  // While LLVM theoretically supports non-power-of-two sizes, and they
  // often work fine, sometimes x86-isel deals with them horribly
  // (see #115212) so for now only use power-of-two ones.
  if let FieldsShape::Array { count, .. } = self.layout.fields()
  && count.is_power_of_two()
  && let element = self.field(cx, 0)
  && element.ty.is_integral()
  {

diff --git a/compiler/rustc_codegen_ssa/src/mir/debuginfo.rs b/compiler/rustc_codegen_ssa/src/mir/debuginfo.rs
@@ -435,9 435,23 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
  bx.store(place.llval, alloca.llval, alloca.align);
 
  // Point the debug info to `*alloca` for the current variable
- bx.dbg_var_addr(dbg_var, dbg_loc, alloca.llval, Size::ZERO, &[Size::ZERO], None);
  bx.dbg_var_addr(
  dbg_var,
  dbg_loc,
  alloca.llval,
  Size::ZERO,
  &[Size::ZERO],
  var.fragment,
  );
  } else {
- bx.dbg_var_addr(dbg_var, dbg_loc, base.llval, direct_offset, &indirect_offsets, None);
  bx.dbg_var_addr(
  dbg_var,
  dbg_loc,
  base.llval,
  direct_offset,
  &indirect_offsets,
  var.fragment,
  );
  }
  }
 
@@ -560,17 574,22 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
  }
 
  let place = fragment.contents;
  let fragment = if fragment_layout.size == Size::ZERO {
  // Fragment is a ZST, so does not represent anything.
  continue;
  } else if fragment_layout.size == var_layout.size {
  // Fragment covers entire variable, so as far as
  // DWARF is concerned, it's not really a fragment.
  None
  } else {
  Some(fragment_start..fragment_start fragment_layout.size)
  };
 
  per_local[place.local].push(PerLocalVarDebugInfo {
  name: var.name,
  source_info: var.source_info,
  dbg_var,
- fragment: if fragment_layout.size == var_layout.size {
- // Fragment covers entire variable, so as far as
- // DWARF is concerned, it's not really a fragment.
- None
- } else {
- Some(fragment_start..fragment_start fragment_layout.size)
- },
  fragment,
  projection: place.projection,
  });
  }

diff --git a/compiler/rustc_codegen_ssa/src/mir/locals.rs b/compiler/rustc_codegen_ssa/src/mir/locals.rs
@@ -7,7 7,6 @@ use rustc_index::IndexVec;
 use rustc_middle::mir;
 use rustc_middle::ty::print::with_no_trimmed_paths;
 use std::ops::{Index, IndexMut};
-
 pub(super) struct Locals<'tcx, V> {
  values: IndexVec<mir::Local, LocalRef<'tcx, V>>,
 }
@@ -36,17 35,18 @@ impl<'tcx, V> Locals<'tcx, V> {
 impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
  pub(super) fn initialize_locals(&mut self, values: Vec<LocalRef<'tcx, Bx::Value>>) {
  assert!(self.locals.values.is_empty());
-
  // FIXME(#115215): After #115025 get's merged this might not be necessary
  for (local, value) in values.into_iter().enumerate() {
  match value {
  LocalRef::Place(_) | LocalRef::UnsizedPlace(_) | LocalRef::PendingOperand => (),
  LocalRef::Operand(op) => {
  let local = mir::Local::from_usize(local);
  let expected_ty = self.monomorphize(self.mir.local_decls[local].ty);
- assert_eq!(expected_ty, op.layout.ty, "unexpected initial operand type");
  if expected_ty != op.layout.ty {
  warn!("Unexpected initial operand type. See the issues/114858");
  }
  }
  }
-
  self.locals.values.push(value);
  }
  }

diff --git a/compiler/rustc_const_eval/src/const_eval/mod.rs b/compiler/rustc_const_eval/src/const_eval/mod.rs
@@ -85,7 85,7 @@ pub(crate) fn eval_to_valtree<'tcx>(
 }
 
 #[instrument(skip(tcx), level = "debug")]
-pub(crate) fn try_destructure_mir_constant_for_diagnostics<'tcx>(
 pub fn try_destructure_mir_constant_for_diagnostics<'tcx>(
  tcx: TyCtxt<'tcx>,
  val: ConstValue<'tcx>,
  ty: Ty<'tcx>,