Skip to content
This repository has been archived by the owner on Feb 10, 2025. It is now read-only.

Relax URI matching in V8 Wasm frame regex #161

Merged
merged 1 commit into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/src/frame.dart
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ final _v8JsUrlLocation = RegExp(r'^(.*?):(\d+)(?::(\d+))?$|native$');
// To avoid having multiple groups for the same part of the frame, this regex
// matches unmatched parentheses after the member name.
final _v8WasmFrame = RegExp(r'^\s*at (?:(?<member>.+) )?'
r'(?:\(?(?:(?<uri>wasm:\S+):wasm-function\[(?<index>\d+)\]'
r'(?:\(?(?:(?<uri>\S+):wasm-function\[(?<index>\d+)\]'
r'\:0x(?<offset>[0-9a-fA-F]+))\)?)$');

// eval as function (https://example.com/stuff.dart.js:560:28), efn:3:28
Expand Down
9 changes: 9 additions & 0 deletions test/frame_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,15 @@ baz@https://pub.dev/buz.js:56355:55
expect(frame.member, 'main tear-off trampoline');
});

test('parses a V8 Wasm frame with a name with colons and parens', () {
var frame = Frame.parseV8(' at a::b::c() '
'(https://a.b.com/x/y/z.wasm:wasm-function[66334]:0x12c28ad)');
expect(frame.uri, Uri.parse('https://a.b.com/x/y/z.wasm'));
expect(frame.line, 1);
expect(frame.column, 0x12c28ad + 1);
expect(frame.member, 'a::b::c()');
});

test('parses a V8 Wasm frame without a name', () {
var frame =
Frame.parseV8(' at wasm://wasm/0006d966:wasm-function[119]:0xbb13');
Expand Down