Skip to content

Commit 1a48649

Browse files
a-sivaCommit Queue
authored andcommitted
[dartdev] Fix ia32 invocation of dart2js from 'compile js' command.
TEST=ci Change-Id: I5b7a180cdadeb9a78038af8dc0631fad7b757a5e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/405260 Commit-Queue: Siva Annamalai <[email protected]> Reviewed-by: Ben Konyi <[email protected]>
1 parent 9b7bb9d commit 1a48649

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,20 +93,19 @@ class CompileJSCommand extends CompileSubcommandCommand {
9393
}
9494
final args = argResults!;
9595
var snapshot = sdk.dart2jsAotSnapshot;
96-
var runtime = sdk.dartAotRuntime;
96+
var script = sdk.dartAotRuntime;
9797
var useExecProcess = true;
9898
if (!Sdk.checkArtifactExists(snapshot, logError: false)) {
9999
// AOT snapshots cannot be generated on IA32, so we need this fallback
100100
// branch until support for IA32 is dropped (https://dartbug.com/49969).
101-
snapshot = sdk.dart2jsSnapshot;
102-
if (!Sdk.checkArtifactExists(snapshot)) {
101+
script = sdk.dart2jsSnapshot;
102+
if (!Sdk.checkArtifactExists(script)) {
103103
return genericErrorExitCode;
104104
}
105-
runtime = sdk.dart;
106105
useExecProcess = false;
107106
}
108107
final dart2jsCommand = [
109-
snapshot,
108+
if (useExecProcess) snapshot,
110109
'--libraries-spec=${sdk.librariesJson}',
111110
'--cfe-invocation-modes=compile',
112111
'--invoker=dart_cli',
@@ -115,7 +114,7 @@ class CompileJSCommand extends CompileSubcommandCommand {
115114
];
116115
try {
117116
VmInteropHandler.run(
118-
runtime,
117+
script,
119118
dart2jsCommand,
120119
packageConfigOverride: null,
121120
useExecProcess: useExecProcess,

0 commit comments

Comments
 (0)