Sync from rust df77afb

Author: bjorn3

src/driver/aot.rs

@@ -54,8 +54,8 @@ impl OngoingCodegen {
  self,
  sess: &Session,
  backend_config: &BackendConfig,
- ) -> (CodegenResults, FxHashMap<WorkProductId, WorkProduct>) {
- let mut work_products = FxHashMap::default();
+ ) -> (CodegenResults, FxIndexMap<WorkProductId, WorkProduct>) {
+ let mut work_products = FxIndexMap::default();
  let mut modules = vec![];
 
  for module_codegen in self.modules {

src/lib.rs

@@ -88,7 +88,7 @@ mod prelude {
  };
  pub(crate) use rustc_target::abi::{Abi, FieldIdx, Scalar, Size, VariantIdx, FIRST_VARIANT};
 
- pub(crate) use rustc_data_structures::fx::FxHashMap;
+ pub(crate) use rustc_data_structures::fx::{FxHashMap, FxIndexMap};
 
  pub(crate) use rustc_index::Idx;
 
@@ -223,7 +223,7 @@ impl CodegenBackend for CraneliftCodegenBackend {
  ongoing_codegen: Box<dyn Any>,
  sess: &Session,
  _outputs: &OutputFilenames,
- ) -> Result<(CodegenResults, FxHashMap<WorkProductId, WorkProduct>), ErrorGuaranteed> {
+ ) -> Result<(CodegenResults, FxIndexMap<WorkProductId, WorkProduct>), ErrorGuaranteed> {
  Ok(ongoing_codegen
  .downcast::<driver::aot::OngoingCodegen>()
  .unwrap()