Version 2.13.0-31.0.dev

Merge commit 'af0c951d9f2a4212594faf67317d3ddb00fc2dd8' into 'dev'

Author: Dart CI

CHANGELOG.md

@@ -245,7 +245,7 @@ Updated the Linter to `0.1.129`, which includes:
 * The `--server` option to `dart pub publish` and `dart pub uploader` have been
   deprecated. Use `publish_to` in your `pubspec.yaml` or set the
   `$PUB_HOSTED_URL` environment variable.
-* `pub global activate no longer re-precompiles if current global installed was
+* `pub global activate` no longer re-precompiles if current global installed was
    same version.
 * The Flutter SDK constraint upper bound is now ignored in pubspecs and
   deprecated when publishing.

pkg/front_end/test/spell_checking_list_code.txt

@@ -709,6 +709,7 @@ method8b
 method9a
 method9b
 mi
+migrated
 migration
 mime
 min

pkg/kernel/lib/ast.dart

@@ -9371,7 +9371,7 @@ class NamedType extends Node implements Comparable<NamedType> {
   final DartType type;
   final bool isRequired;
 
-  NamedType(this.name, this.type, {this.isRequired: false});
+  const NamedType(this.name, this.type, {this.isRequired: false});
 
   @override
   bool operator ==(Object other) => equals(other, null);
@@ -11550,3 +11550,12 @@ class Version extends Object {
     return "Version(major=$major, minor=$minor)";
   }
 }
+
+/// Non-nullable `DartType` value to be used as a dummy initial value for the
+/// `List.filled` constructor.
+const DartType dartTypeDummy = const DynamicType();
+
+/// Non-nullable `NamedType` value to be used as a dummy initial value for the
+/// `List.filled` constructor.
+const NamedType namedTypeDummy =
+    const NamedType('', dartTypeDummy, isRequired: false);

pkg/kernel/lib/class_hierarchy.dart

@@ -7,7 +7,6 @@ library kernel.core_types;
 // ignore: import_of_legacy_library_into_null_safe
 import 'ast.dart';
 import 'library_index.dart';
-// ignore: import_of_legacy_library_into_null_safe
 import 'type_algebra.dart';
 
 /// Provides access to the classes and libraries in the core libraries.

pkg/kernel/lib/core_types.dart

@@ -2,10 +2,9 @@
 // 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
-
 library kernel.hierarchy_based_type_environment;
 
+// ignore: import_of_legacy_library_into_null_safe
 import '../ast.dart' show Class, DartType, InterfaceType, Library, Member, Name;
 
 import '../class_hierarchy.dart' show ClassHierarchyBase;
@@ -21,20 +20,20 @@ class HierarchyBasedTypeEnvironment extends TypeEnvironment {
       : super.fromSubclass(coreTypes, hierarchy);
 
   @override
-  InterfaceType getTypeAsInstanceOf(InterfaceType type, Class superclass,
+  InterfaceType? getTypeAsInstanceOf(InterfaceType type, Class superclass,
       Library clientLibrary, CoreTypes coreTypes) {
     return hierarchy.getTypeAsInstanceOf(type, superclass, clientLibrary);
   }
 
   @override
-  List<DartType> getTypeArgumentsAsInstanceOf(
+  List<DartType>? getTypeArgumentsAsInstanceOf(
       InterfaceType type, Class superclass) {
     if (type.classNode == superclass) return type.typeArguments;
     return hierarchy.getTypeArgumentsAsInstanceOf(type, superclass);
   }
 
   @override
-  Member getInterfaceMember(Class cls, Name name, {bool setter: false}) {
+  Member? getInterfaceMember(Class cls, Name name, {bool setter: false}) {
     return hierarchy.getInterfaceMember(cls, name, setter: setter);
   }
 }

pkg/kernel/lib/src/hierarchy_based_type_environment.dart

@@ -2,8 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE.md file.
 
-// @dart = 2.9
-
+// ignore: import_of_legacy_library_into_null_safe
 import '../ast.dart' hide MapEntry;
 
 import 'replacement_visitor.dart';
@@ -20,7 +19,7 @@ DartType legacyErasure(DartType type) {
 /// named parameters are not required.
 ///
 /// Returns `null` if the type wasn't changed.
-DartType rawLegacyErasure(DartType type) {
+DartType? rawLegacyErasure(DartType type) {
   return type.accept1(const _LegacyErasure(), Variance.covariant);
 }
 
@@ -31,10 +30,10 @@ Supertype legacyErasureSupertype(Supertype supertype) {
   if (supertype.typeArguments.isEmpty) {
     return supertype;
   }
-  List<DartType> newTypeArguments;
+  List<DartType>? newTypeArguments;
   for (int i = 0; i < supertype.typeArguments.length; i++) {
     DartType typeArgument = supertype.typeArguments[i];
-    DartType newTypeArgument =
+    DartType? newTypeArgument =
         typeArgument.accept1(const _LegacyErasure(), Variance.covariant);
     if (newTypeArgument != null) {
       newTypeArguments ??= supertype.typeArguments.toList(growable: false);
@@ -54,15 +53,15 @@ Supertype legacyErasureSupertype(Supertype supertype) {
 class _LegacyErasure extends ReplacementVisitor {
   const _LegacyErasure();
 
-  Nullability visitNullability(DartType node) {
+  Nullability? visitNullability(DartType node) {
     if (node.declaredNullability != Nullability.legacy) {
       return Nullability.legacy;
     }
     return null;
   }
 
   @override
-  NamedType createNamedType(NamedType node, DartType newType) {
+  NamedType? createNamedType(NamedType node, DartType? newType) {
     if (node.isRequired || newType != null) {
       return new NamedType(node.name, newType ?? node.type, isRequired: false);
     }
@@ -101,7 +100,7 @@ class _LegacyErasure extends ReplacementVisitor {
 ///    }
 ///
 bool needsLegacyErasure(Class enclosingClass, Class declaringClass) {
-  Class cls = enclosingClass;
+  Class? cls = enclosingClass;
   while (cls != null) {
     if (!cls.enclosingLibrary.isNonNullableByDefault) {
       return true;