[cfe] Upate pre-Null Safe naming in the CFE

chloestefantsova · Commit Queue · commit 150e8cbe978f · 2025-06-23T03:17:42.000-07:00
Change-Id: I45e8dc703ce7810e6df5a328b3829dc86a128792 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/436241 Reviewed-by: Johnni Winther <johnniwinther@google.com> Commit-Queue: Chloe Stefantsova <cstefantsova@google.com>
diff --git a/pkg/front_end/lib/src/kernel/combined_member_signature.dart b/pkg/front_end/lib/src/kernel/combined_member_signature.dart
@@ -356,7 +356,7 @@ abstract class CombinedMemberSignatureBase {
         DartType signatureTypeParameterBound =
             instantiator.substitute(signatureTypeParameters[i].bound);
         if (!_types
-            .performNullabilityAwareMutualSubtypesCheck(
+            .performMutualSubtypesCheck(
                 typeParameterBound, signatureTypeParameterBound)
             .isSuccess()) {
           return null;
diff --git a/pkg/front_end/lib/src/source/source_class_builder.dart b/pkg/front_end/lib/src/source/source_class_builder.dart
@@ -1573,7 +1573,7 @@ class SourceClassBuilder extends ClassBuilderImpl
           }
           DartType computedBound = substitution.substituteType(interfaceBound);
           if (!types
-              .performNullabilityAwareMutualSubtypesCheck(
+              .performMutualSubtypesCheck(
                   declaredBound, computedBound)
               .isSuccess()) {
             reportInvalidOverride(
diff --git a/pkg/front_end/lib/src/type_inference/closure_context.dart b/pkg/front_end/lib/src/type_inference/closure_context.dart
@@ -472,7 +472,7 @@ class _AsyncClosureContext implements ClosureContext {
           ..parent = statement;
       } else if (flattenedExpressionType is! VoidType &&
           !inferrer.typeSchemaEnvironment
-              .performNullabilityAwareSubtypeCheck(
+              .performSubtypeCheck(
                   flattenedExpressionType, emittedValueType!)
               .isSuccess()) {
         // It is a compile-time error if s is `return e;`, flatten(S) is not
diff --git a/pkg/front_end/lib/src/type_inference/inference_visitor_base.dart b/pkg/front_end/lib/src/type_inference/inference_visitor_base.dart
@@ -59,7 +59,7 @@ import 'type_schema_environment.dart'
     show
         getNamedParameterType,
         getPositionalParameterType,
-        TypeParameterEliminator,
+        AllTypeParameterEliminator,
         TypeSchemaEnvironment;
 
 /// Given a [FunctionExpression], computes a set whose elements consist of (a)
@@ -880,8 +880,8 @@ abstract class InferenceVisitorBase implements InferenceVisitor {
       );
     }
 
-    IsSubtypeOf isDirectSubtypeResult = typeSchemaEnvironment
-        .performNullabilityAwareSubtypeCheck(expressionType, contextType);
+    IsSubtypeOf isDirectSubtypeResult =
+        typeSchemaEnvironment.performSubtypeCheck(expressionType, contextType);
     bool isDirectlyAssignable = isDirectSubtypeResult.isSuccess();
     if (isDirectlyAssignable) {
       return new AssignabilityResult(
@@ -894,7 +894,7 @@ abstract class InferenceVisitorBase implements InferenceVisitor {
     bool isIndirectlyAssignable = expressionType is DynamicType;
     if (!isIndirectlyAssignable) {
       if (typeSchemaEnvironment
-          .performNullabilityAwareSubtypeCheck(
+          .performSubtypeCheck(
             expressionType,
             contextType.withDeclaredNullability(Nullability.nullable),
           )
@@ -1843,7 +1843,7 @@ abstract class InferenceVisitorBase implements InferenceVisitor {
     TypeConstraintGatherer? gatherer;
     if (inferenceNeeded) {
       if (isConst) {
-        typeContext = new TypeParameterEliminator(
+        typeContext = new AllTypeParameterEliminator(
           bottomType,
           coreTypes.objectNullableRawType,
         ).substituteType(typeContext);
diff --git a/pkg/front_end/lib/src/type_inference/matching_cache.dart b/pkg/front_end/lib/src/type_inference/matching_cache.dart
@@ -875,7 +875,7 @@ class PromotedCacheableExpression
     Expression result = _expression.createExpression(typeEnvironment,
         effects: effects, inCacheInitializer: inCacheInitializer);
     if (!typeEnvironment
-            .performNullabilityAwareSubtypeCheck(
+            .performSubtypeCheck(
                 _expression.getType(typeEnvironment), _promotedType)
             .isSuccess() ||
         (_promotedType is! DynamicType &&
diff --git a/pkg/front_end/lib/src/type_inference/standard_bounds.dart b/pkg/front_end/lib/src/type_inference/standard_bounds.dart
@@ -25,22 +25,22 @@ mixin TypeSchemaStandardBounds on StandardBounds {
   }
 
   @override
-  DartType getNullabilityAwareStandardLowerBoundInternal(
+  DartType getStandardLowerBoundInternal(
       DartType type1, DartType type2) {
     //  - We add the axiom that `DOWN(T, _) == T` and the symmetric version.
     if (type1 is UnknownType) return type2;
     if (type2 is UnknownType) return type1;
 
-    return super.getNullabilityAwareStandardLowerBoundInternal(type1, type2);
+    return super.getStandardLowerBoundInternal(type1, type2);
   }
 
   @override
-  DartType getNullabilityAwareStandardUpperBoundInternal(
+  DartType getStandardUpperBoundInternal(
       DartType type1, DartType type2) {
     //  - We add the axiom that `UP(T, _) == T` and the symmetric version.
     if (type1 is UnknownType) return type2;
     if (type2 is UnknownType) return type1;
 
-    return super.getNullabilityAwareStandardUpperBoundInternal(type1, type2);
+    return super.getStandardUpperBoundInternal(type1, type2);
   }
 }
diff --git a/pkg/front_end/lib/src/type_inference/type_inference_engine.dart b/pkg/front_end/lib/src/type_inference/type_inference_engine.dart
@@ -719,7 +719,7 @@ class OperationsCfe
   bool isAssignableTo(SharedTypeView fromType, SharedTypeView toType) {
     if (fromType is DynamicType) return true;
     return typeEnvironment
-        .performNullabilityAwareSubtypeCheck(
+        .performSubtypeCheck(
             fromType.unwrapTypeView(), toType.unwrapTypeView())
         .isSuccess();
   }
@@ -981,15 +981,15 @@ class OperationsCfe
   @override
   DartType greatestClosureOfTypeInternal(
       DartType type, List<SharedTypeParameter> typeParametersToEliminate) {
-    return new NullabilityAwareFreeTypeParameterEliminator(
+    return new FreeTypeParameterEliminator(
             coreTypes: typeEnvironment.coreTypes)
         .eliminateToGreatest(type);
   }
 
   @override
   DartType leastClosureOfTypeInternal(
       DartType type, List<SharedTypeParameter> typeParametersToEliminate) {
-    return new NullabilityAwareFreeTypeParameterEliminator(
+    return new FreeTypeParameterEliminator(
             coreTypes: typeEnvironment.coreTypes)
         .eliminateToLeast(type);
   }
diff --git a/pkg/front_end/lib/src/type_inference/type_schema_environment.dart b/pkg/front_end/lib/src/type_inference/type_schema_environment.dart
@@ -248,8 +248,7 @@ class TypeSchemaEnvironment extends HierarchyBasedTypeEnvironment
   }
 
   @override
-  IsSubtypeOf performNullabilityAwareSubtypeCheck(
-      DartType subtype, DartType supertype) {
+  IsSubtypeOf performSubtypeCheck(DartType subtype, DartType supertype) {
     if (subtype is UnknownType) return const IsSubtypeOf.success();
 
     DartType unwrappedSupertype = supertype;
@@ -259,7 +258,7 @@ class TypeSchemaEnvironment extends HierarchyBasedTypeEnvironment
     if (unwrappedSupertype is UnknownType) {
       return const IsSubtypeOf.success();
     }
-    return super.performNullabilityAwareSubtypeCheck(subtype, supertype);
+    return super.performSubtypeCheck(subtype, supertype);
   }
 
   // TODO(johnniwinther): Should [context] be non-nullable?
@@ -309,9 +308,9 @@ class TypeSchemaEnvironment extends HierarchyBasedTypeEnvironment
 
     if (!isEmptyContext(returnContextType)) {
       if (isConst) {
-        returnContextType = new NullabilityAwareFreeTypeParameterEliminator(
-                coreTypes: coreTypes)
-            .eliminateToLeast(returnContextType!);
+        returnContextType =
+            new FreeTypeParameterEliminator(coreTypes: coreTypes)
+                .eliminateToLeast(returnContextType!);
       }
       gatherer.tryConstrainUpper(declaredReturnType!, returnContextType!,
           treeNodeForTesting: treeNodeForTesting);
@@ -548,11 +547,11 @@ class TypeSchemaEnvironment extends HierarchyBasedTypeEnvironment
   }
 }
 
-class TypeParameterEliminator extends Substitution {
+class AllTypeParameterEliminator extends Substitution {
   final DartType bottomType;
   final DartType topType;
 
-  TypeParameterEliminator(this.bottomType, this.topType);
+  AllTypeParameterEliminator(this.bottomType, this.topType);
 
   @override
   DartType getSubstitute(TypeParameter parameter, bool upperBound) {
diff --git a/pkg/front_end/test/type_inference/type_schema_environment_test_base.dart b/pkg/front_end/test/type_inference/type_schema_environment_test_base.dart
@@ -99,7 +99,7 @@ abstract class TypeSchemaEnvironmentTestBase {
   void checkIsSubtype(String subtype, String supertype) {
     expect(
         typeSchemaEnvironment
-            .performNullabilityAwareSubtypeCheck(
+            .performSubtypeCheck(
                 parseType(subtype), parseType(supertype))
             .isSuccess(),
         isTrue);
@@ -108,7 +108,7 @@ abstract class TypeSchemaEnvironmentTestBase {
   void checkIsNotSubtype(String subtype, String supertype) {
     expect(
         typeSchemaEnvironment
-            .performNullabilityAwareSubtypeCheck(
+            .performSubtypeCheck(
                 parseType(subtype), parseType(supertype))
             .isSuccess(),
         isFalse);
diff --git a/pkg/front_end/test/types/README.md b/pkg/front_end/test/types/README.md
@@ -17,7 +17,7 @@ To collect new data for a benchmark, follow these steps:
 `pkg/compiler/lib/src/dart2js.dart`.
 
 2. Modify `pkg/kernel/lib/src/types.dart` as described in the method
-`SubtypeTester._collect_performNullabilityAwareSubtypeCheck`.
+`SubtypeTester._collect_performSubtypeCheck`.
 
 3. Compile the program using CFE, for example:
 
diff --git a/pkg/front_end/test/types/cfe_types_test.dart b/pkg/front_end/test/types/cfe_types_test.dart
@@ -67,7 +67,7 @@ class FastaTypesTest extends SubtypeTest<DartType, TypeParserEnvironment> {
   @override
   IsSubtypeOf isSubtypeImpl(DartType subtype, DartType supertype) {
     return hierarchy.types
-        .performNullabilityAwareSubtypeCheck(subtype, supertype);
+        .performSubtypeCheck(subtype, supertype);
   }
 
   @override
diff --git a/pkg/front_end/test/types/kernel_type_parser_test.dart b/pkg/front_end/test/types/kernel_type_parser_test.dart
@@ -172,7 +172,7 @@ class KernelSubtypeTest extends SubtypeTest<DartType, TypeParserEnvironment> {
   @override
   IsSubtypeOf isSubtypeImpl(DartType subtype, DartType supertype) {
     return new TypeEnvironment(coreTypes, hierarchy)
-        .performNullabilityAwareSubtypeCheck(subtype, supertype);
+        .performSubtypeCheck(subtype, supertype);
   }
 
   @override
diff --git a/pkg/front_end/tool/flame/subtype_lib.dart b/pkg/front_end/tool/flame/subtype_lib.dart
@@ -108,7 +108,7 @@ void after() {
       DartType s = relation.subtype;
       DartType t = relation.supertype;
       narrow.start();
-      types.performNullabilityAwareSubtypeCheck(s, t);
+      types.performSubtypeCheck(s, t);
       narrow.stop();
     }
     narrowTiming.add(narrow.elapsedMicroseconds);
@@ -127,7 +127,7 @@ void after() {
       Types types = relation.types;
       DartType s = relation.subtype;
       DartType t = relation.supertype;
-      types.performNullabilityAwareSubtypeCheck(s, t);
+      types.performSubtypeCheck(s, t);
     }
     loop.stop();
     loopTiming.add(loop.elapsedMicroseconds);
diff --git a/pkg/front_end/tool/flame/subtype_measure.dart b/pkg/front_end/tool/flame/subtype_measure.dart
@@ -58,7 +58,7 @@ class SubtypeInstrumenterConfig implements InstrumenterConfig {
 
   @override
   bool includeProcedure(Procedure procedure) {
-    if (procedure.name.text == 'performNullabilityAwareSubtypeCheck') {
+    if (procedure.name.text == 'performSubtypeCheck') {
       Library library = procedure.enclosingLibrary;
       Class? cls = procedure.enclosingClass;
       if (cls?.name == 'Types' &&
diff --git a/pkg/kernel/lib/src/standard_bounds.dart b/pkg/kernel/lib/src/standard_bounds.dart
diff --git a/pkg/kernel/lib/src/types.dart b/pkg/kernel/lib/src/types.dart
diff --git a/pkg/kernel/lib/type_algebra.dart b/pkg/kernel/lib/type_algebra.dart
diff --git a/pkg/kernel/lib/type_environment.dart b/pkg/kernel/lib/type_environment.dart

Original file line number	Diff line number	Diff line change
`@@ -1573,7 +1573,7 @@ class SourceClassBuilder extends ClassBuilderImpl`
`1573`	`1573`	`}`
`1574`	`1574`	`DartType computedBound = substitution.substituteType(interfaceBound);`
`1575`	`1575`	`if (!types`
`1576`		`- .performNullabilityAwareMutualSubtypesCheck(`
	`1576`	`+ .performMutualSubtypesCheck(`
`1577`	`1577`	`declaredBound, computedBound)`
`1578`	`1578`	`.isSuccess()) {`
`1579`	`1579`	`reportInvalidOverride(`
Original file line number	Diff line number	Diff line change
`@@ -25,22 +25,22 @@ mixin TypeSchemaStandardBounds on StandardBounds {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`@override`
`28`		`- DartType getNullabilityAwareStandardLowerBoundInternal(`
	`28`	`+ DartType getStandardLowerBoundInternal(`
`29`	`29`	`DartType type1, DartType type2) {`
`30`	`30`	// - We add the axiom that `DOWN(T, _) == T` and the symmetric version.
`31`	`31`	`if (type1 is UnknownType) return type2;`
`32`	`32`	`if (type2 is UnknownType) return type1;`
`33`	`33`
`34`		`- return super.getNullabilityAwareStandardLowerBoundInternal(type1, type2);`
	`34`	`+ return super.getStandardLowerBoundInternal(type1, type2);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@override`
`38`		`- DartType getNullabilityAwareStandardUpperBoundInternal(`
	`38`	`+ DartType getStandardUpperBoundInternal(`
`39`	`39`	`DartType type1, DartType type2) {`
`40`	`40`	// - We add the axiom that `UP(T, _) == T` and the symmetric version.
`41`	`41`	`if (type1 is UnknownType) return type2;`
`42`	`42`	`if (type2 is UnknownType) return type1;`
`43`	`43`
`44`		`- return super.getNullabilityAwareStandardUpperBoundInternal(type1, type2);`
	`44`	`+ return super.getStandardUpperBoundInternal(type1, type2);`
`45`	`45`	`}`
`46`	`46`	`}`