Skip to content

Commit 98aa842

Browse files
a-sivaCommit Queue
authored and
Commit Queue
committed
[dartdev] Switch 'compile js-dev' to use VmInteropHandler.run
TEST=ci Change-Id: I9a19b6d746ab8d87a2d7993b89fdf62ed06edaab Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/405540 Reviewed-by: Ben Konyi <[email protected]> Commit-Queue: Siva Annamalai <[email protected]>
1 parent 103ffd6 commit 98aa842

File tree

2 files changed

+13
-23
lines changed

2 files changed

+13
-23
lines changed

pkg/dartdev/lib/src/commands/compile.dart

+13-7
Original file line numberDiff line numberDiff line change
@@ -158,24 +158,30 @@ class CompileDDCCommand extends CompileSubcommandCommand {
158158
}
159159
final args = argResults!;
160160
var snapshot = sdk.ddcAotSnapshot;
161-
var runtime = sdk.dartAotRuntime;
161+
var script = sdk.dartAotRuntime;
162+
var useExecProcess = true;
162163
if (!Sdk.checkArtifactExists(snapshot, logError: false)) {
163164
// AOT snapshots cannot be generated on IA32, so we need this fallback
164165
// branch until support for IA32 is dropped (https://dartbug.com/49969).
165-
snapshot = sdk.ddcSnapshot;
166-
runtime = sdk.dart;
167-
if (!Sdk.checkArtifactExists(snapshot)) {
166+
script = sdk.ddcSnapshot;
167+
if (!Sdk.checkArtifactExists(script)) {
168168
return genericErrorExitCode;
169169
}
170+
useExecProcess = false;
170171
}
171172
final ddcCommand = <String>[
172-
runtime,
173-
snapshot,
173+
if (useExecProcess) snapshot,
174174
// Add the remaining arguments.
175175
if (args.rest.isNotEmpty) ...args.rest.sublist(0),
176176
];
177177
try {
178-
return await runProcessInheritStdio(ddcCommand);
178+
VmInteropHandler.run(
179+
script,
180+
ddcCommand,
181+
packageConfigOverride: null,
182+
useExecProcess: useExecProcess,
183+
);
184+
return 0;
179185
} catch (e, st) {
180186
log.stderr('Error: JS compilation failed');
181187
log.stderr(e.toString());

pkg/dartdev/lib/src/core.dart

-16
Original file line numberDiff line numberDiff line change
@@ -132,22 +132,6 @@ Future<int> runProcess(
132132
return exitCode;
133133
}
134134

135-
Future<int> runProcessInheritStdio(
136-
List<String> command, {
137-
bool logToTrace = false,
138-
void Function(String str)? listener,
139-
String? cwd,
140-
}) async {
141-
log.trace(command.join(' '));
142-
final process = await Process.start(
143-
command.first,
144-
command.skip(1).toList(),
145-
workingDirectory: cwd,
146-
mode: ProcessStartMode.inheritStdio,
147-
);
148-
return await process.exitCode;
149-
}
150-
151135
Future _streamLineTransform(
152136
Stream<List<int>> stream,
153137
Function(String line) handler,

0 commit comments

Comments
 (0)