[cfe][InternalNodes] Use InternalSet/Map/ListLiteral

This uses the internal nodes for set/map/list literals. This is a step towards separating the internal AST from the external AST.

Change-Id: Ifa283047b11c404624b35f1d35cda9f492c9e530
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/521241
Commit-Queue: Johnni Winther <johnniwinther@google.com>
Reviewed-by: Chloe Stefantsova <cstefantsova@google.com>

Author: johnniwinther

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

@@ -107,7 +107,6 @@ import 'constness.dart' show Constness;
 import 'expression_generator.dart';
 import 'expression_generator_helper.dart';
 import 'external_ast_helper.dart' as extern;
-import 'implicit_type_argument.dart' show ImplicitTypeArgument;
 import 'internal_ast.dart';
 import 'internal_ast_helper.dart' as intern;
 import 'kernel_variable_builder.dart';
@@ -605,8 +604,6 @@ class BodyBuilderImpl extends StackListenerImpl
     return _context.instanceTypeParameterAccessState;
   }
 
-  DartType get implicitTypeArgument => const ImplicitTypeArgument();
-
   void _enterLocalState({bool inLateLocalInitializer = false}) {
     _localInitializerState = _localInitializerState.prepend(
       inLateLocalInitializer,
@@ -4320,7 +4317,7 @@ class BodyBuilderImpl extends StackListenerImpl
 
     List<TypeBuilder>? typeArguments = pop() as List<TypeBuilder>?;
 
-    DartType typeArgument;
+    DartType? typeArgument;
     if (typeArguments != null) {
       if (typeArguments.length > 1) {
         addProblem(
@@ -4337,11 +4334,9 @@ class BodyBuilderImpl extends StackListenerImpl
         );
         typeArgument = instantiateToBounds(typeArgument, coreTypes.objectClass);
       }
-    } else {
-      typeArgument = implicitTypeArgument;
     }
 
-    ListLiteral node = intern.createListLiteral(
+    InternalExpression node = intern.createListLiteral(
       // TODO(johnniwinther): The file offset computed below will not be
       // correct if there are type arguments but no `const` keyword.
       offsetForToken(constKeyword ?? leftBracket),
@@ -4569,16 +4564,14 @@ class BodyBuilderImpl extends StackListenerImpl
     Token leftBrace,
     List<dynamic>? setOrMapEntries,
   ) {
-    DartType typeArgument;
+    DartType? typeArgument;
     if (typeArguments != null) {
       typeArgument = buildDartType(
         typeArguments.single,
         TypeUse.literalTypeArgument,
         allowPotentiallyConstantType: false,
       );
       typeArgument = instantiateToBounds(typeArgument, coreTypes.objectClass);
-    } else {
-      typeArgument = implicitTypeArgument;
     }
 
     List<Expression> expressions = <Expression>[];
@@ -4599,7 +4592,7 @@ class BodyBuilderImpl extends StackListenerImpl
       }
     }
 
-    SetLiteral node = intern.createSetLiteral(
+    InternalExpression node = intern.createSetLiteral(
       // TODO(johnniwinther): The file offset computed below will not be
       // correct if there are type arguments but no `const` keyword.
       offsetForToken(constKeyword ?? leftBrace),
@@ -4849,8 +4842,8 @@ class BodyBuilderImpl extends StackListenerImpl
     Token leftBrace,
     List<MapLiteralEntry> entries,
   ) {
-    DartType keyType;
-    DartType valueType;
+    DartType? keyType;
+    DartType? valueType;
     if (typeArguments != null) {
       if (typeArguments.length != 2) {
         keyType = const InvalidType();
@@ -4869,12 +4862,9 @@ class BodyBuilderImpl extends StackListenerImpl
         keyType = instantiateToBounds(keyType, coreTypes.objectClass);
         valueType = instantiateToBounds(valueType, coreTypes.objectClass);
       }
-    } else {
-      keyType = implicitTypeArgument;
-      valueType = implicitTypeArgument;
     }
 
-    MapLiteral node = intern.createMapLiteral(
+    InternalExpression node = intern.createMapLiteral(
       // TODO(johnniwinther): The file offset computed below will not be
       // correct if there are type arguments but no `const` keyword.
       offsetForToken(constKeyword ?? leftBrace),

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

@@ -1089,7 +1089,6 @@ MapLiteralEntry convertToMapEntry(
         return result;
     }
   } else {
-    // Coverage-ignore-block(suite): Not run.
     return _convertToErroneousMapEntry(
       element,
       problemReporting,

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

@@ -9095,7 +9095,6 @@ class InternalIsExpression extends InternalExpression {
   }
 }
 
-// Coverage-ignore(suite): Not run.
 class InternalListLiteral extends InternalExpression {
   final bool isConst;
   final DartType? typeArgument;
@@ -9120,6 +9119,7 @@ class InternalListLiteral extends InternalExpression {
   }
 
   @override
+  // Coverage-ignore(suite): Not run.
   void toTextInternal(AstPrinter printer) {
     if (isConst) {
       printer.write('const ');
@@ -9174,7 +9174,6 @@ class InternalLogicalExpression extends InternalExpression {
   }
 }
 
-// Coverage-ignore(suite): Not run.
 class InternalMapLiteral extends InternalExpression {
   final bool isConst;
   final DartType? keyType;
@@ -9201,6 +9200,7 @@ class InternalMapLiteral extends InternalExpression {
   }
 
   @override
+  // Coverage-ignore(suite): Not run.
   void toTextInternal(AstPrinter printer) {
     if (isConst) {
       printer.write('const ');
@@ -9336,7 +9336,6 @@ class InternalRethrow extends InternalExpression {
   }
 }
 
-// Coverage-ignore(suite): Not run.
 class InternalSetLiteral extends InternalExpression {
   final bool isConst;
   final DartType? typeArgument;
@@ -9361,6 +9360,7 @@ class InternalSetLiteral extends InternalExpression {
   }
 
   @override
+  // Coverage-ignore(suite): Not run.
   void toTextInternal(AstPrinter printer) {
     if (isConst) {
       printer.write('const ');

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

@@ -792,17 +792,18 @@ InternalLet createLetForEffect({
 /// argument, there is more than one type argument, or if the type argument
 /// cannot be resolved. The list of [expressions] is a list of the
 /// representations of the list elements.
-ListLiteral createListLiteral(
+InternalExpression createListLiteral(
   int fileOffset,
-  DartType typeArgument,
+  DartType? typeArgument,
   List<Expression> expressions, {
   required bool isConst,
 }) {
-  return new ListLiteral(
+  return new InternalListLiteral(
     expressions,
     typeArgument: typeArgument,
     isConst: isConst,
-  )..fileOffset = fileOffset;
+    fileOffset: fileOffset,
+  );
 }
 
 InternalPattern createListPattern(
@@ -919,19 +920,20 @@ MapLiteralEntry createMapEntry(
 /// the map literal, or `null` if there are not exactly two type arguments or
 /// if the second type argument cannot be resolved. The list of [entries] is a
 /// list of the representations of the map entries.
-MapLiteral createMapLiteral(
+InternalExpression createMapLiteral(
   int fileOffset,
-  DartType keyType,
-  DartType valueType,
+  DartType? keyType,
+  DartType? valueType,
   List<MapLiteralEntry> entries, {
   required bool isConst,
 }) {
-  return new MapLiteral(
+  return new InternalMapLiteral(
     entries,
     keyType: keyType,
     valueType: valueType,
     isConst: isConst,
-  )..fileOffset = fileOffset;
+    fileOffset: fileOffset,
+  );
 }
 
 MapLiteralEntry createMapLiteralEntry(
@@ -1408,17 +1410,18 @@ InternalReturnStatement createReturnStatement({
 /// argument, there is more than one type argument, or if the type argument
 /// cannot be resolved. The list of [expressions] is a list of the
 /// representations of the set elements.
-SetLiteral createSetLiteral(
+InternalExpression createSetLiteral(
   int fileOffset,
-  DartType typeArgument,
+  DartType? typeArgument,
   List<Expression> expressions, {
   required bool isConst,
 }) {
-  return new SetLiteral(
+  return new InternalSetLiteral(
     expressions,
     typeArgument: typeArgument,
     isConst: isConst,
-  )..fileOffset = fileOffset;
+    fileOffset: fileOffset,
+  );
 }
 
 Expression createSpreadElement(