Merge pull request #3058 from wasmerio/fix_trap_tracking

Fix trap tracking
wasmerio · Aug 2, 2022 · c7fc9b1 · c7fc9b1
2 parents e08b8fd + 7ad24fc
commit c7fc9b1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/lib/compiler/src/engine/trap/frame_info.rs b/lib/compiler/src/engine/trap/frame_info.rs
@@ -203,7 +203,8 @@ pub fn register(
     ) in finished_functions.iter()
     {
         let start = **start as usize;
-        let end = start + len;
+        // end is "last byte" of the function code
+        let end = start + len - 1;
         min = cmp::min(min, start);
         max = cmp::max(max, end);
         let func = FunctionInfo {

diff --git a/tests/ignores.txt b/tests/ignores.txt
@@ -6,22 +6,22 @@ singlepass spec::simd # Singlepass doesn't support yet SIMD (no one asked for th
 ## Unwinding is not properly implemented in Singlepass
 # Needs investigation
 singlepass+aarch64+macos traps::test_trap_trace
-cranelift+aarch64    traps::test_trap_trace
+cranelift+aarch64+macos    traps::test_trap_trace
+llvm+aarch64    traps::test_trap_trace
 singlepass+aarch64+macos traps::test_trap_stack_overflow # Need to investigate
-cranelift+aarch64    traps::test_trap_stack_overflow # Need to investigate
 singlepass+aarch64+macos traps::trap_display_pretty
 llvm       traps::trap_display_pretty
-cranelift+aarch64    traps::trap_display_pretty
+cranelift+aarch64+macos    traps::trap_display_pretty
 singlepass+aarch64+macos traps::trap_display_multi_module
 llvm       traps::trap_display_multi_module
-cranelift+aarch64    traps::trap_display_multi_module
+cranelift+aarch64+macos    traps::trap_display_multi_module
 windows+singlepass   traps::trap_display_multi_module
 singlepass traps::call_signature_mismatch   # Need to investigate, get foo (a[0]:0x33) instead of 0x30 for inderect call
 llvm       traps::call_signature_mismatch
 macos+aarch64    traps::call_signature_mismatch
 singlepass+aarch64+macos traps::start_trap_pretty
 llvm       traps::start_trap_pretty
-cranelift+aarch64    traps::start_trap_pretty
+cranelift+aarch64+macos    traps::start_trap_pretty
 
 # Also neither LLVM nor Cranelift currently implement stack probing on AArch64.
 # https://github.com/wasmerio/wasmer/issues/2808