Fix a case of using the wrong stack map during gcs (#2396)

This commit fixes an issue where when looking up the stack map for a pc
within a function we might end up reading the *previous* function's
stack maps. This then later caused asserts to trip because we started
interpreting random data as a `VMExternRef` when it wasn't. The fix was
to add `None` markers for "this range has no stack map" in the function
ranges map.

Closes #2386
This commit is contained in:
Alex Crichton
2020-11-12 13:24:00 -06:00
committed by GitHub
parent cbce34af0a
commit 068340d30f
2 changed files with 71 additions and 4 deletions

View File

@@ -0,0 +1,49 @@
(module
(global $g (mut externref) (ref.null extern))
;; This function will have a stack map, notably one that's a bit
;; different than the one below.
(func $has_a_stack_map
(local externref)
global.get $g
local.tee 0
global.set $g
local.get 0
global.set $g
ref.null extern
global.set $g
)
;; This function also has a stack map, but it's only applicable after
;; the call to the `$gc` import, so when we gc during that we shouldn't
;; accidentally read the previous function's stack maps and use that
;; for our own.
(func (export "run") (result i32)
call $gc
ref.null extern
global.set $g
i32.const 0
)
(func (export "init") (param externref)
local.get 0
global.set $g
)
;; A small function which when run triggers a gc in wasmtime
(func $gc
(local $i i32)
i32.const 10000
local.set $i
(loop $continue
(global.set $g (global.get $g))
(local.tee $i (i32.sub (local.get $i) (i32.const 1)))
br_if $continue
)
)
)
(invoke "init" (ref.extern 1))
(assert_return (invoke "run") (i32.const 0))