Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 22e7f9f

Browse filesBrowse files
natebiggsCommit Queue
authored andcommitted
[dart2wasm] Add missing call to resolveUri in loadCodegenResult
Once we have internal dart2wasm builds, they will fail loudly if this is missing. So I'm skipping adding a specific SDK test for this. Change-Id: I461fc750ebe226a2d5f8b307d27170c347906b88 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/466160 Reviewed-by: Martin Kustermann <kustermann@google.com> Commit-Queue: Nate Biggs <natebiggs@google.com>
1 parent d586267 commit 22e7f9f
Copy full SHA for 22e7f9f

File tree

Expand file treeCollapse file tree

2 files changed

+5
-6
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

2 files changed

+5
-6
lines changed
Open diff view settings
Collapse file

‎pkg/dart2wasm/lib/compile.dart‎

Copy file name to clipboardExpand all lines: pkg/dart2wasm/lib/compile.dart
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -608,8 +608,8 @@ Future<CompilationResult> _runTfaPhase(
608608

609609
Future<CodegenResult> _loadCodegenResult(compiler.WasmCompilerOptions options,
610610
CompilerPhaseInputOutputManager ioManager) async {
611-
return CodegenResult(options.mainUri.toFilePath(),
612-
await ioManager.getModuleCount(options.mainUri));
611+
final mainUri = (await ioManager.resolveUri(options.mainUri))!.toFilePath();
612+
return CodegenResult(mainUri, await ioManager.getModuleCount(mainUri));
613613
}
614614

615615
Future<CompilationResult> _runCodegenPhase(
Collapse file

‎pkg/dart2wasm/lib/io_util.dart‎

Copy file name to clipboardExpand all lines: pkg/dart2wasm/lib/io_util.dart
+3-4Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,9 @@ class CompilerPhaseInputOutputManager {
137137
return await Process.run(executable, args);
138138
}
139139

140-
Future<int> getModuleCount(Uri mainWasmFile) async {
141-
final mainPath = (await resolveUri(mainWasmFile))!.toFilePath();
142-
final files = (await Directory(path.dirname(mainPath)).list().toList());
143-
final prefix = path.basenameWithoutExtension(mainPath);
140+
Future<int> getModuleCount(String mainWasmFile) async {
141+
final files = (await Directory(path.dirname(mainWasmFile)).list().toList());
142+
final prefix = path.basenameWithoutExtension(mainWasmFile);
144143
bool isMultiModule = false;
145144
int maxModuleId = 0;
146145
for (final file in files) {

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.