Version 2.19.0-28.0.dev

Merge commit 'a13ef8a5d5e96e1176488c66797181377389bbc3' into 'dev'

Author: Dart CI

pkg/_fe_analyzer_shared/pubspec.yaml

@@ -1,5 +1,5 @@
 name: _fe_analyzer_shared
-version: 41.0.0
+version: 42.0.0
 description: Logic that is shared between the front_end and analyzer packages.
 repository: https://github.com/dart-lang/sdk/tree/main/pkg/_fe_analyzer_shared
 

pkg/analyzer/CHANGELOG.md

@@ -1,7 +1,7 @@
-## 4.3.0-dev
+## 4.3.0
 * Deprecated `Directive.keyword`, use corresponding `xyzToken` in specific directives.
 * Deprecated `LibraryElement.parts`, use `parts2` instead.
-* Deprecated `LibraryElement.exports`, use `libraryexports` instead.
+* Deprecated `LibraryElement.exports`, use `libraryExports` instead.
 * Deprecated `LibraryElement.imports`, use `libraryImports` instead.
 * Deprecated `Element.enclosingElement`, use `enclosingElement2` instead.
 * `Member` is not equal to `ElementImpl`, use `Element.declaration`.

pkg/analyzer/pubspec.yaml

@@ -1,13 +1,13 @@
 name: analyzer
-version: 4.3.0-dev
+version: 4.3.0
 description: This package provides a library that performs static analysis of Dart code.
 repository: https://github.com/dart-lang/sdk/tree/main/pkg/analyzer
 
 environment:
   sdk: '>=2.17.0 <3.0.0'
 
 dependencies:
-  _fe_analyzer_shared: ^41.0.0
+  _fe_analyzer_shared: ^42.0.0
   collection: ^1.15.0
   convert: ^3.0.0
   crypto: ^3.0.0

pkg/compiler/lib/src/inferrer/powersets/powerset_bits.dart

@@ -2,16 +2,14 @@
 // 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.10
-
 import '../../common/elements.dart' show CommonElements;
 import '../../constants/values.dart';
 import '../../elements/entities.dart';
 import '../../elements/names.dart';
 import '../../elements/types.dart';
 import '../../ir/class_relation.dart';
 import '../../universe/selector.dart';
-import '../../world.dart';
+import '../../world_interfaces.dart';
 import '../abstract_value_domain.dart';
 
 /// This class is used to store bits information about class entities.
