[vm] Unsound mode cleanup - kernel service

Removed 'sound null safety' flags from kernel service as
VM no longer supports unsound mode.

Also cleaned up unused 'original working directory' from messages
sent from the VM to kernel service.

TEST=ci

Change-Id: Idca5fc3276ea182d08ba8969aa494a8ad6b96b70
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/363141
Reviewed-by: Siva Annamalai <[email protected]>
Commit-Queue: Alexander Markov <[email protected]>

Author: alexmarkov

pkg/vm/bin/kernel_service.dart

@@ -39,8 +39,7 @@ import 'package:kernel/binary/ast_from_binary.dart'
 import 'package:kernel/binary/ast_to_binary.dart';
 import 'package:kernel/class_hierarchy.dart' show ClassHierarchy;
 import 'package:kernel/core_types.dart' show CoreTypes;
-import 'package:kernel/kernel.dart'
-    show Component, Library, Procedure, NonNullableByDefaultCompiledMode;
+import 'package:kernel/kernel.dart' show Component, Library, Procedure;
 import 'package:kernel/target/targets.dart' show Target, TargetFlags;
 import 'package:vm/http_filesystem.dart';
 import 'package:vm/incremental_compiler.dart';
@@ -84,7 +83,6 @@ CompilerOptions setupCompilerOptions(
     Uri? platformKernelPath,
     bool enableAsserts,
     bool embedSources,
-    bool soundNullSafety,
     List<String>? experimentalFlags,
     Uri? packagesUri,
     List<String> errorsPlain,
@@ -100,8 +98,7 @@ CompilerOptions setupCompilerOptions(
   }
 
   Verbosity verbosity = Verbosity.parseArgument(verbosityLevel);
-  Target target = new VmTarget(new TargetFlags(
-      soundNullSafety: soundNullSafety, supportMirrors: enableMirrors));
+  Target target = new VmTarget(new TargetFlags(supportMirrors: enableMirrors));
   return new CompilerOptions()
     ..fileSystem = fileSystem
     ..target = target
@@ -118,7 +115,6 @@ CompilerOptions setupCompilerOptions(
       errorsColorized.add(msg);
     })
     ..environmentDefines = new EnvironmentMap()
