[cfe] Remove legacy raw types from CoreTypes

Change-Id: I9d920cc00ce22900429fd38b6c452483438f94d6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/397161
Reviewed-by: Johnni Winther <[email protected]>
Reviewed-by: Mayank Patke <[email protected]>
Commit-Queue: Chloe Stefantsova <[email protected]>
Reviewed-by: Nate Biggs <[email protected]>

Author: chloestefantsova

pkg/compiler/lib/src/js_model/element_map_impl.dart

@@ -663,7 +663,7 @@ class JsKernelToElementMap implements JsToElementMap, IrToElementMap {
       } else {
         data.instantiationToBounds = getInterfaceType(
           ir.instantiateToBounds(
-                coreTypes.legacyRawType(node),
+                coreTypes.nonNullableRawType(node),
                 coreTypes.objectClass,
               )
               as ir.InterfaceType,

pkg/compiler/lib/src/kernel/element_map_impl.dart

@@ -338,7 +338,7 @@ class KernelToElementMap implements IrToElementMap {
       } else {
         data.instantiationToBounds = getInterfaceType(
           ir.instantiateToBounds(
-                coreTypes.legacyRawType(node),
+                coreTypes.nonNullableRawType(node),
                 coreTypes.objectClass,
               )
               as ir.InterfaceType,

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

@@ -761,7 +761,6 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
     // See normalization functions in: sdk/lib/_internal/js_shared/lib/rti.dart
     if (_isBuildingSdk) {
       var prerequisiteRtiTypes = [
-        _coreTypes.objectLegacyRawType,
         _coreTypes.objectNullableRawType,
         NeverType.legacy()
       ];
@@ -4218,8 +4217,7 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
         condition.getStaticType(_staticTypeContext).extensionTypeErasure;
     var jsCondition = _visitExpression(condition);
 
-    if (conditionType != _coreTypes.boolLegacyRawType &&
-        conditionType != _coreTypes.boolNullableRawType &&
+    if (conditionType != _coreTypes.boolNullableRawType &&
         conditionType != _coreTypes.boolNonNullableRawType) {
       jsCondition = _runtimeCall('dtest(#)', [jsCondition]);
     } else if (_isNullable(condition)) {
@@ -6996,9 +6994,8 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
     if (_typeRep.isNumber(from) && _typeRep.isNumber(to)) {
       // If `to` is some form of `num`, it should have been filtered above.
 
-      // * -> double? | double* : no-op
-      if (to == _coreTypes.doubleLegacyRawType ||
-          to == _coreTypes.doubleNullableRawType) {
+      // * -> double? : no-op
+      if (to == _coreTypes.doubleNullableRawType) {
         return jsFrom;
       }
 
@@ -7015,9 +7012,8 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
         return _runtimeCall('asInt(#)', [jsFrom]);
       }
 
-      // * -> int? | int* : asNullableInt check
-      if (to == _coreTypes.intLegacyRawType ||
-          to == _coreTypes.intNullableRawType) {
+      // * -> int? : asNullableInt check
+      if (to == _coreTypes.intNullableRawType) {
         return _runtimeCall('asNullableInt(#)', [jsFrom]);
       }
     }

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

@@ -939,7 +939,6 @@ class LibraryCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
     // See normalization functions in: sdk/lib/_internal/js_shared/lib/rti.dart
     if (_isSdkInternalRuntime(_currentLibrary!)) {
       var prerequisiteRtiTypes = [
-        _coreTypes.objectLegacyRawType,
         _coreTypes.objectNullableRawType,
         NeverType.legacy()
       ];
@@ -4644,8 +4643,7 @@ class LibraryCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
         condition.getStaticType(_staticTypeContext).extensionTypeErasure;
     var jsCondition = _visitExpression(condition);
 
-    if (conditionType != _coreTypes.boolLegacyRawType &&
-        conditionType != _coreTypes.boolNullableRawType &&
+    if (conditionType != _coreTypes.boolNullableRawType &&
         conditionType != _coreTypes.boolNonNullableRawType) {
       jsCondition = _runtimeCall('dtest(#)', [jsCondition]);
     } else if (_isNullable(condition)) {
@@ -7422,8 +7420,7 @@ class LibraryCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
       // If `to` is some form of `num`, it should have been filtered above.
 
       // * -> double? | double* : no-op
-      if (to == _coreTypes.doubleLegacyRawType ||
-          to == _coreTypes.doubleNullableRawType) {
+      if (to == _coreTypes.doubleNullableRawType) {
         return jsFrom;
       }
 
@@ -7441,8 +7438,7 @@ class LibraryCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
       }
 
       // * -> int? | int* : asNullableInt check
-      if (to == _coreTypes.intLegacyRawType ||
-          to == _coreTypes.intNullableRawType) {
+      if (to == _coreTypes.intNullableRawType) {
         return _runtimeCall('asNullableInt(#)', [jsFrom]);
       }
     }

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

@@ -181,8 +181,7 @@ class NullableInference extends ExpressionVisitor<bool>
     if (target == null) return true;
     if (target.name.text == 'toString' && receiver != null) {
       var receiverType = receiver.getStaticType(_staticTypeContext);
-      if (receiverType == coreTypes.stringLegacyRawType ||
-          receiverType == coreTypes.stringNonNullableRawType) {
+      if (receiverType == coreTypes.stringNonNullableRawType) {
         // TODO(nshahan): In unsound null safety the return type of
         // `Object.toString()` is still considered nullable. The `class String`
         // in dart:core does not explicitly declare `.toString()`, which results

pkg/front_end/lib/src/kernel/constant_evaluator.dart

@@ -3709,7 +3709,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
                 templateConstEvalInvalidBinaryOperandType.withArguments(
                     '+',
                     receiver,
-                    typeEnvironment.coreTypes.stringLegacyRawType,
+                    typeEnvironment.coreTypes.stringNonNullableRawType,
                     other.getType(staticTypeContext)));
           case '[]':
             if (enableConstFunctions) {
@@ -3748,7 +3748,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
                 templateConstEvalInvalidBinaryOperandType.withArguments(
                     op,
                     other,
-                    typeEnvironment.coreTypes.intLegacyRawType,
+                    typeEnvironment.coreTypes.intNonNullableRawType,
                     other.getType(staticTypeContext)));
           }
           num receiverValue = (receiver as PrimitiveConstant<num>).value;
@@ -3760,7 +3760,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
             templateConstEvalInvalidBinaryOperandType.withArguments(
                 op,
                 receiver,
-                typeEnvironment.coreTypes.numLegacyRawType,
+                typeEnvironment.coreTypes.numNonNullableRawType,
                 other.getType(staticTypeContext)));
       }
     } else if (receiver is DoubleConstant) {
@@ -3771,7 +3771,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
             templateConstEvalInvalidBinaryOperandType.withArguments(
                 op,
                 receiver,
-                typeEnvironment.coreTypes.intLegacyRawType,
+                typeEnvironment.coreTypes.intNonNullableRawType,
                 receiver.getType(staticTypeContext)));
       }
       if (positionalArguments.length == 0) {
@@ -3793,7 +3793,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
             templateConstEvalInvalidBinaryOperandType.withArguments(
                 op,
                 receiver,
-                typeEnvironment.coreTypes.numLegacyRawType,
+                typeEnvironment.coreTypes.numNonNullableRawType,
                 other.getType(staticTypeContext)));
       }
     } else if (receiver is BoolConstant) {
@@ -4674,8 +4674,10 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
             // `null is Null` is handled below.
             return typeEnvironment.isSubtypeOf(type, const NullType(),
                     SubtypeCheckMode.ignoringNullabilities) ||
-                typeEnvironment.isSubtypeOf(typeEnvironment.objectLegacyRawType,
-                    type, SubtypeCheckMode.ignoringNullabilities);
+                typeEnvironment.isSubtypeOf(
+                    typeEnvironment.objectNullableRawType,
+                    type,
+                    SubtypeCheckMode.ignoringNullabilities);
           } else {
             return typeEnvironment.isSubtypeOf(
                 const NullType(), type, SubtypeCheckMode.withNullabilities);

pkg/front_end/lib/src/type_inference/standard_bounds.dart

@@ -34,20 +34,6 @@ mixin TypeSchemaStandardBounds on StandardBounds {
     return super.getNullabilityAwareStandardLowerBoundInternal(type1, type2);
   }
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  DartType getNullabilityObliviousStandardLowerBoundInternal(type1, type2) {
-    // For any type T, SLB(?, T) = SLB(T, ?) = T.
-    if (type1 is UnknownType) {
-      return type2;
-    }
-    if (type2 is UnknownType) {
-      return type1;
-    }
-    return super
-        .getNullabilityObliviousStandardLowerBoundInternal(type1, type2);
-  }
-
   @override
   DartType getNullabilityAwareStandardUpperBoundInternal(
       DartType type1, DartType type2) {
@@ -57,19 +43,4 @@ mixin TypeSchemaStandardBounds on StandardBounds {
 
     return super.getNullabilityAwareStandardUpperBoundInternal(type1, type2);
   }
-
-  @override
-  // Coverage-ignore(suite): Not run.
-  DartType getNullabilityObliviousStandardUpperBoundInternal(
-      DartType type1, DartType type2) {
-    // For any type T, SUB(?, T) = SUB(T, ?) = T.
-    if (type1 is UnknownType) {
-      return type2;
-    }
-    if (type2 is UnknownType) {
-      return type1;
-    }
-    return super
-        .getNullabilityObliviousStandardUpperBoundInternal(type1, type2);
-  }
 }

pkg/front_end/test/types/legacy_upper_bound_helper.dart

@@ -61,41 +61,41 @@ abstract class LegacyUpperBoundTest {
   Future<void> test_getLegacyLeastUpperBound_expansive() async {
     await parseComponent("""
 class N<T>;
-class C1<T> extends N<N<C1<T*>*>*>;
-class C2<T> extends N<N<C2<N<C2<T*>*>*>*>*>;
+class C1<T> extends N<N<C1<T>>>;
+class C2<T> extends N<N<C2<N<C2<T>>>>>;
 """);
 
     // The least upper bound of C1<int> and N<C1<String>> is Object since the
     // supertypes are
     //     {C1<int>, N<N<C1<int>>>, Object} for C1<int> and
     //     {N<C1<String>>, Object} for N<C1<String>> and
     // Object is the most specific type in the intersection of the supertypes.
-    checkLegacyUp("C1<int*>*", "N<C1<String*>*>*", "Object*");
+    checkLegacyUp("C1<int>", "N<C1<String>>", "Object");
 
     // The least upper bound of C2<int> and N<C2<String>> is Object since the
     // supertypes are
     //     {C2<int>, N<N<C2<N<C2<int>>>>>, Object} for C2<int> and
     //     {N<C2<String>>, Object} for N<C2<String>> and
     // Object is the most specific type in the intersection of the supertypes.
-    checkLegacyUp("C2<int*>*", "N<C2<String*>*>*", "Object*");
+    checkLegacyUp("C2<int>", "N<C2<String>>", "Object");
   }
 
   Future<void> test_getLegacyLeastUpperBound_generic() async {
     await parseComponent("""
 class A;
 class B<T> implements A;
 class C<U> implements A;
-class D<T, U> implements B<T*>, C<U*>;
-class E implements D<int*, double*>;
-class F implements D<int*, bool*>;
+class D<T, U> implements B<T>, C<U>;
+class E implements D<int, double>;
+class F implements D<int, bool>;
 """);
 
     checkLegacyUp(
-        "D<int*, double*>*", "D<int*, double*>*", "D<int*, double*>*");
-    checkLegacyUp("D<int*, double*>*", "D<int*, bool*>*", "B<int*>*");
-    checkLegacyUp("D<int*, double*>*", "D<bool*, double*>*", "C<double*>*");
-    checkLegacyUp("D<int*, double*>*", "D<bool*, int*>*", "A*");
-    checkLegacyUp("E*", "F*", "B<int*>*");
+        "D<int, double>", "D<int, double>", "D<int, double>");
+    checkLegacyUp("D<int, double>", "D<int, bool>", "B<int>");
+    checkLegacyUp("D<int, double>", "D<bool, double>", "C<double>");
+    checkLegacyUp("D<int, double>", "D<bool, int>", "A");
+    checkLegacyUp("E", "F", "B<int>");
   }
 
   Future<void> test_getLegacyLeastUpperBound_nonGeneric() async {
@@ -111,13 +111,13 @@ class H implements C, D, E;
 class I implements C, D, E;
 """);
 
-    checkLegacyUp("A*", "B*", "Object*");
-    checkLegacyUp("A*", "Object*", "Object*");
-    checkLegacyUp("Object*", "B*", "Object*");
-    checkLegacyUp("C*", "D*", "A*");
-    checkLegacyUp("C*", "A*", "A*");
-    checkLegacyUp("A*", "D*", "A*");
-    checkLegacyUp("F*", "G*", "A*");
-    checkLegacyUp("H*", "I*", "A*");
+    checkLegacyUp("A", "B", "Object");
+    checkLegacyUp("A", "Object", "Object");
+    checkLegacyUp("Object", "B", "Object");
+    checkLegacyUp("C", "D", "A");
+    checkLegacyUp("C", "A", "A");
+    checkLegacyUp("A", "D", "A");
+    checkLegacyUp("F", "G", "A");
+    checkLegacyUp("H", "I", "A");
   }
 }