use latest codegen changes + fix FxHash problem

Author: the-ssd

.github/workflows/main.yml

@@ -550,7 +550,7 @@ jobs:
             cargo check -p wasmtime --no-default-features --features runtime,component-model &&
             cargo check -p wasmtime --no-default-features --features runtime,gc,component-model,async,debug-builtins &&
             cargo check -p cranelift-control --no-default-features &&
-            cargo check -p cranelift-assembler-x64 &&
+            cargo check -p cranelift-assembler-x64 --lib &&
             cargo check -p pulley-interpreter --features encode,decode,disas,interp &&
             cargo check -p wasmtime-wasi-io --no-default-features
         # Use `cross` for illumos to have a C compiler/linker available.

cranelift/codegen/Cargo.toml

@@ -71,7 +71,7 @@ std = ["serde?/std", "rustc-hash/std", "cranelift-control/fuzz"]
 # deprecated (we (i) always use hashbrown, and (ii) don't support a
 # no_std build anymore). The feature remains for backward
 # compatibility as a no-op.
-core = ["cranelift-assembler-x64/core"]
+core = []
 
 # Enable the `to_capstone` method on TargetIsa, for constructing a Capstone
 # context, and the `disassemble` method on `MachBufferFinalized`.

cranelift/codegen/src/alias_analysis.rs

@@ -61,6 +61,7 @@
 //! must be correct likely reduce the potential benefit, we don't yet
 //! do this.
 
+use crate::{FxHashMap, FxHashSet};
 use crate::{
     cursor::{Cursor, FuncCursor},
     dominator_tree::DominatorTree,
@@ -71,7 +72,6 @@ use crate::{
     trace,
 };
 use cranelift_entity::{EntityRef, packed_option::PackedOption};
-use rustc_hash::{FxHashMap, FxHashSet};
 
 /// For a given program point, the vector of last-store instruction
 /// indices for each disjoint category of abstract state.
@@ -400,4 +400,3 @@ fn get_ext_opcode(op: Opcode) -> Option<Opcode> {
         _ => Some(op),
     }
 }
-use crate::prelude::*;

cranelift/codegen/src/ctxhash.rs

@@ -4,8 +4,8 @@
 //! node-internal data references some other storage (e.g., offsets into
 //! an array or pool of shared data).
 
-use hashbrown::hash_table::HashTable;
 use core::hash::{Hash, Hasher};
+use hashbrown::hash_table::HashTable;
 
 /// Trait that allows for equality comparison given some external
 /// context.

cranelift/codegen/src/data_value.rs

@@ -420,4 +420,3 @@ mod test {
         );
     }
 }
-use crate::prelude::*;

cranelift/codegen/src/dominator_tree.rs

@@ -771,4 +771,3 @@ mod tests {
         assert!(!dt.dominates(v3_def, block0, &cur.func.layout));
     }
 }
-use crate::prelude::*;

cranelift/codegen/src/egraph.rs

@@ -1,5 +1,6 @@
 //! Support for egraphs represented in the DataFlowGraph.
 
+use crate::FxHashSet;
 use crate::alias_analysis::{AliasAnalysis, LastStores};
 use crate::ctxhash::{CtxEq, CtxHash, NullCtx};
 use crate::cursor::{Cursor, CursorPosition, FuncCursor};
@@ -24,7 +25,6 @@ use core::hash::Hasher;
 use cranelift_control::ControlPlane;
 use cranelift_entity::SecondaryMap;
 use cranelift_entity::packed_option::ReservedValue;
-use rustc_hash::FxHashSet;
 use smallvec::SmallVec;
 
 mod cost;
@@ -1110,4 +1110,3 @@ pub(crate) struct Stats {
     pub(crate) elaborate_func_post_insts: u64,
     pub(crate) eclass_size_limit: u64,
 }
-use crate::prelude::*;

cranelift/codegen/src/egraph/elaborate.rs

@@ -11,10 +11,10 @@ use crate::ir::{Block, Function, Inst, Value, ValueDef};
 use crate::loop_analysis::{Loop, LoopAnalysis};
 use crate::scoped_hash_map::ScopedHashMap;
 use crate::trace;
+use crate::{FxHashMap, FxHashSet};
 use alloc::vec::Vec;
 use cranelift_control::ControlPlane;
 use cranelift_entity::{EntitySet, SecondaryMap, packed_option::ReservedValue};
-use rustc_hash::{FxHashMap, FxHashSet};
 use smallvec::{SmallVec, smallvec};
 
 pub(crate) struct Elaborator<'a> {
@@ -865,4 +865,3 @@ impl<'a> Elaborator<'a> {
         self.stats.elaborate_func_post_insts += self.func.dfg.num_insts() as u64;
     }
 }
-use crate::prelude::*;

cranelift/codegen/src/incremental_cache.rs

@@ -239,4 +239,3 @@ pub fn try_finish_recompile(func: &Function, bytes: &[u8]) -> Result<CompiledCod
         Err(err) => Err(RecompileError::Deserialize(err)),
     }
 }
-use crate::prelude::*;

cranelift/codegen/src/inline.rs

@@ -1584,4 +1584,3 @@ fn create_constants(allocs: &mut InliningAllocs, func: &mut ir::Function, callee
         allocs.constants[*callee_constant] = Some(inlined_constant).into();
     }
 }
-use crate::prelude::*;