Auto merge of rust-lang#128796 - matthiaskrgr:rollup-r7l68ph, r=matth…

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#128221 (Add implied target features to target_feature attribute) - rust-lang#128261 (impl `Default` for collection iterators that don't already have it) - rust-lang#128353 (Change generate-copyright to generate HTML, with cargo dependencies included) - rust-lang#128679 (codegen: better centralize function declaration attribute computation) - rust-lang#128732 (make `import.vis` is immutable) - rust-lang#128755 (Integrate crlf directly into related test file instead via of .gitattributes) - rust-lang#128772 (rustc_codegen_ssa: Set architecture for object crate for 32-bit SPARC) - rust-lang#128782 (unused_parens: do not lint against parens around &raw) r? `@ghost` `@rustbot` modify labels: rollup
rust-lang-ci · Aug 7, 2024 · 8b38707 · 8b38707
2 parents ce20e15 aba506b
commit 8b38707
Show file tree

Hide file tree

Showing 56 changed files with 1,311 additions and 673 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -1406,8 1406,11 @@ name = "generate-copyright"
 version = "0.1.0"
 dependencies = [
  "anyhow",
  "cargo_metadata 0.18.1",
  "rinja",
  "serde",
  "serde_json",
  "thiserror",
 ]
 
 [[package]]
@@ -3094,7 3097,10 @@ version = "0.3.0"
 source = "registry https://github.com/rust-lang/crates.io-index"
 checksum = "6d3762e3740cdbf2fd2be465cc2c26d643ad17353cc2e0223d211c1b096118bd"
 dependencies = [
  "humansize",
  "itoa",
  "num-traits",
  "percent-encoding",
  "rinja_derive",
 ]
 

diff --git a/REUSE.toml b/REUSE.toml
@@ -163,7 163,7 @@ SPDX-License-Identifier = "MIT OR Apache-2.0"
 path = "src/llvm-project/**"
 precedence = "override"
 SPDX-FileCopyrightText = [
- "2003-2019 by the contributors listed in [CREDITS.TXT](https://github.com/rust-lang/llvm-project/blob/7738295178045041669876bf32b0543ec8319a5c/llvm/CREDITS.TXT)",
  "2003-2019 by the contributors listed in CREDITS.TXT (https://github.com/rust-lang/llvm-project/blob/7738295178045041669876bf32b0543ec8319a5c/llvm/CREDITS.TXT)",
  "2010 Apple Inc",
  "2003-2019 University of Illinois at Urbana-Champaign.",
 ]

