T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2588 from hanqo/patch-1

Browse Source 
Bugfix of issue #2575
This commit is contained in:
Chris Fallin
2021-01-19 11:04:18 -08:00
committed by GitHub
parent c7de8f5efb 32343a7018
commit 13003a3e91
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@@ -1115,9 +1115,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.81" version = "0.2.82"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"
[[package]] [[package]]
name = "libfuzzer-sys" name = "libfuzzer-sys"

2
crates/runtime/Cargo.toml
View File

@@ -14,7 +14,7 @@ edition = "2018"
[dependencies] [dependencies]
wasmtime-environ = { path = "../environ", version = "0.22.0" } wasmtime-environ = { path = "../environ", version = "0.22.0" }
region = "2.1.0" region = "2.1.0"
libc = { version = "0.2.70", default-features = false } libc = { version = "0.2.82", default-features = false }
log = "0.4.8" log = "0.4.8"
memoffset = "0.6.0" memoffset = "0.6.0"
indexmap = "1.0.2" indexmap = "1.0.2"

8
crates/runtime/src/traphandlers.rs
View File

@@ -164,9 +164,15 @@ cfg_if::cfg_if! {
} else if #[cfg(all(any(target_os = "linux", target_os = "android"), target_arch = "aarch64"))] { } else if #[cfg(all(any(target_os = "linux", target_os = "android"), target_arch = "aarch64"))] {
let cx = &*(cx as *const libc::ucontext_t); let cx = &*(cx as *const libc::ucontext_t);
cx.uc_mcontext.pc as *const u8 cx.uc_mcontext.pc as *const u8
} else if #[cfg(target_os = "macos")] { } else if #[cfg(all(target_os = "macos", target_arch = "x86_64"))] {
let cx = &*(cx as *const libc::ucontext_t); let cx = &*(cx as *const libc::ucontext_t);
(*cx.uc_mcontext).__ss.__rip as *const u8 (*cx.uc_mcontext).__ss.__rip as *const u8
} else if #[cfg(all(target_os = "macos", target_arch = "x86"))] {
let cx = &*(cx as *const libc::ucontext_t);
(*cx.uc_mcontext).__ss.__eip as *const u8
} else if #[cfg(all(target_os = "macos", target_arch = "aarch64"))] {
let cx = &*(cx as *const libc::ucontext_t);
(*cx.uc_mcontext).__ss.__pc as *const u8
} else if #[cfg(all(target_os = "freebsd", target_arch = "x86_64"))] { } else if #[cfg(all(target_os = "freebsd", target_arch = "x86_64"))] {
let cx = &*(cx as *const libc::ucontext_t); let cx = &*(cx as *const libc::ucontext_t);
cx.uc_mcontext.mc_rip as *const u8 cx.uc_mcontext.mc_rip as *const u8