Update Cranelift

Fixes #757 (through bytecodealliance/wasmtime#1939)
This commit is contained in:
bjorn3 2020-07-14 21:14:14 +02:00
parent a0580610b2
commit 3e67eb1b44
2 changed files with 13 additions and 13 deletions

24
Cargo.lock generated
View File

@ -45,7 +45,7 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
[[package]]
name = "cranelift-bforest"
version = "0.65.0"
source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#4b6ebc0c27014ac566f9989d0f59b6e6f1f9ccd0"
source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#4ba3ee33682c293747a672bfb87d5235bb1e62b3"
dependencies = [
"cranelift-entity",
]
@ -53,7 +53,7 @@ dependencies = [
[[package]]
name = "cranelift-codegen"
version = "0.65.0"
source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#4b6ebc0c27014ac566f9989d0f59b6e6f1f9ccd0"
source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#4ba3ee33682c293747a672bfb87d5235bb1e62b3"
dependencies = [
"byteorder",
"cranelift-bforest",
@ -71,7 +71,7 @@ dependencies = [
[[package]]
name = "cranelift-codegen-meta"
version = "0.65.0"
source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#4b6ebc0c27014ac566f9989d0f59b6e6f1f9ccd0"
source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#4ba3ee33682c293747a672bfb87d5235bb1e62b3"
dependencies = [
"cranelift-codegen-shared",
"cranelift-entity",
@ -80,17 +80,17 @@ dependencies = [
[[package]]
name = "cranelift-codegen-shared"
version = "0.65.0"
source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#4b6ebc0c27014ac566f9989d0f59b6e6f1f9ccd0"
source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#4ba3ee33682c293747a672bfb87d5235bb1e62b3"
[[package]]
name = "cranelift-entity"
version = "0.65.0"
source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#4b6ebc0c27014ac566f9989d0f59b6e6f1f9ccd0"
source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#4ba3ee33682c293747a672bfb87d5235bb1e62b3"
[[package]]
name = "cranelift-frontend"
version = "0.65.0"
source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#4b6ebc0c27014ac566f9989d0f59b6e6f1f9ccd0"
source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#4ba3ee33682c293747a672bfb87d5235bb1e62b3"
dependencies = [
"cranelift-codegen",
"log",
@ -101,7 +101,7 @@ dependencies = [
[[package]]
name = "cranelift-module"
version = "0.65.0"
source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#4b6ebc0c27014ac566f9989d0f59b6e6f1f9ccd0"
source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#4ba3ee33682c293747a672bfb87d5235bb1e62b3"
dependencies = [
"anyhow",
"cranelift-codegen",
@ -113,7 +113,7 @@ dependencies = [
[[package]]
name = "cranelift-native"
version = "0.65.0"
source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#4b6ebc0c27014ac566f9989d0f59b6e6f1f9ccd0"
source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#4ba3ee33682c293747a672bfb87d5235bb1e62b3"
dependencies = [
"cranelift-codegen",
"raw-cpuid",
@ -123,7 +123,7 @@ dependencies = [
[[package]]
name = "cranelift-object"
version = "0.65.0"
source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#4b6ebc0c27014ac566f9989d0f59b6e6f1f9ccd0"
source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#4ba3ee33682c293747a672bfb87d5235bb1e62b3"
dependencies = [
"anyhow",
"cranelift-codegen",
@ -135,7 +135,7 @@ dependencies = [
[[package]]
name = "cranelift-simplejit"
version = "0.65.0"
source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#4b6ebc0c27014ac566f9989d0f59b6e6f1f9ccd0"
source = "git+https://github.com/bytecodealliance/wasmtime/?branch=main#4ba3ee33682c293747a672bfb87d5235bb1e62b3"
dependencies = [
"cranelift-codegen",
"cranelift-module",
@ -276,9 +276,9 @@ dependencies = [
[[package]]
name = "regalloc"
version = "0.0.26"
version = "0.0.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c03092d79e0fd610932d89ed53895a38c0dd3bcd317a0046e69940de32f1d95"
checksum = "b9ba8aaf5fe7cf307c6dbdaeed85478961d29e25e3bee5169e11b92fa9f027a8"
dependencies = [
"log",
"rustc-hash",

View File

@ -283,7 +283,7 @@ fn codegen_fn_content(fx: &mut FunctionCx<'_, '_, impl Backend>) {
let mut switch = ::cranelift_frontend::Switch::new();
for (i, value) in values.iter().enumerate() {
let block = fx.get_block(targets[i]);
switch.set_entry((*value).try_into().unwrap(), block);
switch.set_entry(*value, block);
}
let otherwise_block = fx.get_block(targets[targets.len() - 1]);
switch.emit(&mut fx.bcx, discr, otherwise_block);