Skip to content

Commit 84bb8fa

Browse files
committed
[WIP] Update to Cranelift 0.119
1 parent 49bfa1a commit 84bb8fa

File tree

3 files changed

+60
-68
lines changed

3 files changed

+60
-68
lines changed

Diff for: Cargo.lock

+44-51
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Cargo.toml

+12-12
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ crate-type = ["dylib"]
88

99
[dependencies]
1010
# These have to be in sync with each other
11-
cranelift-codegen = { version = "0.118.0", default-features = false, features = ["std", "timing", "unwind", "all-native-arch"] }
12-
cranelift-frontend = { version = "0.118.0" }
13-
cranelift-module = { version = "0.118.0" }
14-
cranelift-native = { version = "0.118.0" }
15-
cranelift-jit = { version = "0.118.0", optional = true }
16-
cranelift-object = { version = "0.118.0" }
11+
cranelift-codegen = { version = "0.119.0", default-features = false, features = ["std", "timing", "unwind", "all-native-arch"] }
12+
cranelift-frontend = { version = "0.119.0" }
13+
cranelift-module = { version = "0.119.0" }
14+
cranelift-native = { version = "0.119.0" }
15+
cranelift-jit = { version = "0.119.0", optional = true }
16+
cranelift-object = { version = "0.119.0" }
1717
target-lexicon = "0.13"
1818
gimli = { version = "0.31", default-features = false, features = ["write"] }
1919
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"
2424

2525
[patch.crates-io]
2626
# Uncomment to use an unreleased version of cranelift
27-
#cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-31.0.0", version = "0.118.0" }
28-
#cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-31.0.0", version = "0.118.0" }
29-
#cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-31.0.0", version = "0.118.0" }
30-
#cranelift-native = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-31.0.0", version = "0.118.0" }
31-
#cranelift-jit = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-31.0.0", version = "0.118.0" }
32-
#cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-31.0.0", version = "0.118.0" }
27+
cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-32.0.0", version = "0.119.0" }
28+
cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-32.0.0", version = "0.119.0" }
29+
cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-32.0.0", version = "0.119.0" }
30+
cranelift-native = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-32.0.0", version = "0.119.0" }
31+
cranelift-jit = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-32.0.0", version = "0.119.0" }
32+
cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-32.0.0", version = "0.119.0" }
3333

3434
# Uncomment to use local checkout of cranelift
3535
#cranelift-codegen = { path = "../wasmtime/cranelift/codegen" }

Diff for: src/unwind_module.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
use cranelift_codegen::Context;
12
use cranelift_codegen::control::ControlPlane;
2-
use cranelift_codegen::ir::{Function, Signature};
3+
use cranelift_codegen::ir::Signature;
34
use cranelift_codegen::isa::{TargetFrontendConfig, TargetIsa};
4-
use cranelift_codegen::{Context, FinalizedMachReloc};
55
use cranelift_module::{
66
DataDescription, DataId, FuncId, FuncOrDataId, Linkage, Module, ModuleDeclarations,
7-
ModuleResult,
7+
ModuleReloc, ModuleResult,
88
};
99
use cranelift_object::{ObjectModule, ObjectProduct};
1010

@@ -101,10 +101,9 @@ impl<T: Module> Module for UnwindModule<T> {
101101
fn define_function_bytes(
102102
&mut self,
103103
_func_id: FuncId,
104-
_func: &Function,
105104
_alignment: u64,
106105
_bytes: &[u8],
107-
_relocs: &[FinalizedMachReloc],
106+
_relocs: &[ModuleReloc],
108107
) -> ModuleResult<()> {
109108
unimplemented!()
110109
}

0 commit comments

Comments
 (0)