@@ -172,7 +170,7 @@ class PowersetBitsDomain {
 
   // TODO(coam): This currently returns null if we are not sure if it's a primitive.
   // It could be improved because we can also tell when we're certain it's not a primitive.
-  PrimitiveConstantValue getPrimitiveValue(int value) {
+  PrimitiveConstantValue? getPrimitiveValue(int value) {
     if (isDefinitelyTrue(value)) {
       return TrueConstantValue();
     }
@@ -355,7 +353,7 @@ class PowersetBitsDomain {
   }
 
   ClassInfo _computeClassInfo(ClassEntity cls) {
-    ClassInfo classInfo = _storedClassInfo[cls];
+    ClassInfo? classInfo = _storedClassInfo[cls];
     if (classInfo != null) {
       return classInfo;
     }
@@ -442,7 +440,10 @@ class PowersetBitsDomain {
   }
 
   int createFromStaticType(DartType type,
-      {ClassRelation classRelation = ClassRelation.subtype, bool nullable}) {
+      {ClassRelation classRelation = ClassRelation.subtype,
+      required bool nullable}) {
+    // TODO(48820): Remove after sound null safety is enabled.
+    // ignore: unnecessary_null_comparison
     assert(nullable != null);
 
     if ((classRelation == ClassRelation.subtype ||
@@ -481,8 +482,6 @@ class PowersetBitsDomain {
 
   int _createFromStaticType(
       DartType type, ClassRelation classRelation, bool nullable) {
-    assert(nullable != null);
-
     int finish(int value, bool isPrecise) {
       // [isPrecise] is ignored since we only treat singleton partitions as
       // precise.
@@ -576,26 +575,21 @@ class PowersetBitsDomain {
 
   int get emptyType => powersetBottom;
 
-  int _constMapType;
-  int get constMapType => _constMapType ??=
+  late final int constMapType =
       createNonNullSubtype(commonElements.constMapLiteralClass);
 
   int get constSetType => otherValue;
 
-  int _constListType;
-  int get constListType => _constListType ??=
+  late final int constListType =
       createNonNullExact(commonElements.jsUnmodifiableArrayClass);
 
-  int _fixedListType;
-  int get fixedListType =>
-      _fixedListType ??= createNonNullExact(commonElements.jsFixedArrayClass);
+  late final int fixedListType =
+      createNonNullExact(commonElements.jsFixedArrayClass);
 
-  int _growableListType;
-  int get growableListType => _growableListType ??=
+  late final int growableListType =
       createNonNullExact(commonElements.jsExtendableArrayClass);
 
-  int _mutableArrayType;
-  int get mutableArrayType => _mutableArrayType ??=
+  late final int mutableArrayType =
       createNonNullSubtype(commonElements.jsMutableArrayClass);
 
   int get nullType => nullValue;
@@ -605,43 +599,30 @@ class PowersetBitsDomain {
   // TODO(fishythefish): Support tracking late sentinels in the powerset domain.
   int get lateSentinelType => powersetBottom;
 
-  int _mapType;
-  int get mapType =>
-      _mapType ??= createNonNullSubtype(commonElements.mapLiteralClass);
+  late final int mapType = createNonNullSubtype(commonElements.mapLiteralClass);
 
-  int _setType;
-  int get setType =>
-      _setType ??= createNonNullSubtype(commonElements.setLiteralClass);
+  late final int setType = createNonNullSubtype(commonElements.setLiteralClass);
 
-  int _listType;
-  int get listType =>
-      _listType ??= createNonNullExact(commonElements.jsArrayClass);
+  late final int listType = createNonNullExact(commonElements.jsArrayClass);
 
-  int _stringType;
-  int get stringType =>
-      _stringType ??= createNonNullSubtype(commonElements.jsStringClass);
+  late final int stringType =
+      createNonNullSubtype(commonElements.jsStringClass);
 
-  int _numType;
-  int get numType =>
-      _numType ??= createNonNullSubclass(commonElements.jsNumberClass);
+  late final int numType = createNonNullSubclass(commonElements.jsNumberClass);
 
-  int _numNotIntType;
-  int get numNotIntType =>
-      _numNotIntType ??= createNonNullExact(commonElements.jsNumNotIntClass);
+  late final int numNotIntType =
+      createNonNullExact(commonElements.jsNumNotIntClass);
 
-  int _intType;
-  int get intType =>
-      _intType ??= createNonNullSubtype(commonElements.jsIntClass);
+  late final int intType = createNonNullSubtype(commonElements.jsIntClass);
 
   int get positiveIntType => intType;
   int get uint32Type => intType;
   int get uint31Type => intType;
 
   int get boolType => boolValue;
 
-  int _functionType;
-  int get functionType =>
-      _functionType ??= createNonNullSubtype(commonElements.functionClass);
+  late final int functionType =
+      createNonNullSubtype(commonElements.functionClass);
 
   int get typeType => otherValue;
 }

pkg/compiler/lib/src/js_backend/codegen_listener.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.10
-
 library js_backend.backend.codegen_listener;
 
 import 'dart:collection';
@@ -101,7 +99,7 @@ class CodegenEnqueuerListener extends EnqueuerListener {
 
   @override
   void onQueueOpen(
-      Enqueuer enqueuer, FunctionEntity mainMethod, Iterable<Uri> libraries) {
+      Enqueuer enqueuer, FunctionEntity? mainMethod, Iterable<Uri> libraries) {
     enqueuer.applyImpact(_nativeEnqueuer.processNativeClasses(libraries));
     if (mainMethod != null) {
       enqueuer.applyImpact(_computeMainImpact(mainMethod));
@@ -178,8 +176,8 @@ class CodegenEnqueuerListener extends EnqueuerListener {
           .registerTypeUse(TypeUse.instantiation(_commonElements.typeType));
       // If the type is a web component, we need to ensure the constructors are
       // available to 'upgrade' the native object.
-      if (constant.representedType is InterfaceType) {
-        InterfaceType representedType = constant.representedType;
+      final representedType = constant.representedType;
+      if (representedType is InterfaceType) {
         _customElementsAnalysis.registerTypeConstant(representedType.element);
       }
     } else if (constant is InstantiationConstantValue) {
@@ -228,10 +226,10 @@ class CodegenEnqueuerListener extends EnqueuerListener {
     _customElementsAnalysis.registerStaticUse(member);
 
     if (member.isFunction && member.isInstanceMember) {
-      ClassEntity cls = member.enclosingClass;
+      ClassEntity cls = member.enclosingClass!;
       if (member.name == Identifiers.call &&
           _elementEnvironment.isGenericClass(cls) &&
-          _rtiNeed.methodNeedsSignature(member)) {
+          _rtiNeed.methodNeedsSignature(member as FunctionEntity)) {
         worldImpact.addImpact(_registerComputeSignature());
       }
     }

pkg/compiler/lib/src/resolution/enqueuer.dart

@@ -35,7 +35,7 @@ class ResolutionEnqueuer extends Enqueuer {
 
   final Set<ClassEntity> _recentClasses = Setlet<ClassEntity>();
   bool _recentConstants = false;
-  final ResolutionWorldBuilderForEnqueuer worldBuilder;
+  final ResolutionWorldBuilder worldBuilder;
   WorkItemBuilder? _workItemBuilder;
   final DiagnosticReporter _reporter;
   final AnnotationsData _annotationsData;

pkg/compiler/lib/src/universe/resolution_world_builder.dart

@@ -193,7 +193,7 @@ class InstantiationInfo {
 }
 
 class ResolutionWorldBuilder extends WorldBuilder
-    implements World, interfaces.ResolutionWorldBuilderForEnqueuer {
+    implements World, interfaces.ResolutionWorldBuilder {
   /// Instantiation information for all classes with instantiated types.
   ///
   /// Invariant: Elements are declaration elements.
@@ -921,6 +921,7 @@ class ResolutionWorldBuilder extends WorldBuilder
   /// Here `A.m` is inherited into `A`, `B`, and `C`. Because `B` and
   /// `C` implement `I`, `isInheritedInSubtypeOf(A.m, I)` is true, but
   /// `isInheritedInSubtypeOf(A.m, J)` is false.
+  @override
   bool isInheritedIn(
       MemberEntity member, ClassEntity type, ClassRelation relation) {
     // TODO(johnniwinther): Use the [member] itself to avoid enqueueing members

pkg/compiler/lib/src/universe/resolution_world_builder_interfaces.dart

@@ -4,10 +4,12 @@
 
 import '../elements/entities.dart';
 import '../elements/types.dart';
+import '../ir/class_relation.dart';
 import 'member_usage.dart';
 import 'use.dart';
+import '../world_interfaces.dart';
 
-abstract class ResolutionWorldBuilderForEnqueuer {
+abstract class ResolutionWorldBuilder implements World {
   Iterable<ClassEntity> get directlyInstantiatedClasses;
 
   Iterable<MemberEntity> get processedMembers;
@@ -19,6 +21,9 @@ abstract class ResolutionWorldBuilderForEnqueuer {
   void processClassMembers(ClassEntity cls, MemberUsedCallback memberUsed,
       {bool checkEnqueuerConsistency = false});
 
+  bool isInheritedIn(
+      MemberEntity member, ClassEntity type, ClassRelation relation);
+
   void registerDynamicUse(DynamicUse dynamicUse, MemberUsedCallback memberUsed);
 
   bool registerConstantUse(ConstantUse use);