Version 3.9.0-231.0.dev

Merge b5cb488 into dev

Author: Dart CI

pkg/_js_interop_checks/lib/src/transformations/js_util_optimizer.dart

@@ -1228,7 +1228,6 @@ class ExtensionIndex {
               _typeEnvironment.isSubtypeOf(
                 type,
                 InterfaceType(_javaScriptObject, Nullability.nullable),
-                SubtypeCheckMode.withNullabilities,
               ))) {
         return _coreInteropTypeIndex[reference] = reference;
       }

pkg/_js_interop_checks/lib/src/transformations/static_interop_mock_validator.dart

@@ -264,7 +264,6 @@ class StaticInteropMockValidator {
       return _typeEnvironment.isSubtypeOf(
         typeParameterResolver.resolve(dartType),
         typeParameterResolver.resolve(interopType),
-        SubtypeCheckMode.withNullabilities,
       );
     }
 

pkg/compiler/lib/src/ir/impact_data.dart

@@ -305,7 +305,6 @@ class ImpactBuilder extends ir.RecursiveVisitor implements ImpactRegistry {
     final isCalculatedTypeSubtype = typeEnvironment.isSubtypeOf(
       operandType,
       node.type,
-      ir.SubtypeCheckMode.withNullabilities,
     );
     if (!isCalculatedTypeSubtype) {
       // Only register needed cast.

pkg/compiler/lib/src/ssa/builder.dart

@@ -7607,7 +7607,6 @@ class KernelSsaGraphBuilder extends ir.VisitorDefault<void>
           .computeTypeShapeCheckSufficiency(
             expressionStaticType: operandType,
             checkTargetType: checkedType,
-            subtypeCheckMode: ir.SubtypeCheckMode.withNullabilities,
           );
 
       // If `true` the caller only needs to check nullabillity and the actual

pkg/dart2bytecode/lib/bytecode_generator.dart

@@ -15,7 +15,7 @@ import 'package:kernel/target/targets.dart' show Target;
 import 'package:kernel/type_algebra.dart'
     show Substitution, containsTypeParameter;
 import 'package:kernel/type_environment.dart'
-    show StatefulStaticTypeContext, SubtypeCheckMode, TypeEnvironment;
+    show StatefulStaticTypeContext, TypeEnvironment;
 
 import 'package:vm/transformations/pragma.dart';
 
@@ -2322,9 +2322,7 @@ class BytecodeGenerator extends RecursiveVisitor {
     asm.emitPushConstant(
         name != null ? cp.addName(name) : cp.addString(message!));
     bool isIntOk = typeEnvironment.isSubtypeOf(
-        typeEnvironment.coreTypes.intNonNullableRawType,
-        type,
-        SubtypeCheckMode.ignoringNullabilities);
+        typeEnvironment.coreTypes.intNonNullableRawType, type);
     int subtypeTestCacheCpIndex = cp.addSubtypeTestCache();
     asm.emitAssertAssignable(isIntOk ? 1 : 0, subtypeTestCacheCpIndex);
   }

pkg/dart2wasm/lib/code_generator.dart

@@ -4348,14 +4348,10 @@ class SwitchInfo {
     // required. See #60375 for more details.
     bool canInvokeTypeEquality() =>
         translator.typeEnvironment.isSubtypeOf(
-            switchExprType,
-            translator.coreTypes.typeNullableRawType,
-            SubtypeCheckMode.withNullabilities) ||
+            switchExprType, translator.coreTypes.typeNullableRawType) ||
         node.cases.expand((c) => c.expressions).any((e) =>
-            translator.typeEnvironment.isSubtypeOf(
-                codeGen.dartTypeOf(e),
-                translator.coreTypes.typeNonNullableRawType,
-                SubtypeCheckMode.withNullabilities));
+            translator.typeEnvironment.isSubtypeOf(codeGen.dartTypeOf(e),
+                translator.coreTypes.typeNonNullableRawType));
 
     if (node.cases.every((c) =>
         c.expressions.isEmpty && c.isDefault ||

pkg/dart2wasm/lib/compile.dart

@@ -375,8 +375,7 @@ void _patchMainTearOffs(CoreTypes coreTypes, Component component) {
 
   final typeEnv =
       TypeEnvironment(coreTypes, ClassHierarchy(component, coreTypes));
-  bool mainHasType(DartType type) => typeEnv.isSubtypeOf(
-      mainMethodType, type, SubtypeCheckMode.withNullabilities);
+  bool mainHasType(DartType type) => typeEnv.isSubtypeOf(mainMethodType, type);
 
   final internalLib = coreTypes.index.getLibrary('dart:_internal');
   (Procedure, DartType) lookupAndInitialize(String name) {

pkg/dart2wasm/lib/intrinsics.dart

@@ -4,7 +4,6 @@
 
 import 'package:kernel/ast.dart';
 import 'package:kernel/core_types.dart';
-import 'package:kernel/type_environment.dart';
 import 'package:wasm_builder/wasm_builder.dart' as w;
 
 import 'abi.dart' show kWasmAbiEnumIndex;
@@ -1072,10 +1071,8 @@ class Intrinsifier {
         }
 
         bool canBeValueType(DartType type) =>
-            translator.typeEnvironment.isSubtypeOf(
-                doubleType, type, SubtypeCheckMode.withNullabilities) ||
-            translator.typeEnvironment
-                .isSubtypeOf(intType, type, SubtypeCheckMode.withNullabilities);
+            translator.typeEnvironment.isSubtypeOf(doubleType, type) ||
+            translator.typeEnvironment.isSubtypeOf(intType, type);
 
         if (!canBeValueType(firstType) || !canBeValueType(secondType)) {
           final nullableEqRefType = w.RefType.eq(nullable: true);

pkg/dart2wasm/lib/js/util.dart

@@ -491,9 +491,7 @@ class CoreTypesUtil {
 
     for (final entry in _jsifyMap.entries) {
       if (typeEnv.isSubtypeOf(
-          valueType,
-          InterfaceType(entry.key, Nullability.nonNullable),
-          SubtypeCheckMode.withNullabilities)) {
+          valueType, InterfaceType(entry.key, Nullability.nonNullable))) {
         return entry.value;
       }
     }

pkg/dart2wasm/lib/translator.dart

@@ -1506,9 +1506,7 @@ class Translator with KernelNodes {
 
       // Check that type of the receiver is a subtype of
       if (!typeEnvironment.isSubtypeOf(
-          lambdaDartType,
-          node.receiver.getStaticType(typeContext),
-          SubtypeCheckMode.withNullabilities)) {
+          lambdaDartType, node.receiver.getStaticType(typeContext))) {
         return null;
       }
 
@@ -1530,9 +1528,7 @@ class Translator with KernelNodes {
           functions.getLambdaFunction(lambda, member, enclosingMemberClosures);
 
       if (!typeEnvironment.isSubtypeOf(
-          lambdaDartType,
-          node.receiver.getStaticType(typeContext),
-          SubtypeCheckMode.withNullabilities)) {
+          lambdaDartType, node.receiver.getStaticType(typeContext))) {
         return null;
       }
 
@@ -1726,16 +1722,14 @@ class Translator with KernelNodes {
       if (name == 'iterator' && nodeCount <= 20) {
         if (typeEnvironment.isSubtypeOf(
             klass.getThisType(coreTypes, Nullability.nonNullable),
-            coreTypes.iterableRawType(Nullability.nonNullable),
-            SubtypeCheckMode.ignoringNullabilities)) {
+            coreTypes.iterableRawType(Nullability.nonNullable))) {
           return true;
         }
       }
       if (name == 'current' && nodeCount <= 5) {
         if (typeEnvironment.isSubtypeOf(
             klass.getThisType(coreTypes, Nullability.nonNullable),
-            coreTypes.iteratorRawType(Nullability.nonNullable),
-            SubtypeCheckMode.ignoringNullabilities)) {
+            coreTypes.iteratorRawType(Nullability.nonNullable))) {
           return true;
         }
       }