Merge pull request wasmerio#3051 from wasmerio/update_cranelift_0_86_1

Updated Crenelift to v0.86.1
Web3-Net · Jul 29, 2022 · 00ce911 · 00ce911
2 parents 93f6d7b + e19e0e6
commit 00ce911
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 46 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/compiler-cranelift/Cargo.toml b/lib/compiler-cranelift/Cargo.toml
@@ -14,9 +14,9 @@ edition = "2018"
 [dependencies]
 wasmer-compiler = { path = "../compiler", version = "=2.3.0", features = ["translator", "compiler"], default-features = false }
 wasmer-types = { path = "../types", version = "=2.3.0", default-features = false, features = ["std"] }
-cranelift-entity = { version = "0.82", default-features = false }
-cranelift-codegen = { version = "0.82", default-features = false, features = ["x86", "arm64"] }
-cranelift-frontend = { version = "0.82", default-features = false }
+cranelift-entity = { version = "0.86.1", default-features = false }
+cranelift-codegen = { version = "0.86.1", default-features = false, features = ["x86", "arm64"] }
+cranelift-frontend = { version = "0.86.1", default-features = false }
 tracing = "0.1"
 hashbrown = { version = "0.11", optional = true }
 rayon = { version = "1.5", optional = true }
@@ -26,7 +26,7 @@ smallvec = "1.6"
 target-lexicon = { version = "0.12.2", default-features = false }
 
 [dev-dependencies]
-cranelift-codegen = { version = "0.82", features = ["all-arch"] }
+cranelift-codegen = { version = "0.86.1", features = ["all-arch"] }
 lazy_static = "1.4"
 
 [badges]

diff --git a/lib/compiler-cranelift/src/compiler.rs b/lib/compiler-cranelift/src/compiler.rs
@@ -393,7 +393,6 @@ impl Compiler for CraneliftCompiler {
 fn mach_reloc_to_reloc(module: &ModuleInfo, reloc: &MachReloc) -> Relocation {
     let &MachReloc {
         offset,
-        srcloc: _,
         kind,
         ref name,
         addend,
@@ -419,11 +418,7 @@ fn mach_reloc_to_reloc(module: &ModuleInfo, reloc: &MachReloc) -> Relocation {
 }
 
 fn mach_trap_to_trap(trap: &MachTrap) -> TrapInformation {
-    let &MachTrap {
-        offset,
-        srcloc: _,
-        code,
-    } = trap;
+    let &MachTrap { offset, code } = trap;
     TrapInformation {
         code_offset: offset,
         trap_code: translate_ir_trapcode(code),