Skip to content

Commit 91a653b

Browse files
a-sivaCommit Queue
authored andcommitted
Revert "[sdk] Remove some redundant kernel-worker JIT snapshot generation code."
This reverts commit 0e556f6. Reason for revert: cbuild failure on some ads test Original change's description: > [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]> No-Presubmit: true No-Tree-Checks: true No-Try: true Change-Id: I7dd273001bf9c016f014c111ba8fe9197c75e52e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/414383 Bot-Commit: Rubber Stamper <[email protected]> Reviewed-by: Siva Annamalai <[email protected]> Commit-Queue: Srujan Gaddam <[email protected]> Auto-Submit: Siva Annamalai <[email protected]> Reviewed-by: Srujan Gaddam <[email protected]>
1 parent 283d315 commit 91a653b

File tree

4 files changed

+32
-5
lines changed

4 files changed

+32
-5
lines changed

pkg/compiler/tool/modular_test_suite_helper.dart

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

3334
const dillSummaryId = DataId("summary.dill");
3435
const dillId = DataId("full.dill");
@@ -126,13 +127,19 @@ abstract class CFEStep extends IOModularStep {
126127
sources = getSources(module);
127128
}
128129

130+
var isAot = File(_kernelWorkerAotScript).existsSync();
129131
var script = _kernelWorkerAotScript;
130132
var sdkPath = p.dirname(p.dirname(Platform.resolvedExecutable));
131133
var executable = p.absolute(
132134
sdkPath,
133135
'bin',
134136
Platform.isWindows ? 'dartaotruntime.exe' : 'dartaotruntime',
135137
);
138+
if (!isAot) {
139+
// This can be removed once we stop supporting ia32 architecture.
140+
script = _kernelWorkerScript;
141+
executable = Platform.resolvedExecutable;
142+
}
136143

137144
List<String> args = [
138145
script,
@@ -730,6 +737,10 @@ Future<void> resolveScripts(Options options) async {
730737
'utils/bazel/kernel_worker.dart',
731738
'snapshots/kernel_worker_aot.dart.snapshot',
732739
);
740+
_kernelWorkerScript = await resolve(
741+
'utils/bazel/kernel_worker.dart',
742+
'snapshots/kernel_worker.dart.snapshot',
743+
);
733744
}
734745

735746
String _librarySpecForSnapshot =

pkg/dev_compiler/test/expression_compiler/expression_compiler_worker_shared.dart

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

11971197
Future<int> generate() async {
1198-
var exitCode = 0;
11991198
if (!File(dartdevc).existsSync()) {
1200-
exitCode = 1;
1201-
expect(exitCode, 0,
1202-
reason: 'Unable to locate snapshot for compiler $dartdevc');
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;
12031205
}
12041206
Directory.fromUri(config.outputPath).createSync();
12051207

12061208
// generate summaries
1209+
var exitCode = 0;
12071210
for (var module in config.modules.values) {
12081211
exitCode = await _generateSummary(module);
12091212
expect(exitCode, 0,

pkg/dev_compiler/test/modular_helpers.dart

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,5 +325,12 @@ 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;
328335
}
329336
}

sdk/BUILD.gn

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ 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 (AOT snapshot)
60+
# ........kernel_worker_aot.dart.snapshot (JIT snapshot only on ia32)
61+
# ........kernel_worker.dart.snapshot (AOT snapshot, it not ia32)
6162
# ......resources/
6263
# ........dartdoc/
6364
# ..........resources/
@@ -204,6 +205,11 @@ if (dart_target_arch != "ia32" && dart_target_arch != "x86") {
204205
"../utils/ddc:dartdevc",
205206
"dartdevc",
206207
],
208+
[
209+
"kernel_worker",
210+
"../utils/bazel:kernel_worker",
211+
"kernel_worker",
212+
],
207213
]
208214
} else {
209215
_full_sdk_snapshots = _platform_sdk_snapshots + [

0 commit comments

Comments
 (0)