-    ..nnbdMode = soundNullSafety ? NnbdMode.Strong : NnbdMode.Weak
     ..onDiagnostic = (DiagnosticMessage message) {
       bool printToStdErr = false;
       bool printToStdOut = false;
@@ -161,7 +157,6 @@ abstract class Compiler {
   final Uri? platformKernelPath;
   final bool enableAsserts;
   final bool embedSources;
-  final bool soundNullSafety;
   final List<String>? experimentalFlags;
   final String? packageConfig;
   final String invocationModes;
@@ -181,7 +176,6 @@ abstract class Compiler {
   Compiler(this.isolateGroupId, this.fileSystem, this.platformKernelPath,
       {this.enableAsserts = false,
       this.embedSources = true,
-      this.soundNullSafety = true,
       this.experimentalFlags = null,
       this.supportCodeCoverage = false,
       this.supportHotReload = false,
@@ -207,7 +201,6 @@ abstract class Compiler {
         platformKernelPath,
         enableAsserts,
         embedSources,
-        soundNullSafety,
         experimentalFlags,
         packagesUri,
         errorsPlain,
@@ -297,15 +290,13 @@ class IncrementalCompilerWrapper extends Compiler {
   IncrementalCompilerWrapper(
       int isolateGroupId, FileSystem fileSystem, Uri? platformKernelPath,
       {bool enableAsserts = false,
-      bool soundNullSafety = true,
       List<String>? experimentalFlags,
       String? packageConfig,
       String invocationModes = '',
       String verbosityLevel = Verbosity.defaultValue,
       required bool enableMirrors})
       : super(isolateGroupId, fileSystem, platformKernelPath,
             enableAsserts: enableAsserts,
-            soundNullSafety: soundNullSafety,
             experimentalFlags: experimentalFlags,
             supportHotReload: true,
             supportCodeCoverage: true,
@@ -357,7 +348,6 @@ class IncrementalCompilerWrapper extends Compiler {
     IncrementalCompilerWrapper clone = IncrementalCompilerWrapper(
         isolateGroupId, fileSystem, platformKernelPath,
         enableAsserts: enableAsserts,
-        soundNullSafety: soundNullSafety,
         experimentalFlags: experimentalFlags,
         packageConfig: packageConfig,
         invocationModes: invocationModes,
@@ -393,7 +383,6 @@ class SingleShotCompilerWrapper extends Compiler {
       {this.requireMain = false,
       bool enableAsserts = false,
       bool embedSources = true,
-      bool soundNullSafety = true,
       List<String>? experimentalFlags,
       String? packageConfig,
       String invocationModes = '',
@@ -402,7 +391,6 @@ class SingleShotCompilerWrapper extends Compiler {
       : super(isolateGroupId, fileSystem, platformKernelPath,
             enableAsserts: enableAsserts,
             embedSources: embedSources,
-            soundNullSafety: soundNullSafety,
             experimentalFlags: experimentalFlags,
             packageConfig: packageConfig,
             invocationModes: invocationModes,
@@ -438,7 +426,6 @@ IncrementalCompilerWrapper? lookupIncrementalCompiler(int isolateGroupId) {
 Future<Compiler> lookupOrBuildNewIncrementalCompiler(int isolateGroupId,
     List sourceFiles, Uri platformKernelPath, List<int>? platformKernel,
     {bool enableAsserts = false,
-    bool soundNullSafety = true,
     List<String>? experimentalFlags,
     String? packageConfig,
     String? multirootFilepaths,
@@ -470,7 +457,6 @@ Future<Compiler> lookupOrBuildNewIncrementalCompiler(int isolateGroupId,
       compiler = new IncrementalCompilerWrapper(
           isolateGroupId, fileSystem, platformKernelPath,
           enableAsserts: enableAsserts,
-          soundNullSafety: soundNullSafety,
           experimentalFlags: experimentalFlags,
           packageConfig: packageConfig,
           invocationModes: invocationModes,
@@ -778,7 +764,7 @@ Future _processLoadRequest(request) async {
   }
 
   final SendPort port = request[1];
-  final int isolateGroupId = request[8];
+  final int isolateGroupId = request[7];
   if (tag == kListDependenciesTag) {
     await _processListDependenciesRequest(port, isolateGroupId);
     return;
@@ -790,16 +776,15 @@ Future _processLoadRequest(request) async {
   final bool incremental = request[4];
   final bool forSnapshot = request[5];
   final bool embedSources = request[6];
-  final bool soundNullSafety = request[7];
-  final List sourceFiles = request[9];
-  final bool enableAsserts = request[10];
+  final List sourceFiles = request[8];
+  final bool enableAsserts = request[9];
   final List<String>? experimentalFlags =
-      request[11] != null ? request[11].cast<String>() : null;
-  final String? packageConfig = request[12];
-  final String? multirootFilepaths = request[13];
-  final String? multirootScheme = request[14];
-  final String verbosityLevel = request[16];
-  final bool enableMirrors = request[17];
+      request[10] != null ? request[10].cast<String>() : null;
+  final String? packageConfig = request[11];
+  final String? multirootFilepaths = request[12];
+  final String? multirootScheme = request[13];
+  final String verbosityLevel = request[14];
+  final bool enableMirrors = request[15];
   Uri platformKernelPath;
   List<int>? platformKernel = null;
   if (request[3] is String) {
@@ -869,7 +854,6 @@ Future _processLoadRequest(request) async {
     compiler = await lookupOrBuildNewIncrementalCompiler(
         isolateGroupId, sourceFiles, platformKernelPath, platformKernel,
         enableAsserts: enableAsserts,
-        soundNullSafety: soundNullSafety,
         experimentalFlags: experimentalFlags,
         packageConfig: packageConfig,
         multirootFilepaths: multirootFilepaths,
@@ -886,7 +870,6 @@ Future _processLoadRequest(request) async {
         requireMain: false,
         embedSources: embedSources,
         enableAsserts: enableAsserts,
-        soundNullSafety: soundNullSafety,
         experimentalFlags: experimentalFlags,
         packageConfig: packageConfig,
         invocationModes: invocationModes,
@@ -919,9 +902,6 @@ Future _processLoadRequest(request) async {
           await NativeAssetsSynthesizer.synthesizeLibraryFromYamlString(
         nativeAssets,
         errorDetector,
-        nonNullableByDefaultCompiledMode: soundNullSafety
-            ? NonNullableByDefaultCompiledMode.Strong
-            : NonNullableByDefaultCompiledMode.Weak,
         pragmaClass: compilerResult.coreTypes?.pragmaClass,
       );
       if (nativeAssetsLibrary != null) {
@@ -1138,15 +1118,13 @@ Future trainInternal(String scriptUri, String? platformKernelPath) async {
     false /* incremental */,
     false /* for_snapshot */,
     true /* embed_sources */,
-    true /* null safety */,
     1 /* isolateGroupId chosen randomly */,
     [] /* source files */,
     false /* enable asserts */,
     null /* experimental_flags */,
     null /* package_config */,
     null /* multirootFilepaths */,
     null /* multirootScheme */,
-    null /* original working directory */,
     'all' /* CFE logging mode */,
     true /* enableMirrors */,
     null /* native assets yaml */,

pkg/vm/test/kernel_service_test.dart

@@ -118,15 +118,13 @@ Future<kernel_service.Status> singleShotCompile(
     /* [4] = bool = incremental = */ false,
     /* [5] = bool = for_snapshot = */ false,
     /* [6] = bool = embed_sources = */ true,
-    /* [7] = bool = soundNullSafety = */ true,
     /* [8] = int = isolateGroupId = */ 42,
     /* [9] = List = sourceFiles = */ sourceFiles,
     /* [10] = bool = enableAsserts = */ true,
     /* [11] = List<String>? = experimentalFlags = */ [],
     /* [12] = String? = packageConfig = */ packageConfig,
     /* [13] = String? = multirootFilepaths = */ null,
     /* [14] = String? = multirootScheme = */ null,
-    /* [15] = String? = workingDirectory = */ null,
     /* [16] = String = verbosityLevel = */ Verbosity.all.name,
     /* [17] = bool = enableMirrors = */ false,
   ]);

runtime/vm/kernel_isolate.cc

@@ -779,7 +779,6 @@ class KernelCompilationRequest : public ValueObject {
       const char* multiroot_filepaths,
       const char* multiroot_scheme,
       const MallocGrowableArray<char*>* experimental_flags,
-      const char* original_working_directory,
       Dart_KernelCompilationVerbosityLevel verbosity) {
     // Build the message for the Kernel isolate.
     // tag is used to specify which operation the frontend should perform.
@@ -864,10 +863,6 @@ class KernelCompilationRequest : public ValueObject {
                                        ? isolate_group->asserts()
                                        : FLAG_enable_asserts;
 
-    Dart_CObject sound_null_safety;
-    sound_null_safety.type = Dart_CObject_kBool;
-    sound_null_safety.value.as_bool = true;
-
     intptr_t num_experimental_flags = experimental_flags->length();
     Dart_CObject** experimental_flags_array =
         new Dart_CObject*[num_experimental_flags];
@@ -916,17 +911,6 @@ class KernelCompilationRequest : public ValueObject {
       }
     }
 
-    Dart_CObject original_working_directory_object;
-    {
-      if (original_working_directory != nullptr) {
-        original_working_directory_object.type = Dart_CObject_kString;
-        original_working_directory_object.value.as_string =
-            const_cast<char*>(original_working_directory);
-      } else {
-        original_working_directory_object.type = Dart_CObject_kNull;
-      }
-    }
-
     Dart_CObject verbosity_str;
     verbosity_str.type = Dart_CObject_kString;
     verbosity_str.value.as_string =
@@ -943,15 +927,13 @@ class KernelCompilationRequest : public ValueObject {
                                    &dart_incremental,
                                    &dart_snapshot,
                                    &dart_embed_sources,
-                                   &sound_null_safety,
                                    &isolate_id,
                                    &files,
                                    &enable_asserts,
                                    &experimental_flags_object,
                                    &package_config_uri,
                                    &multiroot_filepaths_object,
                                    &multiroot_scheme_object,
-                                   &original_working_directory_object,
                                    &verbosity_str,
                                    &enable_mirrors};
     message.value.as_array.values = message_arr;
@@ -1135,8 +1117,7 @@ Dart_KernelCompilationResult KernelIsolate::CompileToKernel(
       kCompileTag, kernel_port, script_uri, platform_kernel,
       platform_kernel_size, source_file_count, source_files,
       incremental_compile, for_snapshot, embed_sources, package_config,
-      multiroot_filepaths, multiroot_scheme, experimental_flags_, nullptr,
-      verbosity);
+      multiroot_filepaths, multiroot_scheme, experimental_flags_, verbosity);
 }
 
 Dart_KernelCompilationResult KernelIsolate::ListDependencies() {
@@ -1151,7 +1132,7 @@ Dart_KernelCompilationResult KernelIsolate::ListDependencies() {
   KernelCompilationRequest request;
   return request.SendAndWaitForResponse(
       kListDependenciesTag, kernel_port, nullptr, nullptr, 0, 0, nullptr, false,
-      false, false, nullptr, nullptr, nullptr, experimental_flags_, nullptr,
+      false, false, nullptr, nullptr, nullptr, experimental_flags_,
       Dart_KernelCompilationVerbosityLevel_Error);
 }
 
@@ -1169,7 +1150,7 @@ Dart_KernelCompilationResult KernelIsolate::AcceptCompilation() {
   KernelCompilationRequest request;
   return request.SendAndWaitForResponse(
       kAcceptTag, kernel_port, nullptr, nullptr, 0, 0, nullptr, true, false,
-      false, nullptr, nullptr, nullptr, experimental_flags_, nullptr,
+      false, nullptr, nullptr, nullptr, experimental_flags_,
       Dart_KernelCompilationVerbosityLevel_Error);
 }
 
@@ -1187,7 +1168,7 @@ Dart_KernelCompilationResult KernelIsolate::RejectCompilation() {
   KernelCompilationRequest request;
   return request.SendAndWaitForResponse(
       kRejectTag, kernel_port, nullptr, nullptr, 0, 0, nullptr, true, false,
-      false, nullptr, nullptr, nullptr, experimental_flags_, nullptr,
+      false, nullptr, nullptr, nullptr, experimental_flags_,
       Dart_KernelCompilationVerbosityLevel_Error);
 }
 
@@ -1246,7 +1227,7 @@ Dart_KernelCompilationResult KernelIsolate::UpdateInMemorySources(
   return request.SendAndWaitForResponse(
       kUpdateSourcesTag, kernel_port, nullptr, nullptr, 0, source_files_count,
       source_files, true, false, false, nullptr, nullptr, nullptr,
-      experimental_flags_, nullptr, Dart_KernelCompilationVerbosityLevel_Error);
+      experimental_flags_, Dart_KernelCompilationVerbosityLevel_Error);
 }
 
 void KernelIsolate::NotifyAboutIsolateGroupShutdown(