Auto merge of #138450 - matthiaskrgr:rollup-4im25vf, r=matthiaskrgr

Rollup of 6 pull requests
Successful merges:
- #137816 (attempt to support `BinaryFormat::Xcoff` in `naked_asm!`)
- #138109 (make precise capturing args in rustdoc Json typed)
- #138343 (Enable `f16` tests for `powf`)
- #138356 (bump libc to 0.2.171 to fix xous)
- #138371 (Update compiletest's `has_asm_support` to match rustc)
- #138404 (Cleanup sysroot locating a bit)
r? `@ghost`
`@rustbot` modify labels: rollup

Author: bors

compiler/rustc_ast_lowering/src/asm.rs

@@ -38,6 +38,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
 }
 ifletSome(asm_arch) = asm_arch {
 // Inline assembly is currently only stable for these architectures.
+// (See also compiletest's `has_asm_support`.)
 let is_stable = matches!(
  asm_arch,
  asm::InlineAsmArch::X86

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -1288,8 +1288,7 @@ fn link_sanitizer_runtime(
 if path.exists(){
  sess.target_tlib_path.dir.clone()
 }else{
-let default_sysroot =
- filesearch::get_or_default_sysroot().expect("Failed finding sysroot");
+let default_sysroot = filesearch::get_or_default_sysroot();
 let default_tlib =
  filesearch::make_target_lib_path(&default_sysroot, sess.opts.target_triple.tuple());
  default_tlib

compiler/rustc_codegen_ssa/src/mir/naked_asm.rs

@@ -125,7 +125,8 @@ fn prefix_and_suffix<'tcx>(
 // the alignment from a `#[repr(align(<n>))]` is used if it specifies a higher alignment.
 // if no alignment is specified, an alignment of 4 bytes is used.
 let min_function_alignment = tcx.sess.opts.unstable_opts.min_function_alignment;
-let align = Ord::max(min_function_alignment, attrs.alignment).map(|a| a.bytes()).unwrap_or(4);
+let align_bytes =
+Ord::max(min_function_alignment, attrs.alignment).map(|a| a.bytes()).unwrap_or(4);
 
 // In particular, `.arm` can also be written `.code 32` and `.thumb` as `.code 16`.
 let(arch_prefix, arch_suffix) = if is_arm {
@@ -157,12 +158,16 @@ fn prefix_and_suffix<'tcx>(
 }
 Linkage::LinkOnceAny | Linkage::LinkOnceODR | Linkage::WeakAny | Linkage::WeakODR => {
 match asm_binary_format {
-BinaryFormat::Elf
- | BinaryFormat::Coff
- | BinaryFormat::Wasm
- | BinaryFormat::Xcoff => {
+BinaryFormat::Elf | BinaryFormat::Coff | BinaryFormat::Wasm => {
 writeln!(w,".weak {asm_name}")?;
 }
+BinaryFormat::Xcoff => {
+// FIXME: there is currently no way of defining a weak symbol in inline assembly
+// for AIX. See https://github.com/llvm/llvm-project/issues/130269
+emit_fatal(
+"cannot create weak symbols from inline assembly for this target",
+)
+}
 BinaryFormat::MachO => {
 writeln!(w,".globl {asm_name}")?;
 writeln!(w,".weak_definition {asm_name}")?;
@@ -189,7 +194,7 @@ fn prefix_and_suffix<'tcx>(
 letmut begin = String::new();
 letmut end = String::new();
 match asm_binary_format {
-BinaryFormat::Elf| BinaryFormat::Xcoff=> {
+BinaryFormat::Elf => {
 let section = link_section.unwrap_or(format!(".text.{asm_name}"));
 
 let progbits = match is_arm {
@@ -203,7 +208,7 @@ fn prefix_and_suffix<'tcx>(
 };
 
 writeln!(begin,".pushsection {section},\"ax\", {progbits}").unwrap();
-writeln!(begin,".balign {align}").unwrap();
+writeln!(begin,".balign {align_bytes}").unwrap();
 write_linkage(&mut begin).unwrap();
 ifletVisibility::Hidden = item_data.visibility{
 writeln!(begin,".hidden {asm_name}").unwrap();
@@ -224,7 +229,7 @@ fn prefix_and_suffix<'tcx>(
 BinaryFormat::MachO => {
 let section = link_section.unwrap_or("__TEXT,__text".to_string());
 writeln!(begin,".pushsection {},regular,pure_instructions", section).unwrap();
-writeln!(begin,".balign {align}").unwrap();
+writeln!(begin,".balign {align_bytes}").unwrap();
 write_linkage(&mut begin).unwrap();
 ifletVisibility::Hidden = item_data.visibility{
 writeln!(begin,".private_extern {asm_name}").unwrap();
@@ -240,7 +245,7 @@ fn prefix_and_suffix<'tcx>(
 BinaryFormat::Coff => {
 let section = link_section.unwrap_or(format!(".text.{asm_name}"));
 writeln!(begin,".pushsection {},\"xr\"", section).unwrap();
-writeln!(begin,".balign {align}").unwrap();
+writeln!(begin,".balign {align_bytes}").unwrap();
 write_linkage(&mut begin).unwrap();
 writeln!(begin,".def {asm_name}").unwrap();
 writeln!(begin,".scl 2").unwrap();
@@ -279,6 +284,33 @@ fn prefix_and_suffix<'tcx>(
 // .size is ignored for function symbols, so we can skip it
 writeln!(end,"end_function").unwrap();
 }
+BinaryFormat::Xcoff => {
+// the LLVM XCOFFAsmParser is extremely incomplete and does not implement many of the
+// documented directives.
+//
+// - https://github.com/llvm/llvm-project/blob/1b25c0c4da968fe78921ce77736e5baef4db75e3/llvm/lib/MC/MCParser/XCOFFAsmParser.cpp
+// - https://www.ibm.com/docs/en/ssw_aix_71/assembler/assembler_pdf.pdf
+//
+// Consequently, we try our best here but cannot do as good a job as for other binary
+// formats.
+
+// FIXME: start a section. `.csect` is not currently implemented in LLVM
+
+// fun fact: according to the assembler documentation, .align takes an exponent,
+// but LLVM only accepts powers of 2 (but does emit the exponent)
+// so when we hand `.align 32` to LLVM, the assembly output will contain `.align 5`
+writeln!(begin,".align {}", align_bytes).unwrap();
+
+write_linkage(&mut begin).unwrap();
+ifletVisibility::Hidden = item_data.visibility{
+// FIXME apparently `.globl {asm_name}, hidden` is valid
+// but due to limitations with `.weak` (see above) we can't really use that in general yet
+}
+writeln!(begin,"{asm_name}:").unwrap();
+
+writeln!(end).unwrap();
+// FIXME: end the section?
+}
 }
 
 (begin, end)

compiler/rustc_error_messages/src/lib.rs

@@ -106,8 +106,8 @@ impl From<Vec<FluentError>> for TranslationBundleError {
 /// (overriding any conflicting messages).
 #[instrument(level = "trace")]
 pubfnfluent_bundle(
-mutuser_provided_sysroot:Option<PathBuf>,
-mutsysroot_candidates:Vec<PathBuf>,
+sysroot:PathBuf,
+sysroot_candidates:Vec<PathBuf>,
 requested_locale:Option<LanguageIdentifier>,
 additional_ftl_path:Option<&Path>,
 with_directionality_markers:bool,
@@ -141,7 +141,7 @@ pub fn fluent_bundle(
 // If the user requests the default locale then don't try to load anything.
 ifletSome(requested_locale) = requested_locale {
 letmut found_resources = false;
-for sysroot inuser_provided_sysroot.iter_mut().chain(sysroot_candidates.iter_mut()){
+formutsysroot inSome(sysroot).into_iter().chain(sysroot_candidates.into_iter()){
  sysroot.push("share");
  sysroot.push("locale");
  sysroot.push(requested_locale.to_string());

compiler/rustc_hir/src/hir.rs

@@ -3373,13 +3373,16 @@ pub struct OpaqueTy<'hir> {
 pubspan:Span,
 }
 
-#[derive(Debug,Clone,Copy,HashStable_Generic)]
-pubenumPreciseCapturingArg<'hir>{
-Lifetime(&'hirLifetime),
+#[derive(Debug,Clone,Copy,HashStable_Generic,Encodable,Decodable)]
+pubenumPreciseCapturingArgKind<T,U>{
+Lifetime(T),
 /// Non-lifetime argument (type or const)
-Param(PreciseCapturingNonLifetimeArg),
+Param(U),
 }
 
+pubtypePreciseCapturingArg<'hir> =
+PreciseCapturingArgKind<&'hirLifetime,PreciseCapturingNonLifetimeArg>;
+
 implPreciseCapturingArg<'_>{
 pubfnhir_id(self) -> HirId{
 matchself{

compiler/rustc_hir_analysis/src/collect.rs

@@ -28,7 +28,7 @@ use rustc_errors::{
 use rustc_hir::def::DefKind;
 use rustc_hir::def_id::{DefId,LocalDefId};
 use rustc_hir::intravisit::{self,InferKind,Visitor,VisitorExt, walk_generics};
-use rustc_hir::{selfas hir,GenericParamKind,HirId,Node};
+use rustc_hir::{selfas hir,GenericParamKind,HirId,Node,PreciseCapturingArgKind};
 use rustc_infer::infer::{InferCtxt,TyCtxtInferExt};
 use rustc_infer::traits::ObligationCause;
 use rustc_middle::hir::nested_filter;
@@ -1791,7 +1791,7 @@ fn opaque_ty_origin<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId) -> hir::OpaqueT
 fnrendered_precise_capturing_args<'tcx>(
 tcx:TyCtxt<'tcx>,
 def_id:LocalDefId,
-) -> Option<&'tcx[Symbol]>{
+) -> Option<&'tcx[PreciseCapturingArgKind<Symbol,Symbol>]>{
 ifletSome(ty::ImplTraitInTraitData::Trait{ opaque_def_id, .. }) =
  tcx.opt_rpitit_info(def_id.to_def_id())
 {
@@ -1800,7 +1800,12 @@ fn rendered_precise_capturing_args<'tcx>(
 
  tcx.hir_node_by_def_id(def_id).expect_opaque_ty().bounds.iter().find_map(|bound| match bound {
  hir::GenericBound::Use(args, ..) => {
-Some(&*tcx.arena.alloc_from_iter(args.iter().map(|arg| arg.name())))
+Some(&*tcx.arena.alloc_from_iter(args.iter().map(|arg| match arg {
+PreciseCapturingArgKind::Lifetime(_) => {
+PreciseCapturingArgKind::Lifetime(arg.name())
+}
+PreciseCapturingArgKind::Param(_) => PreciseCapturingArgKind::Param(arg.name()),
+})))
 }
  _ => None,
 })

compiler/rustc_interface/src/interface.rs

@@ -18,7 +18,7 @@ use rustc_parse::parser::attr::AllowLeadingUnsafe;
 use rustc_query_impl::QueryCtxt;
 use rustc_query_system::query::print_query_stack;
 use rustc_session::config::{self,Cfg,CheckCfg,ExpectedValues,Input,OutFileName};
-use rustc_session::filesearch::{self,sysroot_candidates};
+use rustc_session::filesearch::sysroot_candidates;
 use rustc_session::parse::ParseSess;
 use rustc_session::{CompilerIO,EarlyDiagCtxt,Session, lint};
 use rustc_span::source_map::{FileLoader,RealFileLoader,SourceMapInputs};
@@ -390,7 +390,7 @@ pub fn run_compiler<R: Send>(config: Config, f: impl FnOnce(&Compiler) -> R + Se
 
 crate::callbacks::setup_callbacks();
 
-let sysroot = filesearch::materialize_sysroot(config.opts.maybe_sysroot.clone());
+let sysroot = config.opts.sysroot.clone();
 let target = config::build_target_config(&early_dcx,&config.opts.target_triple,&sysroot);
 let file_loader = config.file_loader.unwrap_or_else(|| Box::new(RealFileLoader));
 let path_mapping = config.opts.file_path_mapping();
@@ -424,7 +424,7 @@ pub fn run_compiler<R: Send>(config: Config, f: impl FnOnce(&Compiler) -> R + Se
 let temps_dir = config.opts.unstable_opts.temps_dir.as_deref().map(PathBuf::from);
 
 let bundle = match rustc_errors::fluent_bundle(
- config.opts.maybe_sysroot.clone(),
+ config.opts.sysroot.clone(),
 sysroot_candidates().to_vec(),
  config.opts.unstable_opts.translate_lang.clone(),
  config.opts.unstable_opts.translate_additional_ftl.as_deref(),

compiler/rustc_interface/src/tests.rs

@@ -21,7 +21,7 @@ use rustc_session::config::{
 use rustc_session::lint::Level;
 use rustc_session::search_paths::SearchPath;
 use rustc_session::utils::{CanonicalizedPath,NativeLib,NativeLibKind};
-use rustc_session::{CompilerIO,EarlyDiagCtxt,Session, build_session,filesearch,getopts};
+use rustc_session::{CompilerIO,EarlyDiagCtxt,Session, build_session, getopts};
 use rustc_span::edition::{DEFAULT_EDITION,Edition};
 use rustc_span::source_map::{RealFileLoader,SourceMapInputs};
 use rustc_span::{FileName,SourceFileHashAlgorithm, sym};
@@ -41,7 +41,7 @@ where
 
 let matches = optgroups().parse(args).unwrap();
 let sessopts = build_session_options(&mut early_dcx,&matches);
-let sysroot = filesearch::materialize_sysroot(sessopts.maybe_sysroot.clone());
+let sysroot = sessopts.sysroot.clone();
 let target =
  rustc_session::config::build_target_config(&early_dcx,&sessopts.target_triple,&sysroot);
 let hash_kind = sessopts.unstable_opts.src_hash_algorithm(&target);

compiler/rustc_metadata/src/rmeta/mod.rs

@@ -10,6 +10,7 @@ use rustc_abi::{FieldIdx, ReprOptions, VariantIdx};
 use rustc_ast::expand::StrippedCfgItem;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::svh::Svh;
+use rustc_hir::PreciseCapturingArgKind;
 use rustc_hir::def::{CtorKind,DefKind,DocLinkResMap};
 use rustc_hir::def_id::{CrateNum,DefId,DefIdMap,DefIndex,DefPathHash,StableCrateId};
 use rustc_hir::definitions::DefKey;
@@ -440,7 +441,7 @@ define_tables! {
  coerce_unsized_info:Table<DefIndex,LazyValue<ty::adjustment::CoerceUnsizedInfo>>,
  mir_const_qualif:Table<DefIndex,LazyValue<mir::ConstQualifs>>,
  rendered_const:Table<DefIndex,LazyValue<String>>,
- rendered_precise_capturing_args:Table<DefIndex,LazyArray<Symbol>>,
+ rendered_precise_capturing_args:Table<DefIndex,LazyArray<PreciseCapturingArgKind<Symbol,Symbol>>>,
  asyncness:Table<DefIndex, ty::Asyncness>,
  fn_arg_names:Table<DefIndex,LazyArray<Ident>>,
  coroutine_kind:Table<DefIndex, hir::CoroutineKind>,

compiler/rustc_middle/src/query/mod.rs

@@ -25,7 +25,7 @@ use rustc_hir::def_id::{
 CrateNum,DefId,DefIdMap,LocalDefId,LocalDefIdMap,LocalDefIdSet,LocalModDefId,
 };
 use rustc_hir::lang_items::{LangItem,LanguageItems};
-use rustc_hir::{Crate,ItemLocalId,ItemLocalMap,TraitCandidate};
+use rustc_hir::{Crate,ItemLocalId,ItemLocalMap,PreciseCapturingArgKind,TraitCandidate};
 use rustc_index::IndexVec;
 use rustc_lint_defs::LintId;
 use rustc_macros::rustc_queries;
@@ -1424,7 +1424,7 @@ rustc_queries! {
 }
 
 /// Gets the rendered precise capturing args for an opaque for use in rustdoc.
- query rendered_precise_capturing_args(def_id:DefId) -> Option<&'tcx [Symbol]> {
+ query rendered_precise_capturing_args(def_id:DefId) -> Option<&'tcx [PreciseCapturingArgKind<Symbol,Symbol>]> {
  desc { |tcx| "rendering precise capturing args for `{}`", tcx.def_path_str(def_id)}
  separate_provide_extern
 }