rustc_codegen_ssa: Enforce rustc::potential_query_instability lint

Author: Kobzol

compiler/rustc_codegen_ssa/src/assert_module_sources.rs

@@ -267,9 +267,12 @@ impl CguReuseTracker {
 
  fn check_expected_reuse(&self, sess: &Session) {
  if let Some(ref data) = self.data {
- for (cgu_name, &(ref cgu_user_name, ref error_span, expected_reuse, comparison_kind)) in
- &data.expected_reuse
- {
+ let mut keys = data.expected_reuse.keys().collect::<Vec<_>>();
+ keys.sort_unstable();
+ for cgu_name in keys {
+ let &(ref cgu_user_name, ref error_span, expected_reuse, comparison_kind) =
+ data.expected_reuse.get(cgu_name).unwrap();
+
  if let Some(&actual_reuse) = data.actual_reuse.get(cgu_name) {
  let (error, at_least) = match comparison_kind {
  ComparisonKind::Exact => (expected_reuse != actual_reuse, false),

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -559,6 +559,11 @@ fn link_staticlib<'a>(
  archive_builder_builder
  .extract_bundled_libs(path, tempdir.as_ref(), &relevant_libs)
  .unwrap_or_else(|e| sess.dcx().emit_fatal(e));
+
+ // We sort the libraries below
+ #[allow(rustc::potential_query_instability)]
+ let mut relevant_libs: Vec<Symbol> = relevant_libs.into_iter().collect();
+ relevant_libs.sort_unstable();
  for filename in relevant_libs {
  let joined = tempdir.as_ref().join(filename.as_str());
  let path = joined.as_path();
@@ -2172,14 +2177,19 @@ fn linker_with_args<'a>(
  .iter()
  .find(|(ty, _)| *ty == crate_type)
  .expect("failed to find crate type in dependency format list");
- let native_libraries_from_nonstatics = codegen_results
+
+ // We sort the libraries below
+ #[allow(rustc::potential_query_instability)]
+ let mut native_libraries_from_nonstatics = codegen_results
  .crate_info
  .native_libraries
  .iter()
  .filter_map(|(cnum, libraries)| {
  (dependency_linkage[cnum.as_usize() - 1] != Linkage::Static).then_some(libraries)
  })
- .flatten();
+ .flatten()
+ .collect::<Vec<_>>();
+ native_libraries_from_nonstatics.sort_unstable_by(|a, b| a.name.as_str().cmp(b.name.as_str()));
  for (raw_dylib_name, raw_dylib_imports) in
  collate_raw_dylibs(sess, native_libraries_from_nonstatics)?
  {

compiler/rustc_codegen_ssa/src/back/symbol_export.rs

@@ -333,6 +333,8 @@ fn exported_symbols_provider_local(
 
  let (_, cgus) = tcx.collect_and_partition_mono_items(());
 
+ // The symbols created in this loop are sorted below it
+ #[allow(rustc::potential_query_instability)]
  for (mono_item, data) in cgus.iter().flat_map(|cgu| cgu.items().iter()) {
  if data.linkage != Linkage::External {
  // We can only re-use things with external linkage, otherwise

compiler/rustc_codegen_ssa/src/base.rs

@@ -906,17 +906,22 @@ impl CrateInfo {
  })
  .collect();
  let prefix = if target.is_like_windows && target.arch == "x86" { "_" } else { "" };
+
+ // This loop only adds new items to values of the hash map, so the order in which we
+ // iterate over the values is not important.
+ #[allow(rustc::potential_query_instability)]
  info.linked_symbols
  .iter_mut()
  .filter(|(crate_type, _)| {
  !matches!(crate_type, CrateType::Rlib | CrateType::Staticlib)
  })
  .for_each(|(_, linked_symbols)| {
- linked_symbols.extend(
- missing_weak_lang_items
- .iter()
- .map(|item| (format!("{prefix}{item}"), SymbolExportKind::Text)),
- );
+ let mut symbols = missing_weak_lang_items
+ .iter()
+ .map(|item| (format!("{prefix}{item}"), SymbolExportKind::Text))
+ .collect::<Vec<_>>();
+ symbols.sort_unstable_by(|a, b| a.0.cmp(&b.0));
+ linked_symbols.extend(symbols);
  if tcx.allocator_kind(()).is_some() {
  // At least one crate needs a global allocator. This crate may be placed
  // after the crate that defines it in the linker order, in which case some

compiler/rustc_codegen_ssa/src/lib.rs

@@ -11,7 +11,6 @@
 #![feature(strict_provenance)]
 #![feature(try_blocks)]
 #![recursion_limit = "256"]
-#![allow(rustc::potential_query_instability)]
 
 //! This crate contains codegen code that is used by all codegen backends (LLVM and others).
 //! The backend-agnostic functions of this crate use functions defined in various traits that