Skip to content

Commit

Permalink
Merge #2144
Browse files Browse the repository at this point in the history
2144: Upgrade cranelift to 0.70 r=syrusakbary a=hanabi1224

<!-- 
Prior to submitting a PR, review the CONTRIBUTING.md document for recommendations on how to test:
https://github.com/wasmerio/wasmer/blob/master/CONTRIBUTING.md#pull-requests

-->

# Description
Upgrade cranelift to 0.70 with a small breaking change to remove reloc_block from binemit::RelocSink trait. 

ref: [commit](bytecodealliance/wasmtime@b7a93c2)

# Review

- [X] Add a short description of the the change to the CHANGELOG.md file


Co-authored-by: hanabi1224 <[email protected]>
  • Loading branch information
bors[bot] and hanabi1224 authored Feb 27, 2021
2 parents 3dc537c + 45347df commit 1d44d37
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 45 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

### Changed
- [#2113](https://github.com/wasmerio/wasmer/pull/2113) Bump minimum supported Rust version to 1.49
- [#2144](https://github.com/wasmerio/wasmer/pull/2144) Bump cranelift version to 0.70

### Fixed
- [#2117](https://github.com/wasmerio/wasmer/pull/2117) Formalize API prefixes in the C API. Only unstable functions have been renamed.
Expand Down
41 changes: 18 additions & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions lib/compiler-cranelift/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ edition = "2018"
wasmer-compiler = { path = "../compiler", version = "1.0.2", features = ["translator"], default-features = false }
wasmer-vm = { path = "../vm", version = "1.0.2" }
wasmer-types = { path = "../wasmer-types", version = "1.0.2", default-features = false, features = ["std"] }
cranelift-codegen = { version = "0.68", default-features = false, features = ["x86", "arm64"] }
cranelift-frontend = { version = "0.68", default-features = false }
cranelift-codegen = { version = "0.70", default-features = false, features = ["x86", "arm64"] }
cranelift-frontend = { version = "0.70", default-features = false }
tracing = "0.1"
hashbrown = { version = "0.9", optional = true }
rayon = "1.5"
serde = { version = "1.0", features = ["derive"] }
more-asserts = "0.2"
gimli = { version = "0.22", optional = true }
gimli = { version = "0.23", optional = true }
smallvec = "1.6"

[dev-dependencies]
target-lexicon = { version = "0.11", default-features = false }
cranelift-codegen = { version = "0.68", features = ["enable-serde", "all-arch"] }
cranelift-codegen = { version = "0.70", features = ["enable-serde", "all-arch"] }
lazy_static = "1.4"

[badges]
Expand Down
9 changes: 0 additions & 9 deletions lib/compiler-cranelift/src/sink.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,6 @@ pub(crate) struct RelocSink<'a> {
}

impl<'a> binemit::RelocSink for RelocSink<'a> {
fn reloc_block(
&mut self,
_offset: binemit::CodeOffset,
_reloc: binemit::Reloc,
_block_offset: binemit::CodeOffset,
) {
// This should use the `offsets` field of `ir::Function`.
panic!("block headers not yet implemented");
}
fn reloc_external(
&mut self,
offset: binemit::CodeOffset,
Expand Down
8 changes: 0 additions & 8 deletions lib/compiler-cranelift/src/trampoline/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,6 @@ pub mod binemit {
pub struct TrampolineRelocSink {}

impl binemit::RelocSink for TrampolineRelocSink {
fn reloc_block(
&mut self,
_offset: binemit::CodeOffset,
_reloc: binemit::Reloc,
_block_offset: binemit::CodeOffset,
) {
panic!("trampoline compilation should not produce block relocs");
}
fn reloc_external(
&mut self,
_offset: binemit::CodeOffset,
Expand Down
2 changes: 1 addition & 1 deletion lib/wasmer-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ edition = "2018"
[dependencies]
# We use `cranelift-entity` here because it's a lightweight dependency and it contains
# some useful data structures
cranelift-entity = "0.68"
cranelift-entity = "0.70"
serde = { version = "1.0", features = ["derive"], optional = true, default-features = false }
thiserror = "1.0"

Expand Down

0 comments on commit 1d44d37

Please sign in to comment.