diff --git a/compiler/rustc_codegen_gcc/src/attributes.rs b/compiler/rustc_codegen_gcc/src/attributes.rs
@@ -75,7 75,7 @@ pub fn from_fn_attrs<'gcc, 'tcx>(
  let function_features = codegen_fn_attrs
  .target_features
  .iter()
- .map(|features| features.as_str())
  .map(|features| features.name.as_str())
  .collect::<Vec<&str>>();
 
  if let Some(features) = check_tied_features(

diff --git a/compiler/rustc_codegen_gcc/src/gcc_util.rs b/compiler/rustc_codegen_gcc/src/gcc_util.rs
@@ -65,8 65,8 @@ pub(crate) fn global_gcc_features(sess: &Session, diagnostics: bool) -> Vec<Stri
 
  let feature = backend_feature_name(s)?;
  // Warn against use of GCC specific feature names on the CLI.
- if diagnostics && !supported_features.iter().any(|&(v, _)| v == feature) {
- let rust_feature = supported_features.iter().find_map(|&(rust_feature, _)| {
  if diagnostics && !supported_features.iter().any(|&(v, _, _)| v == feature) {
  let rust_feature = supported_features.iter().find_map(|&(rust_feature, _, _)| {
  let gcc_features = to_gcc_features(sess, rust_feature);
  if gcc_features.contains(&feature) && !gcc_features.contains(&rust_feature) {
  Some(rust_feature)

diff --git a/compiler/rustc_codegen_gcc/src/lib.rs b/compiler/rustc_codegen_gcc/src/lib.rs
@@ -486,7 486,7 @@ pub fn target_features(
  sess.target
  .supported_target_features()
  .iter()
- .filter_map(|&(feature, gate)| {
  .filter_map(|&(feature, gate, _)| {
  if sess.is_nightly_build() || allow_unstable || gate.is_stable() {
  Some(feature)
  } else {

diff --git a/compiler/rustc_codegen_llvm/src/abi.rs b/compiler/rustc_codegen_llvm/src/abi.rs
@@ -5,17 5,18 @@ use rustc_codegen_ssa::mir::operand::{OperandRef, OperandValue};
 use rustc_codegen_ssa::mir::place::{PlaceRef, PlaceValue};
 use rustc_codegen_ssa::traits::*;
 use rustc_codegen_ssa::MemFlags;
-use rustc_middle::bug;
 use rustc_middle::ty::layout::LayoutOf;
 pub use rustc_middle::ty::layout::{FAT_PTR_ADDR, FAT_PTR_EXTRA};
 use rustc_middle::ty::Ty;
 use rustc_middle::{bug, ty};
 use rustc_session::config;
 pub use rustc_target::abi::call::*;
 use rustc_target::abi::{self, HasDataLayout, Int, Size};
 pub use rustc_target::spec::abi::Abi;
 use rustc_target::spec::SanitizerSet;
 use smallvec::SmallVec;
 
 use crate::attributes::llfn_attrs_from_instance;
 use crate::builder::Builder;
 use crate::context::CodegenCx;
 use crate::llvm::{self, Attribute, AttributePlace};
@@ -310,7 311,16 @@ pub trait FnAbiLlvmExt<'ll, 'tcx> {
  fn llvm_type(&self, cx: &CodegenCx<'ll, 'tcx>) -> &'ll Type;
  fn ptr_to_llvm_type(&self, cx: &CodegenCx<'ll, 'tcx>) -> &'ll Type;
  fn llvm_cconv(&self) -> llvm::CallConv;
- fn apply_attrs_llfn(&self, cx: &CodegenCx<'ll, 'tcx>, llfn: &'ll Value);
 
  /// Apply attributes to a function declaration/definition.
  fn apply_attrs_llfn(
  &self,
  cx: &CodegenCx<'ll, 'tcx>,
  llfn: &'ll Value,
  instance: Option<ty::Instance<'tcx>>,
  );
 
  /// Apply attributes to a function call.
  fn apply_attrs_callsite(&self, bx: &mut Builder<'_, 'll, 'tcx>, callsite: &'ll Value);
 }
 
@@ -396,7 406,12 @@ impl<'ll, 'tcx> FnAbiLlvmExt<'ll, 'tcx> for FnAbi<'tcx, Ty<'tcx>> {
  self.conv.into()
  }
 
- fn apply_attrs_llfn(&self, cx: &CodegenCx<'ll, 'tcx>, llfn: &'ll Value) {
  fn apply_attrs_llfn(
  &self,
  cx: &CodegenCx<'ll, 'tcx>,
  llfn: &'ll Value,
  instance: Option<ty::Instance<'tcx>>,
  ) {
  let mut func_attrs = SmallVec::<[_; 3]>::new();
  if self.ret.layout.abi.is_uninhabited() {
  func_attrs.push(llvm::AttributeKind::NoReturn.create_attr(cx.llcx));
@@ -477,6 492,11 @@ impl<'ll, 'tcx> FnAbiLlvmExt<'ll, 'tcx> for FnAbi<'tcx, Ty<'tcx>> {
  }
  }
  }
 
  // If the declaration has an associated instance, compute extra attributes based on that.
  if let Some(instance) = instance {
  llfn_attrs_from_instance(cx, llfn, instance);
  }
  }
 
  fn apply_attrs_callsite(&self, bx: &mut Builder<'_, 'll, 'tcx>, callsite: &'ll Value) {

diff --git a/compiler/rustc_codegen_llvm/src/attributes.rs b/compiler/rustc_codegen_llvm/src/attributes.rs
@@ -324,9 324,10 @@ fn create_alloc_family_attr(llcx: &llvm::Context) -> &llvm::Attribute {
  llvm::CreateAttrStringValue(llcx, "alloc-family", "__rust_alloc")
 }
 
 /// Helper for `FnAbi::apply_attrs_llfn`:
 /// Composite function which sets LLVM attributes for function depending on its AST (`#[attribute]`)
 /// attributes.
-pub fn from_fn_attrs<'ll, 'tcx>(
 pub fn llfn_attrs_from_instance<'ll, 'tcx>(
  cx: &CodegenCx<'ll, 'tcx>,
  llfn: &'ll Value,
  instance: ty::Instance<'tcx>,
@@ -496,7 497,7 @@ pub fn from_fn_attrs<'ll, 'tcx>(
  to_add.extend(tune_cpu_attr(cx));
 
  let function_features =
- codegen_fn_attrs.target_features.iter().map(|f| f.as_str()).collect::<Vec<&str>>();
  codegen_fn_attrs.target_features.iter().map(|f| f.name.as_str()).collect::<Vec<&str>>();
 
  if let Some(f) = llvm_util::check_tied_features(
  cx.tcx.sess,

diff --git a/compiler/rustc_codegen_llvm/src/back/write.rs b/compiler/rustc_codegen_llvm/src/back/write.rs
@@ -95,11 95,14 @@ pub fn write_output_file<'ll>(
  }
 }
 
-pub fn create_informational_target_machine(sess: &Session) -> OwnedTargetMachine {
 pub fn create_informational_target_machine(
  sess: &Session,
  only_base_features: bool,
 ) -> OwnedTargetMachine {
  let config = TargetMachineFactoryConfig { split_dwarf_file: None, output_obj_file: None };
  // Can't use query system here quite yet because this function is invoked before the query
  // system/tcx is set up.
- let features = llvm_util::global_llvm_features(sess, false);
  let features = llvm_util::global_llvm_features(sess, false, only_base_features);
  target_machine_factory(sess, config::OptLevel::No, &features)(config)
  .unwrap_or_else(|err| llvm_err(sess.dcx(), err).raise())
 }

diff --git a/compiler/rustc_codegen_llvm/src/callee.rs b/compiler/rustc_codegen_llvm/src/callee.rs
@@ -10,8 10,8 @@ use rustc_middle::ty::{self, Instance, TypeVisitableExt};
 use tracing::debug;
 
 use crate::context::CodegenCx;
 use crate::llvm;
 use crate::value::Value;
-use crate::{attributes, llvm};
 
 /// Codegens a reference to a fn/method item, monomorphizing and
 /// inlining as it goes.
@@ -78,8 78,6 @@ pub fn get_fn<'ll, 'tcx>(cx: &CodegenCx<'ll, 'tcx>, instance: Instance<'tcx>) ->
  };
  debug!("get_fn: not casting pointer!");
 
- attributes::from_fn_attrs(cx, llfn, instance);
-
  // Apply an appropriate linkage/visibility value to our item that we
  // just declared.
  //

diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs
@@ -149,7 149,7 @@ pub unsafe fn create_module<'ll>(
 
  // Ensure the data-layout values hardcoded remain the defaults.
  {
- let tm = crate::back::write::create_informational_target_machine(tcx.sess);
  let tm = crate::back::write::create_informational_target_machine(tcx.sess, false);
  unsafe {
  llvm::LLVMRustSetDataLayoutFromTargetMachine(llmod, &tm);
  }

diff --git a/compiler/rustc_codegen_llvm/src/declare.rs b/compiler/rustc_codegen_llvm/src/declare.rs
@@ -137,7 137,7 @@ impl<'ll, 'tcx> CodegenCx<'ll, 'tcx> {
  llvm::Visibility::Default,
  fn_abi.llvm_type(self),
  );
- fn_abi.apply_attrs_llfn(self, llfn);
  fn_abi.apply_attrs_llfn(self, llfn, instance);
 
  if self.tcx.sess.is_sanitizer_cfi_enabled() {
  if let Some(instance) = instance {

diff --git a/compiler/rustc_codegen_llvm/src/lib.rs b/compiler/rustc_codegen_llvm/src/lib.rs
@@ -269,7 269,7 @@ impl CodegenBackend for LlvmCodegenBackend {
 
  fn provide(&self, providers: &mut Providers) {
  providers.global_backend_features =
- |tcx, ()| llvm_util::global_llvm_features(tcx.sess, true)
  |tcx, ()| llvm_util::global_llvm_features(tcx.sess, true, false)
  }
 
  fn print(&self, req: &PrintRequest, out: &mut String, sess: &Session) {
@@ -434,7 434,7 @@ impl ModuleLlvm {
  ModuleLlvm {
  llmod_raw,
  llcx,
- tm: ManuallyDrop::new(create_informational_target_machine(tcx.sess)),
  tm: ManuallyDrop::new(create_informational_target_machine(tcx.sess, false)),
  }
  }
  }