[kernel] Remove NonNullableByDefaultCompiledMode

and TargetFlags.soundNullSafety

TEST=existing

Change-Id: I5e28d3d187b0f84fa23130c042fd3c55b89c687c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/413460
Reviewed-by: Ömer Ağacan <[email protected]>
Reviewed-by: Jens Johansen <[email protected]>
Reviewed-by: Alexander Markov <[email protected]>
Commit-Queue: Johnni Winther <[email protected]>
Reviewed-by: Nate Biggs <[email protected]>

Author: johnniwinther

pkg/compiler/lib/src/compiler.dart

@@ -310,13 +310,12 @@ class Compiler {
       irLibraries.add(irLibraryMap[library]!);
     }
     var mainMethod = component.mainMethodName;
-    var componentMode = component.mode;
     final trimmedComponent = ir.Component(
       libraries: irLibraries,
       uriToSource: component.uriToSource,
       nameRoot: component.root,
     );
-    trimmedComponent.setMainMethodAndMode(mainMethod, true, componentMode);
+    trimmedComponent.setMainMethodAndMode(mainMethod, true);
     return trimmedComponent;
   }
 

pkg/compiler/lib/src/phase/load_kernel.dart

@@ -242,7 +242,7 @@ Future<_LoadFromKernelResult> _loadFromKernel(
   if (options.entryUri != null) {
     entryLibrary = _findEntryLibrary(component, options.entryUri!);
     var mainMethod = _findMainMethod(entryLibrary);
-    component.setMainMethodAndMode(mainMethod, true, component.mode);
+    component.setMainMethodAndMode(mainMethod, true);
   }
 
   _doTransformsOnKernelLoad(component, options, reporter);

pkg/dart2wasm/lib/dynamic_modules.dart

@@ -250,8 +250,7 @@ class DynamicModuleStrategy extends DefaultModuleStrategy with KernelNodes {
       if (hasPragma(coreTypes, library, _mainLibPragma)) {
         final mainMethod = library.procedures
             .firstWhere((m) => hasPragma(coreTypes, m, _mainMethodPragma));
-        component.setMainMethodAndMode(
-            mainMethod.reference, true, component.mode);
+        component.setMainMethodAndMode(mainMethod.reference, true);
       }
     }
   }

pkg/dev_compiler/lib/src/command/command.dart

