Update cranelift dependencies

coolreader18 · coolreader18 · commit 0fddb046ddb3 · 2020-12-05T16:36:37.000-06:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/jit/Cargo.toml b/jit/Cargo.toml
@@ -10,11 +10,11 @@ edition = "2018"
 autotests = false
 
 [dependencies]
-cranelift = "0.66.0"
-cranelift-module = "0.66.0"
-cranelift-simplejit = "0.66.0"
+cranelift = "0.68.0"
+cranelift-module = "0.68.0"
+cranelift-simplejit = "0.68.0"
 num-traits = "0.2"
-libffi = "0.9.0"
+libffi = "1.0"
 rustpython-bytecode = { path = "../bytecode", version = "0.1.2" }
 thiserror = "1.0"
 
diff --git a/jit/src/lib.rs b/jit/src/lib.rs
@@ -1,8 +1,8 @@
 use std::fmt;
 
 use cranelift::prelude::*;
-use cranelift_module::{Backend, FuncId, Linkage, Module, ModuleError};
-use cranelift_simplejit::{SimpleJITBackend, SimpleJITBuilder};
+use cranelift_module::{FuncId, Linkage, Module, ModuleError};
+use cranelift_simplejit::{SimpleJITBuilder, SimpleJITModule, SimpleJITProduct};
 
 use rustpython_bytecode::bytecode;
 
@@ -32,13 +32,13 @@ pub enum JitArgumentError {
 struct Jit {
     builder_context: FunctionBuilderContext,
     ctx: codegen::Context,
-    module: Module<SimpleJITBackend>,
+    module: SimpleJITModule,
 }
 
 impl Jit {
     fn new() -> Self {
         let builder = SimpleJITBuilder::new(cranelift_module::default_libcall_names());
-        let module = Module::new(builder);
+        let module = SimpleJITModule::new(builder);
         Self {
             builder_context: FunctionBuilderContext::new(),
             ctx: module.make_context(),
@@ -112,7 +112,7 @@ pub fn compile<C: bytecode::Constant>(
 pub struct CompiledCode {
     sig: JitSig,
     code: *const u8,
-    memory: <SimpleJITBackend as Backend>::Product,
+    memory: SimpleJITProduct,
 }
 
 impl CompiledCode {
