mleku/wazero
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

dwarf: fixes for unordered addresses of DWARF line entries (#905)

Browse Source 
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>
This commit is contained in:
Takeshi Yoneda
2022-12-09 09:12:33 +09:00
committed by GitHub
parent cc2e6c0697
commit fccbc7b2aa
16 changed files with 198 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
internal/wasmdebug/dwarf_test.go
View File

@@ -1,6 +1,7 @@
package wasmdebug_test
import (
"fmt"
"math"
"testing"
@@ -9,13 +10,12 @@ import (
"github.com/tetratelabs/wazero/internal/testing/require"
"github.com/tetratelabs/wazero/internal/wasm"
"github.com/tetratelabs/wazero/internal/wasm/binary"
"github.com/tetratelabs/wazero/internal/wasmdebug"
)
func TestGetSourceInfo(t *testing.T) {
mod, err := binary.DecodeModule(dwarftestdata.DWARFWasm, api.CoreFeaturesV2, wasm.MemoryLimitPages, false, true, false)
func TestDWARFLines_Line_TinyGO(t *testing.T) {
mod, err := binary.DecodeModule(dwarftestdata.TinyGoWasm, api.CoreFeaturesV2, wasm.MemoryLimitPages, false, true, false)
require.NoError(t, err)
require.NotNil(t, mod.DWARF)
require.NotNil(t, mod.DWARFLines)
// Get the offsets of functions named "a", "b" and "c" in dwarftestdata.DWARFWasm.
var a, b, c uint64
@@ -36,7 +36,7 @@ func TestGetSourceInfo(t *testing.T) {
}{
// Unknown offset returns empty string.
{offset: math.MaxUint64, exp: ""},
// The first instruction should point to the first line of each function in internal/testing/dwarftestdata/testdata/main.go
// The first instruction should point to the first line of each function in internal/testing/dwarftestdata/testdata/tinygo.go
{offset: a, exp: "wazero/internal/testing/dwarftestdata/testdata/main.go:9:3"},
{offset: b, exp: "wazero/internal/testing/dwarftestdata/testdata/main.go:14:3"},
{offset: c, exp: "wazero/internal/testing/dwarftestdata/testdata/main.go:19:7"},
@@ -44,7 +44,52 @@ func TestGetSourceInfo(t *testing.T) {
for _, tc := range tests {
t.Run(tc.exp, func(t *testing.T) {
actual := wasmdebug.GetSourceInfo(mod.DWARF, tc.offset)
actual := mod.DWARFLines.Line(tc.offset)
require.Contains(t, actual, tc.exp)
})
}
}
func TestDWARFLines_Line_Zig(t *testing.T) {
mod, err := binary.DecodeModule(dwarftestdata.ZigWasm, api.CoreFeaturesV2, wasm.MemoryLimitPages, false, true, false)
require.NoError(t, err)
require.NotNil(t, mod.DWARFLines)
// codeSecStart is the beginning of the first code entry in the Wasm binary.
// If dwarftestdata.ZigWasm has been changed, we need to inspect by `wasm-tools dump`.
const codeSecStart = 0x0109
// These cases are crafted by matching the stack trace result from wasmtime. To verify, run:
//
// WASMTIME_BACKTRACE_DETAILS=1 wasmtime run internal/testing/dwarftestdata/testdata/zig.wasm
//
// And this should produce the output as:
//
// Caused by:
// 0: failed to invoke command default
// 1: error while executing at wasm backtrace:
// 0: 0x2bb - os.abort
// at /Users/mathetake/zig-macos-aarch64-0.11.0-dev.618+096d3efae/lib/std/os.zig:552:9
// 1: 0x18e - builtin.default_panic
// at /Users/mathetake/zig-macos-aarch64-0.11.0-dev.618+096d3efae/lib/std/builtin.zig:787:25
// 2: 0x12d - main.main
// at ././main.zig:1:23
// 3: 0x2ce - start.callMain
// at /Users/mathetake/zig-macos-aarch64-0.11.0-dev.618+096d3efae/lib/std/start.zig:614:37
// - _start
// at /Users/mathetake/zig-macos-aarch64-0.11.0-dev.618+096d3efae/lib/std/start.zig:240:42
for _, tc := range []struct {
offset uint64
exp string
}{
{offset: 0x2bb - codeSecStart, exp: "lib/std/os.zig:552:9"},
{offset: 0x18e - codeSecStart, exp: "lib/std/builtin.zig:787:25"},
{offset: 0x12d - codeSecStart, exp: "main.zig:1:23"},
{offset: 0x2ce - codeSecStart, exp: "lib/std/start.zig:614:37"},
} {
tc := tc
t.Run(fmt.Sprintf("%#x/%s", tc.offset, tc.exp), func(t *testing.T) {
actual := mod.DWARFLines.Line(tc.offset)
require.Contains(t, actual, tc.exp)
})
}