Auto merge of rust-lang#147745 - matthiaskrgr:rollup-b4kftk9, r=matthiaskrgr

Rollup of 11 pull requests Successful merges: - rust-lang#143191 (Stabilize `rwlock_downgrade` library feature) - rust-lang#147444 (Allow printing a fully-qualified path in `def_path_str`) - rust-lang#147527 (Update t-compiler beta nomination Zulip msg) - rust-lang#147670 (some `ErrorGuaranteed` cleanups) - rust-lang#147676 (Return spans out of `is_doc_comment` to reduce reliance on `.span()` on attributes) - rust-lang#147708 (const `mem::drop`) - rust-lang#147710 (Fix ICE when using contracts on async functions) - rust-lang#147716 (Fix some comments) - rust-lang#147718 (miri: use allocator_shim_contents codegen helper) - rust-lang#147729 (ignore boring locals when explaining why a borrow contains a point due to drop of a live local under polonius) - rust-lang#147742 (Revert unintentional whitespace changes to rustfmt-excluded file) r? `@ghost` `@rustbot` modify labels: rollup

Author: bors

compiler/rustc_ast/src/attr/mod.rs

@@ -86,10 +86,10 @@ impl AttributeExt for Attribute {
  /// Returns `true` if it is a sugared doc comment (`///` or `//!` for example).
  /// So `#[doc = "doc"]` (which is a doc comment) and `#[doc(...)]` (which is not
  /// a doc comment) will return `false`.
- fn is_doc_comment(&self) -> bool {
+ fn is_doc_comment(&self) -> Option<Span> {
  match self.kind {
- AttrKind::Normal(..) => false,
- AttrKind::DocComment(..) => true,
+ AttrKind::Normal(..) => None,
+ AttrKind::DocComment(..) => Some(self.span),
  }
  }
 
@@ -776,7 +776,7 @@ pub trait AttributeExt: Debug {
  /// Returns `true` if it is a sugared doc comment (`///` or `//!` for example).
  /// So `#[doc = "doc"]` (which is a doc comment) and `#[doc(...)]` (which is not
  /// a doc comment) will return `false`.
- fn is_doc_comment(&self) -> bool;
+ fn is_doc_comment(&self) -> Option<Span>;
 
  #[inline]
  fn has_name(&self, name: Symbol) -> bool {
@@ -863,8 +863,9 @@ impl Attribute {
  AttributeExt::path_matches(self, name)
  }
 
+ // on ast attributes we return a bool since that's what most code already expects
  pub fn is_doc_comment(&self) -> bool {
- AttributeExt::is_doc_comment(self)
+ AttributeExt::is_doc_comment(self).is_some()
  }
 
  #[inline]

compiler/rustc_ast/src/expand/allocator.rs

@@ -31,10 +31,23 @@ pub enum AllocatorTy {
  Usize,
 }
 
+/// Some allocator methods are known to the compiler: they act more like
+/// intrinsics/language primitives than library-defined functions.
+/// FIXME: ideally this would be derived from attributes like `#[rustc_allocator]`,
+/// so we don't have two sources of truth.
+#[derive(Copy, Clone, Debug)]
+pub enum SpecialAllocatorMethod {
+ Alloc,
+ AllocZeroed,
+ Dealloc,
+ Realloc,
+}
+
 /// A method that will be codegened in the allocator shim.
 #[derive(Copy, Clone)]
 pub struct AllocatorMethod {
  pub name: Symbol,
+ pub special: Option<SpecialAllocatorMethod>,
  pub inputs: &'static [AllocatorMethodInput],
  pub output: AllocatorTy,
 }
@@ -47,11 +60,13 @@ pub struct AllocatorMethodInput {
 pub static ALLOCATOR_METHODS: &[AllocatorMethod] = &[
  AllocatorMethod {
  name: sym::alloc,
+ special: Some(SpecialAllocatorMethod::Alloc),
  inputs: &[AllocatorMethodInput { name: "layout", ty: AllocatorTy::Layout }],
  output: AllocatorTy::ResultPtr,
  },
  AllocatorMethod {
  name: sym::dealloc,
+ special: Some(SpecialAllocatorMethod::Dealloc),
  inputs: &[
  AllocatorMethodInput { name: "ptr", ty: AllocatorTy::Ptr },
  AllocatorMethodInput { name: "layout", ty: AllocatorTy::Layout },
@@ -60,6 +75,7 @@ pub static ALLOCATOR_METHODS: &[AllocatorMethod] = &[
  },
  AllocatorMethod {
  name: sym::realloc,
+ special: Some(SpecialAllocatorMethod::Realloc),
  inputs: &[
  AllocatorMethodInput { name: "ptr", ty: AllocatorTy::Ptr },
  AllocatorMethodInput { name: "layout", ty: AllocatorTy::Layout },
@@ -69,6 +85,7 @@ pub static ALLOCATOR_METHODS: &[AllocatorMethod] = &[
  },
  AllocatorMethod {
  name: sym::alloc_zeroed,
+ special: Some(SpecialAllocatorMethod::AllocZeroed),
  inputs: &[AllocatorMethodInput { name: "layout", ty: AllocatorTy::Layout }],
  output: AllocatorTy::ResultPtr,
  },

compiler/rustc_attr_parsing/src/attributes/mod.rs

@@ -302,7 +302,7 @@ pub(crate) trait CombineAttributeParser<S: Stage>: 'static {
  type Item;
  /// A function that converts individual items (of type [`Item`](Self::Item)) into the final attribute.
  ///
- /// For example, individual representations fomr `#[repr(...)]` attributes into an `AttributeKind::Repr(x)`,
+ /// For example, individual representations from `#[repr(...)]` attributes into an `AttributeKind::Repr(x)`,
  /// where `x` is a vec of these individual reprs.
  const CONVERT: ConvertFn<Self::Item>;
 

compiler/rustc_attr_parsing/src/attributes/util.rs

@@ -28,7 +28,8 @@ pub fn parse_version(s: Symbol) -> Option<RustcVersion> {
 }
 
 pub fn is_builtin_attr(attr: &impl AttributeExt) -> bool {
- attr.is_doc_comment() || attr.ident().is_some_and(|ident| is_builtin_attr_name(ident.name))
+ attr.is_doc_comment().is_some()
+ || attr.ident().is_some_and(|ident| is_builtin_attr_name(ident.name))
 }
 
 pub fn is_doc_alias_attrs_contain_symbol<'tcx, T: AttributeExt + 'tcx>(

compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs

@@ -687,7 +687,7 @@ impl<'tcx> MirBorrowckCtxt<'_, '_, 'tcx> {
  }
  }
 
- Some(Cause::DropVar(local, location)) => {
+ Some(Cause::DropVar(local, location)) if !is_local_boring(local) => {
  let mut should_note_order = false;
  if self.local_name(local).is_some()
  && let Some((WriteKind::StorageDeadOrDrop, place)) = kind_place
@@ -705,7 +705,7 @@ impl<'tcx> MirBorrowckCtxt<'_, '_, 'tcx> {
  }
  }
 
- Some(Cause::LiveVar(..)) | None => {
+ Some(Cause::LiveVar(..) | Cause::DropVar(..)) | None => {
  // Here, under NLL: no cause was found. Under polonius: no cause was found, or a
  // boring local was found, which we ignore like NLLs do to match its diagnostics.
  if let Some(region) = self.to_error_region_vid(borrow_region_vid) {

compiler/rustc_builtin_macros/src/contracts.rs

@@ -71,6 +71,14 @@ fn expand_contract_clause(
  .span_err(attr_span, "contract annotations can only be used on functions"));
  }
 
+ // Contracts are not yet supported on async/gen functions
+ if new_tts.iter().any(|tt| is_kw(tt, kw::Async) || is_kw(tt, kw::Gen)) {
+ return Err(ecx.sess.dcx().span_err(
+ attr_span,
+ "contract annotations are not yet supported on async or gen functions",
+ ));
+ }
+
  // Found the `fn` keyword, now find either the `where` token or the function body.
  let next_tt = loop {
  let Some(tt) = cursor.next() else {

compiler/rustc_codegen_llvm/src/allocator.rs

@@ -1,13 +1,13 @@
 use libc::c_uint;
 use rustc_ast::expand::allocator::{
- AllocatorMethod, AllocatorTy, NO_ALLOC_SHIM_IS_UNSTABLE, default_fn_name, global_fn_name,
+ AllocatorMethod, AllocatorTy, NO_ALLOC_SHIM_IS_UNSTABLE, SpecialAllocatorMethod,
+ default_fn_name, global_fn_name,
 };
 use rustc_codegen_ssa::traits::BaseTypeCodegenMethods as _;
 use rustc_middle::bug;
 use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
 use rustc_middle::ty::TyCtxt;
 use rustc_session::config::{DebugInfo, OomStrategy};
-use rustc_span::sym;
 use rustc_symbol_mangling::mangle_internal_symbol;
 
 use crate::attributes::llfn_attrs_from_instance;
@@ -65,12 +65,12 @@ pub(crate) unsafe fn codegen(
  let from_name = mangle_internal_symbol(tcx, &global_fn_name(method.name));
  let to_name = mangle_internal_symbol(tcx, &default_fn_name(method.name));
 
- let alloc_attr_flag = match method.name {
- sym::alloc => CodegenFnAttrFlags::ALLOCATOR,
- sym::dealloc => CodegenFnAttrFlags::DEALLOCATOR,
- sym::realloc => CodegenFnAttrFlags::REALLOCATOR,
- sym::alloc_zeroed => CodegenFnAttrFlags::ALLOCATOR_ZEROED,
- _ => CodegenFnAttrFlags::empty(),
+ let alloc_attr_flag = match method.special {
+ Some(SpecialAllocatorMethod::Alloc) => CodegenFnAttrFlags::ALLOCATOR,
+ Some(SpecialAllocatorMethod::Dealloc) => CodegenFnAttrFlags::DEALLOCATOR,
+ Some(SpecialAllocatorMethod::Realloc) => CodegenFnAttrFlags::REALLOCATOR,
+ Some(SpecialAllocatorMethod::AllocZeroed) => CodegenFnAttrFlags::ALLOCATOR_ZEROED,
+ None => CodegenFnAttrFlags::empty(),
  };
 
  let mut attrs = CodegenFnAttrs::new();

compiler/rustc_codegen_ssa/src/base.rs

@@ -669,6 +669,7 @@ pub fn allocator_shim_contents(tcx: TyCtxt<'_>, kind: AllocatorKind) -> Vec<Allo
  if tcx.alloc_error_handler_kind(()).unwrap() == AllocatorKind::Default {
  methods.push(AllocatorMethod {
  name: ALLOC_ERROR_HANDLER,
+ special: None,
  inputs: &[],
  output: AllocatorTy::Never,
  });

compiler/rustc_data_structures/src/graph/scc/mod.rs

@@ -289,7 +289,7 @@ enum NodeState<N, S, A: Annotation> {
 #[derive(Copy, Clone, Debug)]
 enum WalkReturn<S, A: Annotation> {
  /// The walk found a cycle, but the entire component is not known to have
- /// been fully walked yet. We only know the minimum depth of  this
+ /// been fully walked yet. We only know the minimum depth of this
  /// component in a minimum spanning tree of the graph. This component
  /// is tentatively represented by the state of the first node of this
  /// cycle we met, which is at `min_depth`.

compiler/rustc_hir/src/hir.rs

@@ -1304,8 +1304,12 @@ impl AttributeExt for Attribute {
  }
 
  #[inline]
- fn is_doc_comment(&self) -> bool {
- matches!(self, Attribute::Parsed(AttributeKind::DocComment { .. }))
+ fn is_doc_comment(&self) -> Option<Span> {
+ if let Attribute::Parsed(AttributeKind::DocComment { span, .. }) = self {
+ Some(*span)
+ } else {
+ None
+ }
  }
 
  #[inline]
@@ -1423,7 +1427,7 @@ impl Attribute {
  }
 
  #[inline]
- pub fn is_doc_comment(&self) -> bool {
+ pub fn is_doc_comment(&self) -> Option<Span> {
  AttributeExt::is_doc_comment(self)
  }