Fix snapshot paths.

Author: a-siva

dwds/lib/src/utilities/sdk_configuration.dart

@@ -45,6 +45,7 @@ class SdkLayout {
 
   final String sdkDirectory;
   final String summaryPath;
+  final String dartdevcJitSnapshotPath;
   final String dartdevcSnapshotPath;
 
   @Deprecated('Only sound null safety is supported as of Dart 3.0')
@@ -62,19 +63,26 @@ class SdkLayout {
           '_internal',
           'ddc_outline.dill',
         ),
-        dartdevcSnapshotPath: p.join(
+        dartdevcJitSnapshotPath: p.join(
           sdkDirectory,
           'bin',
           'snapshots',
           'dartdevc.dart.snapshot',
         ),
+        dartdevcSnapshotPath: p.join(
+          sdkDirectory,
+          'bin',
+          'snapshots',
+          'dartdevc.aot.dart.snapshot',
+        ),
       );
 
   const SdkLayout({
     required this.sdkDirectory,
     required this.summaryPath,
     this.soundSummaryPath = '',
     this.weakSummaryPath = '',
+    required this.dartdevcJitSnapshotPath,
     required this.dartdevcSnapshotPath,
   });
 }
@@ -113,7 +121,10 @@ class SdkConfiguration {
     : this(
         sdkDirectory: sdkLayout.sdkDirectory,
         sdkSummaryPath: sdkLayout.summaryPath,
-        compilerWorkerPath: sdkLayout.dartdevcSnapshotPath,
+        // This compiler path is used to spawn the expression compiler
+        // in a new isolate and hence it needs to be a JIT snapshot
+        // until dwds itself can run in AOT mode.
+        compilerWorkerPath: sdkLayout.dartdevcJitSnapshotPath,
       );
 
   static Uri? _toUri(String? path) => path == null ? null : p.toUri(path);

dwds/test/sdk_configuration_test.dart

@@ -100,7 +100,7 @@ void main() {
     final sdkLayout = SdkLayout.createDefault(sdkDirectory);
     final sdkConfiguration = SdkConfiguration.fromSdkLayout(sdkLayout);
     final sdkSummaryPath = sdkLayout.summaryPath;
-    final compilerWorkerPath = sdkLayout.dartdevcSnapshotPath;
+    final compilerWorkerPath = sdkLayout.dartdevcJitSnapshotPath;
 
     setUp(() async {
       fs = MemoryFileSystem();

test_common/lib/test_sdk_layout.dart

@@ -103,6 +103,7 @@ class TestSdkLayout {
           'snapshots',
           'frontend_server_aot.dart.snapshot',
         ),
+        dartdevcSnapshotPath: sdkLayout.dartdevcJitSnapshotPath,
         dartdevcSnapshotPath: sdkLayout.dartdevcSnapshotPath,
         kernelWorkerSnapshotPath: p.join(
           sdkLayout.sdkDirectory,
@@ -141,6 +142,7 @@ class TestSdkLayout {
   final String dartPath;
   final String dartAotRuntimePath;
   final String frontendServerSnapshotPath;
+  final String dartdevcJitSnapshotPath;
   final String dartdevcSnapshotPath;
   final String kernelWorkerSnapshotPath;
   final String devToolsDirectory;
@@ -159,6 +161,7 @@ class TestSdkLayout {
     required this.dartPath,
     required this.dartAotRuntimePath,
     required this.frontendServerSnapshotPath,
+    required this.dartdevcJitSnapshotPath,
     required this.dartdevcSnapshotPath,
     required this.kernelWorkerSnapshotPath,
     required this.devToolsDirectory,
@@ -169,7 +172,7 @@ class TestSdkLayout {
       SdkConfiguration(
         sdkDirectory: sdkLayout.sdkDirectory,
         sdkSummaryPath: sdkLayout.summaryPath,
-        compilerWorkerPath: sdkLayout.dartdevcSnapshotPath,
+        compilerWorkerPath: sdkLayout.dartdevcJitSnapshotPath,
       );
 }
 

test_common/test/sdk_asset_generator_test.dart

@@ -38,7 +38,7 @@ void main() {
       final copySdkLayout = TestSdkLayout.createDefault(sdkDirectory);
 
       sdkSummaryPath = copySdkLayout.summaryPath;
-      compilerWorkerPath = copySdkLayout.dartdevcSnapshotPath;
+      compilerWorkerPath = copySdkLayout.dartdevcJitSnapshotPath;
 
       // Copy the SDK directory into a temp directory.
       await copyDirectory(TestSdkLayout.defaultSdkDirectory, sdkDirectory);