github
/
cranelift
mirror of https://github.com/bytecodealliance/wasmtime.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #975 from fitzgen/update-cranelift-to-0.59.0 

Update cranelift to 0.59.0
pull/982/head
Nick Fitzgerald 5 years ago
committed by GitHub
parent
be553aef78 de4ad31cbd
commit
f8abe1169c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 52 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      Cargo.lock
  2. 2
      crates/debug/Cargo.toml
  3. 10
      crates/environ/Cargo.toml
  4. 19
      crates/environ/src/module_environ.rs
  5. 2
      crates/fuzzing/Cargo.toml
  6. 2
      crates/interface-types/Cargo.toml
  7. 12
      crates/jit/Cargo.toml
  8. 4
      crates/lightbeam/Cargo.toml
  9. 2
      crates/misc/py/Cargo.toml

34
Cargo.lock
View File

@ -323,18 +323,18 @@ dependencies = [
[[package]]
name = "cranelift-bforest"
version = "0.58.0"
version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd0f53d59dc9ab1c8ab68c991d8406b52b7a0aab0b15b05a3a6895579c4e5dd9"
checksum = "45a9c21f8042b9857bda93f6c1910b9f9f24100187a3d3d52f214a34e3dc5818"
dependencies = [
"cranelift-entity",
]
[[package]]
name = "cranelift-codegen"
version = "0.58.0"
version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0381a794836fb994c47006465d46d46be072483b667f36013d993b9895117fee"
checksum = "7853f77a6e4a33c67a69c40f5e1bb982bd2dc5c4a22e17e67b65bbccf9b33b2e"
dependencies = [
"byteorder",
"cranelift-bforest",
@ -351,9 +351,9 @@ dependencies = [
[[package]]
name = "cranelift-codegen-meta"
version = "0.58.0"
version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "208c3c8d82bfef32a534c5020c6cfc3bc92f41388f1246b7bb98cf543331abaa"
checksum = "084cd6d5fb0d1da28acd72c199471bfb09acc703ec8f3bf07b1699584272a3b9"
dependencies = [
"cranelift-codegen-shared",
"cranelift-entity",
@ -361,24 +361,24 @@ dependencies = [
[[package]]
name = "cranelift-codegen-shared"
version = "0.58.0"
version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea048c456a517e56fd6df8f0e3947922897e6e6f61fbc5eb557a36c7b8ff6394"
checksum = "701b599783305a58c25027a4d73f2d6b599b2d8ef3f26677275f480b4d51e05d"
[[package]]
name = "cranelift-entity"
version = "0.58.0"
version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c8c7ed50812194c9e9de1fa39c77b39fc9ab48173d5e7ee88b25b6a8953e9b8"
checksum = "b88e792b28e1ebbc0187b72ba5ba880dad083abe9231a99d19604d10c9e73f38"
dependencies = [
"serde",
]
[[package]]
name = "cranelift-frontend"
version = "0.58.0"
version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21ceb931d9f919731df1b1ecdc716b5c66384b413a7f95909d1f45441ab9bef5"
checksum = "518344698fa6c976d853319218415fdfb4f1bc6b42d0b2e2df652e55dff1f778"
dependencies = [
"cranelift-codegen",
"log",
@ -388,9 +388,9 @@ dependencies = [
[[package]]
name = "cranelift-native"
version = "0.58.0"
version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "564ee82268bc25b914fcf331edfc2452f2d9ca34f976b187b4ca668beba250c8"
checksum = "32daf082da21c0c05d93394ff4842c2ab7c4991b1f3186a1d952f8ac660edd0b"
dependencies = [
"cranelift-codegen",
"raw-cpuid",
@ -399,9 +399,9 @@ dependencies = [
[[package]]
name = "cranelift-wasm"
version = "0.58.0"
version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de63e2271b374be5b07f359184e2126a08fb24d24a740cbc178b7e0107ddafa5"
checksum = "e2aa816f554a3ef739a5d17ca3081a1f8983f04c944ea8ff60fb8d9dd8cd2d7b"
dependencies = [
"cranelift-codegen",
"cranelift-entity",
@ -409,7 +409,7 @@ dependencies = [
"log",
"serde",
"thiserror",
"wasmparser 0.48.2",
"wasmparser 0.51.2",
]
[[package]]

2
crates/debug/Cargo.toml
View File

@ -13,7 +13,7 @@ edition = "2018"
[dependencies]
gimli = "0.20.0"
wasmparser = "0.51.0"
wasmparser = "0.51.2"
faerie = "0.14.0"
wasmtime-environ = { path = "../environ", version = "0.9.0" }
target-lexicon = { version = "0.10.0", default-features = false }

10
crates/environ/Cargo.toml
View File

@ -13,10 +13,10 @@ edition = "2018"
[dependencies]
anyhow = "1.0"
cranelift-codegen = { version = "0.58.0", features = ["enable-serde"] }
cranelift-entity = { version = "0.58.0", features = ["enable-serde"] }
cranelift-wasm = { version = "0.58.0", features = ["enable-serde"] }
wasmparser = "0.51.0"
cranelift-codegen = { version = "0.59.0", features = ["enable-serde"] }
cranelift-entity = { version = "0.59.0", features = ["enable-serde"] }
cranelift-wasm = { version = "0.59.0", features = ["enable-serde"] }
wasmparser = "0.51.2"
lightbeam = { path = "../lightbeam", optional = true, version = "0.9.0" }
indexmap = "1.0.2"
rayon = "1.2.1"
@ -44,7 +44,7 @@ tempfile = "3"
target-lexicon = { version = "0.10.0", default-features = false }
pretty_env_logger = "0.3.0"
rand = { version = "0.7.0", default-features = false, features = ["small_rng"] }
cranelift-codegen = { version = "0.58.0", features = ["enable-serde", "all-arch"] }
cranelift-codegen = { version = "0.59.0", features = ["enable-serde", "all-arch"] }
filetime = "0.2.7"
lazy_static = "1.3.0"

19
crates/environ/src/module_environ.rs
View File

@ -7,7 +7,8 @@ use cranelift_codegen::isa::TargetFrontendConfig;
use cranelift_entity::PrimaryMap;
use cranelift_wasm::{
self, translate_module, DefinedFuncIndex, FuncIndex, Global, GlobalIndex, Memory, MemoryIndex,
ModuleTranslationState, SignatureIndex, Table, TableIndex, TargetEnvironment, WasmResult,
ModuleTranslationState, PassiveDataIndex, PassiveElemIndex, SignatureIndex, Table, TableIndex,
TargetEnvironment, WasmError, WasmResult,
};
use std::convert::TryFrom;
@ -324,6 +325,16 @@ impl<'data> cranelift_wasm::ModuleEnvironment<'data> for ModuleEnvironment<'data
Ok(())
}
fn declare_passive_element(
&mut self,
_: PassiveElemIndex,
_: Box<[FuncIndex]>,
) -> WasmResult<()> {
Err(WasmError::Unsupported(
"bulk memory: passive element segment".into(),
))
}
fn define_function_body(
&mut self,
_module_translation: &ModuleTranslationState,
@ -362,6 +373,12 @@ impl<'data> cranelift_wasm::ModuleEnvironment<'data> for ModuleEnvironment<'data
Ok(())
}
fn declare_passive_data(&mut self, _: PassiveDataIndex, _: &'data [u8]) -> WasmResult<()> {
Err(WasmError::Unsupported(
"bulk memory: passive data segment".into(),
))
}
fn declare_func_name(&mut self, func_index: FuncIndex, name: &'data str) -> WasmResult<()> {
self.result
.module

2
crates/fuzzing/Cargo.toml
View File

@ -12,7 +12,7 @@ arbitrary = { version = "0.3.2", features = ["derive"] }
binaryen = "0.10.0"
env_logger = "0.7.1"
log = "0.4.8"
wasmparser = "0.51.0"
wasmparser = "0.51.2"
wasmprinter = "0.2.1"
wasmtime = { path = "../api", version = "0.9.0" }

2
crates/interface-types/Cargo.toml
View File

@ -13,7 +13,7 @@ edition = "2018"
[dependencies]
anyhow = "1.0.19"
walrus = "0.15"
wasmparser = "0.51.0"
wasmparser = "0.51.2"
wasm-webidl-bindings = "0.8"
wasmtime = { path = "../api", version = "0.9.0" }
wasmtime-jit = { path = "../jit", version = "0.9.0" }

12
crates/jit/Cargo.toml
View File

@ -11,11 +11,11 @@ readme = "README.md"
edition = "2018"
[dependencies]
cranelift-codegen = { version = "0.58.0", features = ["enable-serde"] }
cranelift-entity = { version = "0.58.0", features = ["enable-serde"] }
cranelift-wasm = { version = "0.58.0", features = ["enable-serde"] }
cranelift-native = "0.58.0"
cranelift-frontend = "0.58.0"
cranelift-codegen = { version = "0.59.0", features = ["enable-serde"] }
cranelift-entity = { version = "0.59.0", features = ["enable-serde"] }
cranelift-wasm = { version = "0.59.0", features = ["enable-serde"] }
cranelift-native = "0.59.0"
cranelift-frontend = "0.59.0"
wasmtime-environ = { path = "../environ", version = "0.9.0" }
wasmtime-runtime = { path = "../runtime", version = "0.9.0" }
wasmtime-debug = { path = "../debug", version = "0.9.0" }
@ -23,7 +23,7 @@ wasmtime-profiling = { path = "../profiling" }
region = "2.0.0"
thiserror = "1.0.4"
target-lexicon = { version = "0.10.0", default-features = false }
wasmparser = "0.51.0"
wasmparser = "0.51.2"
more-asserts = "0.2.1"
anyhow = "1.0"
cfg-if = "0.1.9"

4
crates/lightbeam/Cargo.toml
View File

@ -14,12 +14,12 @@ edition = "2018"
smallvec = "1.0.0"
dynasm = "0.5.2"
dynasmrt = "0.5.2"
wasmparser = "0.51.0"
wasmparser = "0.51.2"
memoffset = "0.5.3"
itertools = "0.8.2"
capstone = "0.6.0"
thiserror = "1.0.9"
cranelift-codegen = "0.58.0"
cranelift-codegen = "0.59.0"
multi_mut = "0.1"
either = "1.5"
typemap = "0.3"

2
crates/misc/py/Cargo.toml
View File

@ -23,7 +23,7 @@ wasmtime-wasi = { path = "../../wasi", version = "0.9.0" }
target-lexicon = { version = "0.10.0", default-features = false }
anyhow = "1.0.19"
region = "2.0.0"
wasmparser = "0.51.0"
wasmparser = "0.51.2"
pyo3 = { version = "0.8.0", features = ["extension-module"] }
[badges]

Write Preview
Loading…
Cancel
Save