Merge pull request #4184 from afonso360/cranelift-version

youknowone · web-flow · commit ac2532822bf6 · 2022-10-03T12:12:41.000+09:00
Update JIT Cranelift version
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/jit/Cargo.toml b/jit/Cargo.toml
@@ -12,9 +12,9 @@ autotests = false
 [dependencies]
 rustpython-compiler-core = { path = "../compiler/core", version = "0.1.2" }
 
-cranelift = "0.76.0"
-cranelift-jit = "0.76.0"
-cranelift-module = "0.76.0"
+cranelift = "0.88.0"
+cranelift-jit = "0.88.0"
+cranelift-module = "0.88.0"
 libffi = "2.0.0"
 num-traits = "0.2"
 thiserror = "1.0"
diff --git a/jit/src/instructions.rs b/jit/src/instructions.rs
@@ -194,7 +194,7 @@ impl<'a, 'b> FunctionCompiler<'a, 'b> {
                 self.builder.ins().brz(val, then_block, &[]);
 
                 let block = self.builder.create_block();
-                self.builder.ins().fallthrough(block, &[]);
+                self.builder.ins().jump(block, &[]);
                 self.builder.switch_to_block(block);
 
                 Ok(())
@@ -207,7 +207,7 @@ impl<'a, 'b> FunctionCompiler<'a, 'b> {
                 self.builder.ins().brnz(val, then_block, &[]);
 
                 let block = self.builder.create_block();
-                self.builder.ins().fallthrough(block, &[]);
+                self.builder.ins().jump(block, &[]);
                 self.builder.switch_to_block(block);
 
                 Ok(())
diff --git a/jit/src/lib.rs b/jit/src/lib.rs
@@ -35,7 +35,8 @@ struct Jit {
 
 impl Jit {
     fn new() -> Self {
-        let builder = JITBuilder::new(cranelift_module::default_libcall_names());
+        let builder = JITBuilder::new(cranelift_module::default_libcall_names())
+            .expect("Failed to build JITBuilder");
         let module = JITModule::new(builder);
         Self {
             builder_context: FunctionBuilderContext::new(),
@@ -80,12 +81,7 @@ impl Jit {
             &self.ctx.func.signature,
         )?;
 
-        self.module.define_function(
-            id,
-            &mut self.ctx,
-            &mut codegen::binemit::NullTrapSink {},
-            &mut codegen::binemit::NullStackMapSink {},
-        )?;
+        self.module.define_function(id, &mut self.ctx)?;
 
         self.module.clear_context(&mut self.ctx);
 
