[WIP] Update to Cranelift 0.122

Author: bjorn3

Cargo.lock

@@ -8,12 +8,12 @@ crate-type = ["dylib"]
 
 [dependencies]
 # These have to be in sync with each other
-cranelift-codegen = { version = "0.121.0", default-features = false, features = ["std", "timing", "unwind", "all-native-arch"] }
-cranelift-frontend = { version = "0.121.0" }
-cranelift-module = { version = "0.121.0" }
-cranelift-native = { version = "0.121.0" }
-cranelift-jit = { version = "0.121.0", optional = true }
-cranelift-object = { version = "0.121.0" }
+cranelift-codegen = { version = "0.122.0", default-features = false, features = ["std", "timing", "unwind", "all-native-arch"] }
+cranelift-frontend = { version = "0.122.0" }
+cranelift-module = { version = "0.122.0" }
+cranelift-native = { version = "0.122.0" }
+cranelift-jit = { version = "0.122.0", optional = true }
+cranelift-object = { version = "0.122.0" }
 target-lexicon = "0.13"
 gimli = { version = "0.31", default-features = false, features = ["write"] }
 object = { version = "0.36", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
@@ -24,12 +24,12 @@ smallvec = "1.8.1"
 
 [patch.crates-io]
 # Uncomment to use an unreleased version of cranelift
-#cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-34.0.0", version = "0.121.0" }
-#cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-34.0.0", version = "0.121.0" }
-#cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-34.0.0", version = "0.121.0" }
-#cranelift-native = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-34.0.0", version = "0.121.0" }
-#cranelift-jit = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-34.0.0", version = "0.121.0" }
-#cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-34.0.0", version = "0.121.0" }
+cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-35.0.0" }
+cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-35.0.0" }
+cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-35.0.0" }
+cranelift-native = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-35.0.0" }
+cranelift-jit = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-35.0.0" }
+cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-35.0.0" }
 
 # Uncomment to use local checkout of cranelift
 #cranelift-codegen = { path = "../wasmtime/cranelift/codegen" }

Cargo.toml

@@ -2,7 +2,7 @@
 
 use cranelift_codegen::CodegenError;
 use cranelift_codegen::ir::UserFuncName;
-use cranelift_frontend::{FunctionBuilder, FunctionBuilderContext, Variable};
+use cranelift_frontend::{FunctionBuilder, FunctionBuilderContext};
 use cranelift_module::ModuleError;
 use rustc_ast::InlineAsmOptions;
 use rustc_codegen_ssa::base::is_call_from_compiler_builtins_to_upstream_monomorphization;
@@ -90,8 +90,7 @@ pub(crate) fn codegen_fn<'tcx>(
         None
     };
 
-    let exception_slot = Variable::from_u32(0);
-    bcx.declare_var(exception_slot, pointer_type);
+    let exception_slot = bcx.declare_var(pointer_type);
 
     let mut fx = FunctionCx {
         module,
@@ -115,7 +114,6 @@ pub(crate) fn codegen_fn<'tcx>(
         exception_slot,
 
         clif_comments,
-        next_ssa_var: 1, // var0 is used for the exception slot
         inline_asm: String::new(),
         inline_asm_index: 0,
     };

src/base.rs

@@ -295,9 +295,6 @@ pub(crate) struct FunctionCx<'m, 'clif, 'tcx: 'm> {
 
     pub(crate) clif_comments: crate::pretty_clif::CommentWriter,
 
-    /// This should only be accessed by `CPlace::new_var`.
-    pub(crate) next_ssa_var: u32,
-
     pub(crate) inline_asm: String,
     pub(crate) inline_asm_index: u32,
 }

src/common.rs

@@ -393,9 +393,7 @@ impl<'tcx> CPlace<'tcx> {
         local: Local,
         layout: TyAndLayout<'tcx>,
     ) -> CPlace<'tcx> {
-        let var = Variable::from_u32(fx.next_ssa_var);
-        fx.next_ssa_var += 1;
-        fx.bcx.declare_var(var, fx.clif_type(layout.ty).unwrap());
+        let var = fx.bcx.declare_var(fx.clif_type(layout.ty).unwrap());
         CPlace { inner: CPlaceInner::Var(local, var), layout }
     }
 
@@ -404,14 +402,9 @@ impl<'tcx> CPlace<'tcx> {
         local: Local,
         layout: TyAndLayout<'tcx>,
     ) -> CPlace<'tcx> {
-        let var1 = Variable::from_u32(fx.next_ssa_var);
-        fx.next_ssa_var += 1;
-        let var2 = Variable::from_u32(fx.next_ssa_var);
-        fx.next_ssa_var += 1;
-
         let (ty1, ty2) = fx.clif_pair_type(layout.ty).unwrap();
-        fx.bcx.declare_var(var1, ty1);
-        fx.bcx.declare_var(var2, ty2);
+        let var1 = fx.bcx.declare_var(ty1);
+        let var2 = fx.bcx.declare_var(ty2);
         CPlace { inner: CPlaceInner::VarPair(local, var1, var2), layout }
     }