-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[dart2wasm] Pass source maps to wasm-opt when optimizing
To be able to know when we are generating a source map, make `dart compile wasm` aware of the `--no-source-maps` flag. The "name" segments of source mappings are also made `null` with this patch. Browsers don't use that segment and binaryen doesn't support it. Change-Id: I7b52c8fb7cef92ed60547e97ad137e0cd3967f26 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/378421 Commit-Queue: Ömer Ağacan <omersa@google.com> Reviewed-by: Martin Kustermann <kustermann@google.com>
- Loading branch information
Showing
9 changed files
with
202 additions
and
117 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| // Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file | ||
| // for details. All rights reserved. Use of this source code is governed by a | ||
| // BSD-style license that can be found in the LICENSE file. | ||
|
|
||
| import 'dart:js_interop'; | ||
| import 'dart:typed_data'; | ||
| import 'dart:convert'; | ||
|
|
||
| import 'package:source_maps/parser.dart'; | ||
|
|
||
| void f() { | ||
| g(); | ||
| } | ||
|
|
||
| void g() { | ||
| throw 'hi'; | ||
| } | ||
|
|
||
| runtimeFalse() => int.parse('1') == 0; | ||
|
|
||
| // `frameDetails` is (line, column) of the frames we check. | ||
| // | ||
| // Information we don't check are "null": we don't want to check line/column | ||
| // of standard library functions to avoid breaking the test with unrelated | ||
| // changes to the standard library. | ||
| void testMain(String testName, List<(int?, int?)?> frameDetails) { | ||
| // Use `f` and `g` in a few places to make sure wasm-opt won't inline them | ||
| // in the test. | ||
| final fTearOff = f; | ||
| final gTearOff = g; | ||
|
|
||
| if (runtimeFalse()) f(); | ||
| if (runtimeFalse()) g(); | ||
|
|
||
| // Read source map of the current program. | ||
| final compilationDir = const String.fromEnvironment("TEST_COMPILATION_DIR"); | ||
| final sourceMapFileContents = | ||
| readfile('$compilationDir/${testName}_test.wasm.map'); | ||
| final mapping = parse(utf8.decode(sourceMapFileContents)) as SingleMapping; | ||
|
|
||
| // Get some simple stack trace. | ||
| String? stackTraceString; | ||
| try { | ||
| f(); | ||
| } catch (e, st) { | ||
| stackTraceString = st.toString(); | ||
| } | ||
|
|
||
| // Print the stack trace to make it easy to update the test. | ||
| print("-----"); | ||
| print(stackTraceString); | ||
| print("-----"); | ||
|
|
||
| final stackTraceLines = stackTraceString!.split('\n'); | ||
|
|
||
| for (int frameIdx = 0; frameIdx < frameDetails.length; frameIdx += 1) { | ||
| final line = stackTraceLines[frameIdx]; | ||
| final hexOffsetMatch = stackTraceHexOffsetRegExp.firstMatch(line); | ||
| if (hexOffsetMatch == null) { | ||
| throw "Unable to parse hex offset from stack frame $frameIdx"; | ||
| } | ||
| final hexOffsetStr = hexOffsetMatch.group(1)!; // includes '0x' | ||
| final offset = int.tryParse(hexOffsetStr); | ||
| if (offset == null) { | ||
| throw "Unable to parse hex number in frame $frameIdx: $hexOffsetStr"; | ||
| } | ||
| final span = mapping.spanFor(0, offset); | ||
| final frameInfo = frameDetails[frameIdx]; | ||
| if (frameInfo == null) { | ||
| if (span != null) { | ||
| throw "Stack frame $frameIdx should not have a source span, but it is mapped: $span"; | ||
| } | ||
| continue; | ||
| } | ||
| if (span == null) { | ||
| print("Stack frame $frameIdx does not have source mapping"); | ||
| } else { | ||
| if (frameInfo.$1 != null) { | ||
| if (span.start.line + 1 != frameInfo.$1) { | ||
| throw "Stack frame $frameIdx is expected to have line ${frameInfo.$1}, but it has line ${span.start.line + 1}"; | ||
| } | ||
| } | ||
| if (frameInfo.$2 != null) { | ||
| if (span.start.column + 1 != frameInfo.$2) { | ||
| throw "Stack frame $frameIdx is expected to have column ${frameInfo.$2}, but it has column ${span.start.column + 1}"; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// Read the file at the given [path]. | ||
| /// | ||
| /// This relies on the `readbuffer` function provided by d8. | ||
| @JS() | ||
| external JSArrayBuffer readbuffer(JSString path); | ||
|
|
||
| /// Read the file at the given [path]. | ||
| Uint8List readfile(String path) => Uint8List.view(readbuffer(path.toJS).toDart); | ||
|
|
||
| final stackTraceHexOffsetRegExp = RegExp(r'wasm-function.*(0x[0-9a-fA-F]+)\)$'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| // Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file | ||
| // for details. All rights reserved. Use of this source code is governed by a | ||
| // BSD-style license that can be found in the LICENSE file. | ||
|
|
||
| // dart2wasmOptions=-O4 --no-strip-wasm --extra-compiler-option=-DTEST_COMPILATION_DIR=$TEST_COMPILATION_DIR | ||
|
|
||
| import 'source_map_simple_lib.dart' as Lib; | ||
|
|
||
| void main() { | ||
| Lib.testMain('source_map_simple_optimized', frameDetails); | ||
| } | ||
|
|
||
| const List<(int?, int?)?> frameDetails = [ | ||
| (null, null), // _throwWithCurrentStackTrace | ||
| (16, 3), // g | ||
| (12, 3), // f | ||
| (44, 5), // testMain, inlined in main | ||
| (null, null), // _invokeMain | ||
| ]; | ||
|
|
||
| /* | ||
| at Error._throwWithCurrentStackTrace (wasm://wasm/0008d08e:wasm-function[115]:0xc095) | ||
| at g (wasm://wasm/0008d08e:wasm-function[359]:0x11e15) | ||
| at f (wasm://wasm/0008d08e:wasm-function[358]:0x11e0b) | ||
| at main (wasm://wasm/0008d08e:wasm-function[357]:0x11913) | ||
| at _invokeMain (wasm://wasm/0008d08e:wasm-function[82]:0xb349) | ||
| at Module.invoke (...) | ||
| at main (...) | ||
| at async action (...) | ||
| */ |
Oops, something went wrong.