mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update cranelift to the upcoming release-3.0.0 branch

Browse Source
This commit is contained in:
bjorn3 2022-11-10 10:47:43 +00:00
parent 3df425e11e
commit 155f569794
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Cargo.lock generated
View File

@ -63,7 +63,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "cranelift-bforest"
version = "0.90.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#2c69b94744c93247075ed1c6754b4cb5549cd90d"
source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-3.0.0#0102cd7bc0c9a178a8a492340961f5822f9b95c8"
dependencies = [
"cranelift-entity",
]
@ -71,7 +71,7 @@ dependencies = [
[[package]]
name = "cranelift-codegen"
version = "0.90.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#2c69b94744c93247075ed1c6754b4cb5549cd90d"
source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-3.0.0#0102cd7bc0c9a178a8a492340961f5822f9b95c8"
dependencies = [
"arrayvec",
"bumpalo",
@ -91,7 +91,7 @@ dependencies = [
[[package]]
name = "cranelift-codegen-meta"
version = "0.90.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#2c69b94744c93247075ed1c6754b4cb5549cd90d"
source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-3.0.0#0102cd7bc0c9a178a8a492340961f5822f9b95c8"
dependencies = [
"cranelift-codegen-shared",
]
@ -99,12 +99,12 @@ dependencies = [
[[package]]
name = "cranelift-codegen-shared"
version = "0.90.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#2c69b94744c93247075ed1c6754b4cb5549cd90d"
source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-3.0.0#0102cd7bc0c9a178a8a492340961f5822f9b95c8"
[[package]]
name = "cranelift-egraph"
version = "0.90.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#2c69b94744c93247075ed1c6754b4cb5549cd90d"
source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-3.0.0#0102cd7bc0c9a178a8a492340961f5822f9b95c8"
dependencies = [
"cranelift-entity",
"fxhash",
@ -117,12 +117,12 @@ dependencies = [
[[package]]
name = "cranelift-entity"
version = "0.90.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#2c69b94744c93247075ed1c6754b4cb5549cd90d"
source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-3.0.0#0102cd7bc0c9a178a8a492340961f5822f9b95c8"
[[package]]
name = "cranelift-frontend"
version = "0.90.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#2c69b94744c93247075ed1c6754b4cb5549cd90d"
source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-3.0.0#0102cd7bc0c9a178a8a492340961f5822f9b95c8"
dependencies = [
"cranelift-codegen",
"log",
@ -133,12 +133,12 @@ dependencies = [
[[package]]
name = "cranelift-isle"
version = "0.90.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#2c69b94744c93247075ed1c6754b4cb5549cd90d"
source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-3.0.0#0102cd7bc0c9a178a8a492340961f5822f9b95c8"
[[package]]
name = "cranelift-jit"
version = "0.90.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#2c69b94744c93247075ed1c6754b4cb5549cd90d"
source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-3.0.0#0102cd7bc0c9a178a8a492340961f5822f9b95c8"
dependencies = [
"anyhow",
"cranelift-codegen",
@ -156,7 +156,7 @@ dependencies = [
[[package]]
name = "cranelift-module"
version = "0.90.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#2c69b94744c93247075ed1c6754b4cb5549cd90d"
source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-3.0.0#0102cd7bc0c9a178a8a492340961f5822f9b95c8"
dependencies = [
"anyhow",
"cranelift-codegen",
@ -165,7 +165,7 @@ dependencies = [
[[package]]
name = "cranelift-native"
version = "0.90.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#2c69b94744c93247075ed1c6754b4cb5549cd90d"
source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-3.0.0#0102cd7bc0c9a178a8a492340961f5822f9b95c8"
dependencies = [
"cranelift-codegen",
"libc",
@ -175,7 +175,7 @@ dependencies = [
[[package]]
name = "cranelift-object"
version = "0.90.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#2c69b94744c93247075ed1c6754b4cb5549cd90d"
source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-3.0.0#0102cd7bc0c9a178a8a492340961f5822f9b95c8"
dependencies = [
"anyhow",
"cranelift-codegen",
@ -391,7 +391,7 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasmtime-jit-icache-coherence"
version = "2.0.0"
source = "git+https://github.com/bytecodealliance/wasmtime.git#2c69b94744c93247075ed1c6754b4cb5549cd90d"
source = "git+https://github.com/bytecodealliance/wasmtime.git?branch=release-3.0.0#0102cd7bc0c9a178a8a492340961f5822f9b95c8"
dependencies = [
"cfg-if",
"libc",

12
Cargo.toml
View File

@ -15,12 +15,12 @@ crate-type = ["dylib"]
[dependencies]
# These have to be in sync with each other
cranelift-codegen = { version = "0.90", git = "https://github.com/bytecodealliance/wasmtime.git", features = ["unwind", "all-arch"] }
cranelift-frontend = { version = "0.90", git = "https://github.com/bytecodealliance/wasmtime.git" }
cranelift-module = { version = "0.90", git = "https://github.com/bytecodealliance/wasmtime.git" }
cranelift-native = { version = "0.90", git = "https://github.com/bytecodealliance/wasmtime.git" }
cranelift-jit = { version = "0.90", git = "https://github.com/bytecodealliance/wasmtime.git", optional = true }
cranelift-object = { version = "0.90", git = "https://github.com/bytecodealliance/wasmtime.git" }
cranelift-codegen = { version = "0.90", git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-3.0.0", features = ["unwind", "all-arch"] }
cranelift-frontend = { version = "0.90", git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-3.0.0" }
cranelift-module = { version = "0.90", git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-3.0.0" }
cranelift-native = { version = "0.90", git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-3.0.0" }
cranelift-jit = { version = "0.90", git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-3.0.0", optional = true }
cranelift-object = { version = "0.90", git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-3.0.0" }
target-lexicon = "0.12.0"
gimli = { version = "0.26.0", default-features = false, features = ["write"]}
object = { version = "0.29.0", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }

4
src/driver/jit.rs
View File

@ -159,7 +159,7 @@ pub(crate) fn run_jit(tcx: TyCtxt<'_>, backend_config: BackendConfig) -> ! {
tcx.sess.abort_if_errors();
jit_module.finalize_definitions();
jit_module.finalize_definitions().unwrap();
unsafe { cx.unwind_context.register_jit(&jit_module) };
println!(
@ -278,7 +278,7 @@ fn jit_fn(instance_ptr: *const Instance<'static>, trampoline_ptr: *const u8) ->
});
assert!(cx.global_asm.is_empty());
jit_module.finalize_definitions();
jit_module.finalize_definitions().unwrap();
unsafe { cx.unwind_context.register_jit(&jit_module) };
jit_module.get_finalized_function(func_id)
})