Skip to content

Commit 0e556f6

Browse files
a-sivaCommit Queue
authored andcommitted
[sdk] Remove some redundant kernel-worker JIT snapshot generation code.
Change-Id: Ic092633dd6f5eb0dcfdef70472221ddc7951bbbf Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/412783 Reviewed-by: Srujan Gaddam <[email protected]> Commit-Queue: Siva Annamalai <[email protected]> Reviewed-by: Nicholas Shahan <[email protected]>
1 parent 03293b5 commit 0e556f6

File tree

4 files changed

+5
-32
lines changed

4 files changed

+5
-32
lines changed

pkg/compiler/tool/modular_test_suite_helper.dart

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ Uri packageConfigUri = sdkRoot.resolve(packageConfigJsonPath);
2929
late Options _options;
3030
late String _dart2jsScript;
3131
late String _kernelWorkerAotScript;
32-
late String _kernelWorkerScript;
3332

3433
const dillSummaryId = DataId("summary.dill");
3534
const dillId = DataId("full.dill");
@@ -127,19 +126,13 @@ abstract class CFEStep extends IOModularStep {
127126
sources = getSources(module);
128127
}
129128

130-
var isAot = File(_kernelWorkerAotScript).existsSync();
131129
var script = _kernelWorkerAotScript;
132130
var sdkPath = p.dirname(p.dirname(Platform.resolvedExecutable));
133131
var executable = p.absolute(
134132
sdkPath,
135133
'bin',
136134
Platform.isWindows ? 'dartaotruntime.exe' : 'dartaotruntime',
137135
);
138-
if (!isAot) {
139-
// This can be removed once we stop supporting ia32 architecture.
140-
script = _kernelWorkerScript;
141-
executable = Platform.resolvedExecutable;
142-
}
143136

144137
List<String> args = [
145138
script,
@@ -737,10 +730,6 @@ Future<void> resolveScripts(Options options) async {
737730
'utils/bazel/kernel_worker.dart',
738731
'snapshots/kernel_worker_aot.dart.snapshot',
739732
);
740-
_kernelWorkerScript = await resolve(
741-
'utils/bazel/kernel_worker.dart',
742-
'snapshots/kernel_worker.dart.snapshot',
743-
);
744733
}
745734

746735
String _librarySpecForSnapshot =

pkg/dev_compiler/test/expression_compiler/expression_compiler_worker_shared.dart

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,18 +1195,15 @@ class DDCKernelGenerator {
11951195
DDCKernelGenerator(this.config, this.verbose);
11961196

11971197
Future<int> generate() async {
1198+
var exitCode = 0;
11981199
if (!File(dartdevc).existsSync()) {
1199-
// This can be removed once we stop supporting ia32 architecture.
1200-
dartdevc = p.join(
1201-
sdkPath, 'dart-sdk', 'bin', 'snapshots', 'dartdevc.dart.snapshot');
1202-
kernelWorker = p.join(sdkPath, 'dart-sdk', 'bin', 'snapshots',
1203-
'kernel_worker.dart.snapshot');
1204-
dartExecutable = Platform.resolvedExecutable;
1200+
exitCode = 1;
1201+
expect(exitCode, 0,
1202+
reason: 'Unable to locate snapshot for compiler $dartdevc');
12051203
}
12061204
Directory.fromUri(config.outputPath).createSync();
12071205

12081206
// generate summaries
1209-
var exitCode = 0;
12101207
for (var module in config.modules.values) {
12111208
exitCode = await _generateSummary(module);
12121209
expect(exitCode, 0,

pkg/dev_compiler/test/modular_helpers.dart

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -325,12 +325,5 @@ Future<void> resolveScripts(Options options) async {
325325
'bin',
326326
Platform.isWindows ? 'dartaotruntime.exe' : 'dartaotruntime',
327327
);
328-
} else {
329-
// This can be removed once we stop supporting ia32 architecture.
330-
_dartdevcScript = await resolve('pkg/dev_compiler/bin/dartdevc.dart',
331-
'snapshots/dartdevc.dart.snapshot');
332-
_kernelWorkerScript = await resolve('utils/bazel/kernel_worker.dart',
333-
'snapshots/kernel_worker.dart.snapshot');
334-
_dartExecutable = Platform.resolvedExecutable;
335328
}
336329
}

sdk/BUILD.gn

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ declare_args() {
5757
# ........frontend_server.dart.snapshot (JIT snapshot only on ia32)
5858
# ........gen_kernel_aot.dart.snapshot (if not on ia32)
5959
# ........kernel-service.dart.snapshot
60-
# ........kernel_worker_aot.dart.snapshot (JIT snapshot only on ia32)
61-
# ........kernel_worker.dart.snapshot (AOT snapshot, it not ia32)
60+
# ........kernel_worker_aot.dart.snapshot (AOT snapshot)
6261
# ......resources/
6362
# ........dartdoc/
6463
# ..........resources/
@@ -205,11 +204,6 @@ if (dart_target_arch != "ia32" && dart_target_arch != "x86") {
205204
"../utils/ddc:dartdevc",
206205
"dartdevc",
207206
],
208-
[
209-
"kernel_worker",
210-
"../utils/bazel:kernel_worker",
211-
"kernel_worker",
212-
],
213207
]
214208
} else {
215209
_full_sdk_snapshots = _platform_sdk_snapshots + [

0 commit comments

Comments
 (0)