@@ -839,13 +839,8 @@ ModuleSymbols _emitSymbols(Compiler compiler, String moduleName,
 
 ModuleMetadata _emitMetadata(js_ast.Program program, Component component,
     String sourceMapUri, String moduleUri, String? fullDillUri) {
-  var metadata = ModuleMetadata(
-      program.name!,
-      loadFunctionName(program.name!),
-      sourceMapUri,
-      moduleUri,
-      fullDillUri,
-      component.mode == NonNullableByDefaultCompiledMode.Strong);
+  var metadata = ModuleMetadata(program.name!, loadFunctionName(program.name!),
+      sourceMapUri, moduleUri, fullDillUri);
 
   for (var lib in component.libraries) {
     metadata.addLibrary(LibraryMetadata(

pkg/dev_compiler/lib/src/kernel/expression_compiler_worker.dart

@@ -429,8 +429,7 @@ class ExpressionCompilerWorker {
         libraries: libraries,
         nameRoot: originalComponent.root,
         uriToSource: originalComponent.uriToSource,
-      )..setMainMethodAndMode(
-          originalComponent.mainMethodName, true, originalComponent.mode);
+      )..setMainMethodAndMode(originalComponent.mainMethodName, true);
       _processedOptions.ticker.logMs('Collected libraries for $moduleName');
     }
 
@@ -491,8 +490,7 @@ class ExpressionCompilerWorker {
         libraries: librariesToEmit,
         nameRoot: finalComponent.root,
         uriToSource: finalComponent.uriToSource)
-      ..setMainMethodAndMode(
-          originalComponent.mainMethodName, true, originalComponent.mode);
+      ..setMainMethodAndMode(originalComponent.mainMethodName, true);
 
     kernel2jsCompiler.emitModule(componentToEmit);
     _processedOptions.ticker.logMs('Emitted module for expression');

pkg/dev_compiler/lib/src/kernel/module_metadata.dart

@@ -127,12 +127,8 @@ class ModuleMetadata {
 
   final Map<String, LibraryMetadata> libraries = {};
 
-  /// True if the module corresponding to this metadata was compiled with sound
-  /// null safety enabled.
-  final bool soundNullSafety;
-
   ModuleMetadata(this.name, this.closureName, this.sourceMapUri, this.moduleUri,
-      this.fullDillUri, this.soundNullSafety,
+      this.fullDillUri,
       {String? version})
       : version = version ??= ModuleMetadataVersion.current.version;
 
@@ -157,8 +153,7 @@ class ModuleMetadata {
         closureName = json['closureName'] as String,
         sourceMapUri = json['sourceMapUri'] as String,
         moduleUri = json['moduleUri'] as String,
-        fullDillUri = json['fullDillUri'] as String,
-        soundNullSafety = json['soundNullSafety'] as bool {
+        fullDillUri = json['fullDillUri'] as String {
     if (!ModuleMetadataVersion.current.isCompatibleWith(version)) {
       throw Exception('Unsupported metadata version $version');
     }
@@ -176,8 +171,7 @@ class ModuleMetadata {
       'sourceMapUri': sourceMapUri,
       'moduleUri': moduleUri,
       'fullDillUri': fullDillUri,
-      'libraries': [for (var lib in libraries.values) lib.toJson()],
-      'soundNullSafety': soundNullSafety
+      'libraries': [for (var lib in libraries.values) lib.toJson()]
     };
   }
 }

pkg/dev_compiler/test/module_metadata_test.dart

@@ -112,7 +112,7 @@ void main() {
 }
 
 ModuleMetadata createMetadata(String version) => ModuleMetadata(
-    'module', 'closure', 'module.map', 'module.js', 'module.full.dill', true,
+    'module', 'closure', 'module.map', 'module.js', 'module.full.dill',
     version: version)
   ..addLibrary(LibraryMetadata('library', 'package:library/test.dart',
       'file:///source/library/lib/test.dart', ['src/test2.dart']));
@@ -125,7 +125,6 @@ void testMetadataFields(ModuleMetadata module, String version) {
   expect(module.sourceMapUri, 'module.map');
   expect(module.moduleUri, 'module.js');
   expect(module.fullDillUri, 'module.full.dill');
-  expect(module.soundNullSafety, true);
 
   var libUri = module.libraries.keys.first;
   var lib = module.libraries[libUri]!;

pkg/front_end/lib/src/api_unstable/ddc.dart

@@ -80,7 +80,7 @@ class DdcResult {
   Component _computeCompiledLibraries() {
     Component compiledLibraries = new Component(
         nameRoot: component.root, uriToSource: component.uriToSource)
-      ..setMainMethodAndMode(null, false, component.mode);
+      ..setMainMethodAndMode(null, false);
     for (Library lib in component.libraries) {
       if (!librariesFromDill.contains(lib)) {
         compiledLibraries.libraries.add(lib);

pkg/front_end/lib/src/base/incremental_compiler.dart

@@ -14,8 +14,7 @@ import 'package:kernel/binary/ast_from_binary.dart'
         CompilationModeError,
         InvalidKernelSdkVersionError,
         InvalidKernelVersionError,
-        SubComponentView,
-        mergeCompilationModeOrThrow;
+        SubComponentView;
 import 'package:kernel/canonical_name.dart'
     show CanonicalNameError, CanonicalNameSdkError;
 import 'package:kernel/class_hierarchy.dart'
@@ -39,7 +38,6 @@ import 'package:kernel/kernel.dart'
         Name,
         NamedNode,
         Node,
-        NonNullableByDefaultCompiledMode,
         Procedure,
         ProcedureKind,
         Reference,
@@ -492,14 +490,9 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
           data.component?.mainMethod
           : componentWithDill.mainMethod;
       // ignore: unnecessary_null_comparison
-      NonNullableByDefaultCompiledMode? compiledMode = componentWithDill == null
-          ?
-          // Coverage-ignore(suite): Not run.
-          data.component?.mode
-          : componentWithDill.mode;
       Component result = context.options.target.configureComponent(
           new Component(libraries: outputLibraries, uriToSource: uriToSource))
-        ..setMainMethodAndMode(mainMethod?.reference, true, compiledMode!)
+        ..setMainMethodAndMode(mainMethod?.reference, true)
         ..problemsAsJson = problemsAsJson;
 
       // Copy the metadata *just created*. This will likely not contain metadata
@@ -944,28 +937,9 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
     _dillLoadedData!.loader.currentSourceLoader = kernelTarget.loader;
 
     // Re-use the libraries we've deemed re-usable.
-    List<bool> seenModes = [false, false, false, false];
     for (DillLibraryBuilder library in reusedLibraries) {
-      seenModes[library.library.nonNullableByDefaultCompiledMode.index] = true;
       kernelTarget.loader.registerLoadedDillLibraryBuilder(library);
     }
-    // Check compilation mode up against what we've seen here and set
-    // `hasInvalidNnbdModeLibrary` accordingly.
-    if (c.options.globalFeatures.nonNullable.isEnabled) {
-      // Don't expect weak or invalid.
-      if (seenModes[NonNullableByDefaultCompiledMode.Weak.index] ||
-          seenModes[NonNullableByDefaultCompiledMode.Invalid.index]) {
-        // Coverage-ignore-block(suite): Not run.
-        kernelTarget.loader.hasInvalidNnbdModeLibrary = true;
-      }
-    } else {
-      // Coverage-ignore-block(suite): Not run.
-      // Don't expect strong or invalid.
-      if (seenModes[NonNullableByDefaultCompiledMode.Strong.index] ||
-          seenModes[NonNullableByDefaultCompiledMode.Invalid.index]) {
-        kernelTarget.loader.hasInvalidNnbdModeLibrary = true;
-      }
-    }
 
     // The entry point(s) has to be set first for loader.firstUri to be setup
     // correctly.
@@ -2491,8 +2465,7 @@ class _InitializationFromComponent extends _InitializationStrategy {
               .mainMethod
               // Coverage-ignore(suite): Not run.
               ?.reference,
-          true,
-          componentToInitializeFrom.mode);
+          true);
     componentProblems.saveComponentProblems(component);
 
     bool foundDartCore = false;
@@ -2621,10 +2594,6 @@ class _InitializationFromUri extends _InitializationFromSdkSummary {
             .readComponent(data.component!,
                 checkCanonicalNames: true, createView: true)!;
 
-        // Compute "output nnbd mode".
-        NonNullableByDefaultCompiledMode compiledMode =
-            NonNullableByDefaultCompiledMode.Strong;
-
         // Check the any package-urls still point to the same file
         // (e.g. the package still exists and hasn't been updated).
         // Also verify NNBD settings.
@@ -2638,16 +2607,6 @@ class _InitializationFromUri extends _InitializationFromSdkSummary {
             // For now just don't initialize from this dill.
             throw const PackageChangedError();
           }
-          // Note: If a library has a NonNullableByDefaultCompiledMode.invalid
-          // we will throw and we won't initialize from it.
-          // That's wanted behavior.
-          if (compiledMode !=
-              mergeCompilationModeOrThrow(
-                  compiledMode, lib.nonNullableByDefaultCompiledMode)) {
-            throw new CompilationModeError(
-                "Can't compile to $compiledMode with library with mode "
-                "${lib.nonNullableByDefaultCompiledMode}.");
-          }
         }
 
         // Only initialize the incremental serializer when we know we'll

pkg/front_end/lib/src/base/incremental_serializer.dart

@@ -298,7 +298,7 @@ class IncrementalSerializer {
         libraries: libraries,
         uriToSource: component.uriToSource,
         nameRoot: component.root);
-    singlePackageLibraries.setMainMethodAndMode(null, false, component.mode);
+    singlePackageLibraries.setMainMethodAndMode(null, false);
 
     // Copy all metadata. This should be okay (e.g. not result in a leak)
     // because we serialize now and then (implicitly) throw this component away.