Version 2.18.0-113.0.dev

Merge commit '44f85834256ea00ebad401b54934f18028ff3101' into 'dev'

Author: Dart CI

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

@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// @dart = 2.9
-
 import 'dart:collection';
 
 import 'package:kernel/kernel.dart';
@@ -55,7 +53,7 @@ String _typeString(DartType type, {bool flat = false}) {
   if (type is InterfaceType) {
     var name = '${type.classNode.name}$nullability';
     var typeArgs = type.typeArguments;
-    if (typeArgs == null) return name;
+    if (typeArgs.isEmpty) return name;
     if (typeArgs.every((p) => p == const DynamicType())) return name;
     return "${name}Of${typeArgs.map(_typeString).join("\$")}";
   }
@@ -67,7 +65,7 @@ String _typeString(DartType type, {bool flat = false}) {
   if (type is TypedefType) {
     var name = '${type.typedefNode.name}$nullability';
     var typeArgs = type.typeArguments;
-    if (typeArgs == null) return name;
+    if (typeArgs.isEmpty) return name;
     if (typeArgs.every((p) => p == const DynamicType())) return name;
     return "${name}Of${typeArgs.map(_typeString).join("\$")}";
   }
@@ -110,7 +108,7 @@ class TypeTable {
 
   /// Holds JS type generators keyed by their underlying DartType.
   final typeContainer = ModuleItemContainer<DartType>.asObject('T',
-      keyToString: (DartType t) => escapeIdentifier(_typeString(t)));
+      keyToString: (DartType t) => escapeIdentifier(_typeString(t))!);
 
   final js_ast.Expression Function(String, [List<Object>]) _runtimeCall;
 
@@ -151,8 +149,8 @@ class TypeTable {
 
   js_ast.Statement _dischargeFreeType(DartType type) {
     typeContainer.setNoEmit(type);
-    var init = typeContainer[type];
-    var id = _unboundTypeIds[type];
+    var init = typeContainer[type]!;
+    var id = _unboundTypeIds[type]!;
     // TODO(vsm): Change back to `let`.
     // See https://github.com/dart-lang/sdk/issues/40380.
     return js.statement('var # = () => ((# = #)());', [
@@ -167,15 +165,16 @@ class TypeTable {
   ///
   /// If [formals] is present, only emit the definitions which depend on the
   /// formals.
-  List<js_ast.Statement> dischargeFreeTypes([Iterable<TypeParameter> formals]) {
+  List<js_ast.Statement> dischargeFreeTypes(
+      [Iterable<TypeParameter>? formals]) {
     var decls = <js_ast.Statement>[];
     var types = formals == null
         ? typeContainer.keys.where((p) => freeTypeParameters(p).isNotEmpty)
         : formals.expand((p) => _scopeDependencies[p] ?? <DartType>[]).toSet();
 
     for (var t in types) {
       var stmt = _dischargeFreeType(t);
-      if (stmt != null) decls.add(stmt);
+      decls.add(stmt);
     }
     return decls;
   }
@@ -221,7 +220,7 @@ class TypeTable {
       // TODO(40273) Remove prepended text when we have a better way to hide
       // these names from debug tools.
       _unboundTypeIds[type] =
-          js_ast.TemporaryId(escapeIdentifier('__t\$${_typeString(type)}'));
+          js_ast.TemporaryId(escapeIdentifier('__t\$${_typeString(type)}')!);
     }
 
     for (var free in freeVariables) {

pkg/dev_compiler/test/modular_suite.dart

@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// @dart = 2.9
-
 /// Test the modular compilation pipeline of ddc.
 ///
 /// This is a shell that runs multiple tests, one per folder under `data/`.
@@ -18,9 +16,9 @@ import 'package:modular_test/src/suite.dart';
 String packageConfigJsonPath = '.dart_tool/package_config.json';
 Uri sdkRoot = Platform.script.resolve('../../../');
 Uri packageConfigUri = sdkRoot.resolve(packageConfigJsonPath);
-Options _options;
-String _dartdevcScript;
-String _kernelWorkerScript;
+late Options _options;
+late String _dartdevcScript;
+late String _kernelWorkerScript;
 
 void main(List<String> args) async {
   _options = Options.parse(args);
@@ -89,8 +87,7 @@ class SourceToSummaryDillStep implements IOModularStep {
       extraArgs = [
         '--libraries-file',
         '$rootScheme:///sdk/lib/libraries.json',
-        '--enable-experiment',
-        'non-nullable',
+        '--no-sound-null-safety',
       ];
       assert(transitiveDependencies.isEmpty);
     } else {
@@ -175,8 +172,7 @@ class DDCStep implements IOModularStep {
         '--compile-sdk',
         '--libraries-file',
         '$rootScheme:///sdk/lib/libraries.json',
-        '--enable-experiment',
-        'non-nullable',
+        '--no-sound-null-safety',
       ];
       assert(transitiveDependencies.isEmpty);
     } else {
@@ -319,7 +315,7 @@ String get _d8executable {
 
 String _sourceToImportUri(Module module, String rootScheme, Uri relativeUri) {
   if (module.isPackage) {
-    var basePath = module.packageBase.path;
+    var basePath = module.packageBase!.path;
     var packageRelativePath = basePath == './'
         ? relativeUri.path
         : relativeUri.path.substring(basePath.length);

pkg/dev_compiler/test/modular_suite_nnbd.dart

@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// @dart = 2.9
-
 /// Test the modular compilation pipeline of ddc.
 ///
 /// This is a shell that runs multiple tests, one per folder under `data/`.
@@ -18,9 +16,9 @@ import 'package:modular_test/src/suite.dart';
 String packageConfigJsonPath = '.dart_tool/package_config.json';
 Uri sdkRoot = Platform.script.resolve('../../../');
 Uri packageConfigUri = sdkRoot.resolve(packageConfigJsonPath);
-Options _options;
-String _dartdevcScript;
-String _kernelWorkerScript;
+late Options _options;
+late String _dartdevcScript;
+late String _kernelWorkerScript;
 
 void main(List<String> args) async {
   _options = Options.parse(args);
@@ -120,10 +118,7 @@ class SourceToSummaryDillStep implements IOModularStep {
           .where((m) => !m.isSdk)
           .expand((m) => ['--input-summary', '${toUri(m, dillId)}']),
       ...sources.expand((String uri) => ['--source', uri]),
-      // TODO(40266) After unfork of dart:_runtime only need experiment when
-      // compiling SDK. For now always use the Null Safety experiment.
-      '--enable-experiment',
-      'non-nullable',
+      '--sound-null-safety',
       ...flags.expand((String flag) => ['--enable-experiment', flag]),
     ];
 
@@ -206,10 +201,7 @@ class DDCStep implements IOModularStep {
       rootScheme,
       ...sources,
       ...extraArgs,
-      // TODO(40266) After unfork of dart:_runtime only need experiment when
-      // compiling SDK. For now always use the Null Safety experiment.
-      '--enable-experiment',
-      'non-nullable',
+      '--sound-null-safety',
       for (String flag in flags) '--enable-experiment=$flag',
       ...transitiveDependencies
           .where((m) => !m.isSdk)
@@ -323,7 +315,7 @@ String get _d8executable {
 
 String _sourceToImportUri(Module module, String rootScheme, Uri relativeUri) {
   if (module.isPackage) {
-    var basePath = module.packageBase.path;
+    var basePath = module.packageBase!.path;
     var packageRelativePath = basePath == './'
         ? relativeUri.path
         : relativeUri.path.substring(basePath.length);

pkg/test_runner/bin/http_server.dart

@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import 'package:args/args.dart';
 import 'package:test_runner/src/configuration.dart';
 import 'package:test_runner/src/testing_servers.dart';
 import 'package:test_runner/src/utils.dart';
-import 'package:test_runner/src/vendored_pkg/args/args.dart';
 
 void main(List<String> arguments) {
   var parser = ArgParser();
@@ -30,7 +30,7 @@ void main(List<String> arguments) {
 
   var args = parser.parse(arguments);
   if (args['help'] as bool) {
-    print(parser.getUsage());
+    print(parser.usage);
   } else {
     var servers = TestingServers(
         args['build-directory'] as String,