[cfe] Use correct types and errors in late lowering

Change-Id: I6e7dcbd96e151a69fc67a6cd5e5af1620760b02a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/126647
Commit-Queue: Johnni Winther <[email protected]>
Reviewed-by: Jens Johansen <[email protected]>
Reviewed-by: Lasse R.H. Nielsen <[email protected]>

Author: johnniwinther

pkg/front_end/lib/src/fasta/builder/class_builder.dart

@@ -169,7 +169,7 @@ abstract class ClassBuilder implements DeclarationBuilder {
 
   List<ConstructorReferenceBuilder> get constructorReferences;
 
-  void buildOutlineExpressions(LibraryBuilder library);
+  void buildOutlineExpressions(LibraryBuilder library, CoreTypes coreTypes);
 
   /// Registers a constructor redirection for this class and returns true if
   /// this redirection gives rise to a cycle that has not been reported before.
@@ -409,10 +409,10 @@ abstract class ClassBuilderImpl extends DeclarationBuilderImpl
   List<ConstructorReferenceBuilder> get constructorReferences => null;
 
   @override
-  void buildOutlineExpressions(LibraryBuilder library) {
+  void buildOutlineExpressions(LibraryBuilder library, CoreTypes coreTypes) {
     void build(String ignore, Builder declaration) {
       MemberBuilder member = declaration;
-      member.buildOutlineExpressions(library);
+      member.buildOutlineExpressions(library, coreTypes);
     }
 
     MetadataBuilder.buildAnnotations(

pkg/front_end/lib/src/fasta/builder/constructor_builder.dart

@@ -7,6 +7,7 @@ import 'dart:core' hide MapEntry;
 import 'package:_fe_analyzer_shared/src/scanner/token.dart' show Token;
 
 import 'package:kernel/ast.dart';
+import 'package:kernel/core_types.dart';
 
 import '../constant_context.dart' show ConstantContext;
 
@@ -209,8 +210,8 @@ class ConstructorBuilderImpl extends FunctionBuilderImpl
   }
 
   @override
-  void buildOutlineExpressions(LibraryBuilder library) {
-    super.buildOutlineExpressions(library);
+  void buildOutlineExpressions(LibraryBuilder library, CoreTypes coreTypes) {
+    super.buildOutlineExpressions(library, coreTypes);
 
     // For modular compilation purposes we need to include initializers
     // for const constructors into the outline.

pkg/front_end/lib/src/fasta/builder/enum_builder.dart

@@ -297,8 +297,11 @@ class EnumBuilder extends SourceClassBuilder {
     }
     SourceFieldBuilder valuesBuilder = firstMemberNamed("values");
     valuesBuilder.build(libraryBuilder);
-    valuesBuilder.buildBody(new ListLiteral(values,
-        typeArgument: rawType(library.nonNullable), isConst: true));
+    valuesBuilder.buildBody(
+        // TODO(johnniwinther): Create the bodies only when we have core types.
+        null,
+        new ListLiteral(values,
+            typeArgument: rawType(library.nonNullable), isConst: true));
     ConstructorBuilderImpl constructorBuilder = constructorScopeBuilder[""];
     Constructor constructor = constructorBuilder.build(libraryBuilder);
     constructor.initializers.insert(
@@ -343,6 +346,9 @@ class EnumBuilder extends SourceClassBuilder {
             new StringLiteral("$name.$constant")
           ]);
           field.buildBody(
+              // TODO(johnniwinther): Create the bodies only when we have core
+              //  types.
+              null,
               new ConstructorInvocation(constructor, arguments, isConst: true));
         }
       }

pkg/front_end/lib/src/fasta/builder/extension_builder.dart

@@ -5,6 +5,7 @@
 import 'dart:core' hide MapEntry;
 
 import 'package:kernel/ast.dart';
+import 'package:kernel/core_types.dart';
 
 import '../fasta_codes.dart' show templateInternalProblemNotFoundIn;
 import '../scope.dart';
@@ -26,7 +27,7 @@ abstract class ExtensionBuilder implements DeclarationBuilder {
   /// Return the [Extension] built by this builder.
   Extension get extension;
 
-  void buildOutlineExpressions(LibraryBuilder library);
+  void buildOutlineExpressions(LibraryBuilder library, CoreTypes coreTypes);
 
   /// Looks up extension member by [name] taking privacy into account.
   ///
@@ -120,10 +121,10 @@ abstract class ExtensionBuilderImpl extends DeclarationBuilderImpl
   String get debugName => "ExtensionBuilder";
 
   @override
-  void buildOutlineExpressions(LibraryBuilder library) {
+  void buildOutlineExpressions(LibraryBuilder library, CoreTypes coreTypes) {
     void build(String ignore, Builder declaration) {
       MemberBuilder member = declaration;
-      member.buildOutlineExpressions(library);
+      member.buildOutlineExpressions(library, coreTypes);
     }
 
     // TODO(johnniwinther): Handle annotations on the extension declaration.

pkg/front_end/lib/src/fasta/builder/field_builder.dart

@@ -7,6 +7,7 @@ library fasta.field_builder;
 import 'package:_fe_analyzer_shared/src/scanner/scanner.dart' show Token;
 
 import 'package:kernel/ast.dart' hide MapEntry;
+import 'package:kernel/core_types.dart';
 
 import '../constant_context.dart' show ConstantContext;
 
@@ -70,7 +71,7 @@ abstract class FieldBuilder implements MemberBuilder {
 
   /// Builds the body of this field using [initializer] as the initializer
   /// expression.
-  void buildBody(Expression initializer);
+  void buildBody(CoreTypes coreTypes, Expression initializer);
 
   /// Builds the field initializers for each field used to encode this field
   /// using the [fileOffset] for the created nodes and [value] as the initial
@@ -154,7 +155,7 @@ class SourceFieldBuilder extends MemberBuilderImpl implements FieldBuilder {
   bool get hasInitializer => (modifiers & hasInitializerMask) != 0;
 
   @override
-  void buildBody(Expression initializer) {
+  void buildBody(CoreTypes coreTypes, Expression initializer) {
     assert(!hasBodyBeenBuilt);
     hasBodyBeenBuilt = true;
     if (!hasInitializer &&
@@ -165,7 +166,7 @@ class SourceFieldBuilder extends MemberBuilderImpl implements FieldBuilder {
       internalProblem(
           messageInternalProblemAlreadyInitialized, charOffset, fileUri);
     }
-    _fieldEncoding.createBodies(initializer);
+    _fieldEncoding.createBodies(coreTypes, initializer);
   }
 
   @override
@@ -220,7 +221,9 @@ class SourceFieldBuilder extends MemberBuilderImpl implements FieldBuilder {
   }
 
   @override
-  void buildOutlineExpressions(LibraryBuilder library) {
+  void buildOutlineExpressions(LibraryBuilder library, CoreTypes coreTypes) {
+    _fieldEncoding.completeSignature(coreTypes);
+
     ClassBuilder classBuilder = isClassMember ? parent : null;
     MetadataBuilder.buildAnnotations(
         _fieldEncoding.field, metadata, library, classBuilder, this);
@@ -255,7 +258,7 @@ class SourceFieldBuilder extends MemberBuilderImpl implements FieldBuilder {
             bodyBuilder.transformCollections, library.library);
         initializer = wrapper.operand;
       }
-      buildBody(initializer);
+      buildBody(coreTypes, initializer);
       bodyBuilder.resolveRedirectingFactoryTargets();
     }
     constInitializerToken = null;
@@ -374,7 +377,7 @@ abstract class FieldEncoding {
   ///
   /// This method is not called for fields in outlines unless their are constant
   /// or part of a const constructor.
-  void createBodies(Expression initializer);
+  void createBodies(CoreTypes coreTypes, Expression initializer);
 
   List<Initializer> createInitializer(int fileOffset, Expression value,
       {bool isSynthetic});
@@ -406,9 +409,16 @@ abstract class FieldEncoding {
       SourceFieldBuilder fieldBuilder,
       void Function(Member, BuiltMemberKind) f);
 
+  /// Returns a list of the field, getters and methods created by this field
+  /// encoding.
   List<ClassMember> getLocalMembers(SourceFieldBuilder fieldBuilder);
 
+  /// Returns a list of the setters created by this field encoding.
   List<ClassMember> getLocalSetters(SourceFieldBuilder fieldBuilder);
+
+  /// Ensures that the signatures all members created by this field encoding
+  /// are fully typed.
+  void completeSignature(CoreTypes coreTypes);
 }
 
 class RegularFieldEncoding implements FieldEncoding {
@@ -429,7 +439,10 @@ class RegularFieldEncoding implements FieldEncoding {
   }
 
   @override
-  void createBodies(Expression initializer) {
+  void completeSignature(CoreTypes coreTypes) {}
+
+  @override
+  void createBodies(CoreTypes coreTypes, Expression initializer) {
     if (initializer != null) {
       _field.initializer = initializer..parent = _field;
     }
@@ -538,18 +551,25 @@ abstract class AbstractLateFieldEncoding implements FieldEncoding {
   }
 
   @override
-  void createBodies(Expression initializer) {
+  void completeSignature(CoreTypes coreTypes) {
+    if (_lateIsSetField != null) {
+      _lateIsSetField.type = coreTypes.boolRawType(Nullability.nonNullable);
+    }
+  }
+
+  @override
+  void createBodies(CoreTypes coreTypes, Expression initializer) {
     assert(_type != null, "Type has not been computed for field $name.");
     _field.initializer = new NullLiteral()..parent = _field;
     if (_type.isPotentiallyNullable) {
       _lateIsSetField.initializer = new BoolLiteral(false)
         ..parent = _lateIsSetField;
     }
-    _lateGetter.function.body = _createGetterBody(name, initializer)
+    _lateGetter.function.body = _createGetterBody(coreTypes, name, initializer)
       ..parent = _lateGetter.function;
     if (_lateSetter != null) {
       _lateSetter.function.body = _createSetterBody(
-          name, _lateSetter.function.positionalParameters.first)
+          coreTypes, name, _lateSetter.function.positionalParameters.first)
         ..parent = _lateSetter.function;
     }
   }
@@ -590,7 +610,8 @@ abstract class AbstractLateFieldEncoding implements FieldEncoding {
     }
   }
 
-  Statement _createGetterBody(String name, Expression initializer);
+  Statement _createGetterBody(
+      CoreTypes coreTypes, String name, Expression initializer);
 
   Procedure _createSetter(String name, Uri fileUri, int charOffset) {
     VariableDeclaration parameter = new VariableDeclaration(null);
@@ -603,7 +624,8 @@ abstract class AbstractLateFieldEncoding implements FieldEncoding {
       ..fileOffset = charOffset;
   }
 
-  Statement _createSetterBody(String name, VariableDeclaration parameter);
+  Statement _createSetterBody(
+      CoreTypes coreTypes, String name, VariableDeclaration parameter);
 
   @override
   DartType get type => _type;
@@ -674,9 +696,6 @@ abstract class AbstractLateFieldEncoding implements FieldEncoding {
         ..hasImplicitSetter = isInstanceMember
         ..isStatic = _field.isStatic
         ..isExtensionMember = isExtensionMember;
-      // TODO(johnniwinther): Provide access to a `bool` type here.
-      /*_lateIsSetField.type =
-          libraryBuilder.loader.coreTypes.boolNonNullableRawType;*/
     }
     _lateGetter
       ..name = new Name(fieldName, libraryBuilder.library)
@@ -731,7 +750,8 @@ abstract class AbstractLateFieldEncoding implements FieldEncoding {
 
 mixin NonFinalLate on AbstractLateFieldEncoding {
   @override
-  Statement _createSetterBody(String name, VariableDeclaration parameter) {
+  Statement _createSetterBody(
+      CoreTypes coreTypes, String name, VariableDeclaration parameter) {
     assert(_type != null, "Type has not been computed for field $name.");
     return late_lowering.createSetterBody(fileOffset, name, parameter, _type,
         shouldReturnValue: false,
@@ -744,7 +764,8 @@ mixin NonFinalLate on AbstractLateFieldEncoding {
 
 mixin LateWithInitializer on AbstractLateFieldEncoding {
   @override
-  Statement _createGetterBody(String name, Expression initializer) {
+  Statement _createGetterBody(
+      CoreTypes coreTypes, String name, Expression initializer) {
     assert(_type != null, "Type has not been computed for field $name.");
     return late_lowering.createGetterWithInitializer(
         fileOffset, name, _type, initializer,
@@ -755,19 +776,15 @@ mixin LateWithInitializer on AbstractLateFieldEncoding {
         createIsSetWrite: (Expression value) =>
             _createFieldSet(_lateIsSetField, value));
   }
-
-  @override
-  void createBodies(Expression initializer) {
-    super.createBodies(initializer);
-  }
 }
 
 mixin LateWithoutInitializer on AbstractLateFieldEncoding {
   @override
-  Statement _createGetterBody(String name, Expression initializer) {
+  Statement _createGetterBody(
+      CoreTypes coreTypes, String name, Expression initializer) {
     assert(_type != null, "Type has not been computed for field $name.");
     return late_lowering.createGetterBodyWithoutInitializer(
-        fileOffset, name, type, 'Field',
+        coreTypes, fileOffset, name, type, 'Field',
         createVariableRead: () => _createFieldGet(_field),
         createIsSetRead: () => _createFieldGet(_lateIsSetField));
   }
@@ -794,10 +811,11 @@ class LateFinalFieldWithoutInitializerEncoding extends AbstractLateFieldEncoding
       : super(name, fileUri, charOffset, charEndOffset);
 
   @override
-  Statement _createSetterBody(String name, VariableDeclaration parameter) {
+  Statement _createSetterBody(
+      CoreTypes coreTypes, String name, VariableDeclaration parameter) {
     assert(_type != null, "Type has not been computed for field $name.");
     return late_lowering.createSetterBodyFinal(
-        fileOffset, name, parameter, type, 'Field',
+        coreTypes, fileOffset, name, parameter, type, 'Field',
         shouldReturnValue: false,
         createVariableRead: () => _createFieldGet(_field),
         createVariableWrite: (Expression value) =>
@@ -818,7 +836,8 @@ class LateFinalFieldWithInitializerEncoding extends AbstractLateFieldEncoding
   Procedure _createSetter(String name, Uri fileUri, int charOffset) => null;
 
   @override
-  Statement _createSetterBody(String name, VariableDeclaration parameter) =>
+  Statement _createSetterBody(
+          CoreTypes coreTypes, String name, VariableDeclaration parameter) =>
       null;
 }
 

pkg/front_end/lib/src/fasta/builder/function_builder.dart

@@ -483,7 +483,7 @@ abstract class FunctionBuilderImpl extends MemberBuilderImpl
   }
 
   @override
-  void buildOutlineExpressions(LibraryBuilder library) {
+  void buildOutlineExpressions(LibraryBuilder library, CoreTypes coreTypes) {
     MetadataBuilder.buildAnnotations(
         member, metadata, library, isClassMember ? parent : null, this);
 

pkg/front_end/lib/src/fasta/builder/member_builder.dart

@@ -7,6 +7,7 @@ library fasta.member_builder;
 import 'dart:core' hide MapEntry;
 
 import 'package:kernel/ast.dart';
+import 'package:kernel/core_types.dart';
 
 import '../../base/common.dart';
 
@@ -53,7 +54,7 @@ abstract class MemberBuilder implements ModifierBuilder, ClassMember {
   // TODO(johnniwinther): Remove this and create a [ProcedureBuilder] interface.
   ProcedureKind get kind;
 
-  void buildOutlineExpressions(LibraryBuilder library);
+  void buildOutlineExpressions(LibraryBuilder library, CoreTypes coreTypes);
 
   /// Returns the [ClassMember]s for the non-setter members created for this
   /// member builder.
@@ -133,7 +134,7 @@ abstract class MemberBuilderImpl extends ModifierBuilderImpl
   ProcedureKind get kind => unsupported("kind", charOffset, fileUri);
 
   @override
-  void buildOutlineExpressions(LibraryBuilder library) {}
+  void buildOutlineExpressions(LibraryBuilder library, CoreTypes coreTypes) {}
 
   void buildMembers(
       LibraryBuilder library, void Function(Member, BuiltMemberKind) f);

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

@@ -698,10 +698,10 @@ class BodyBuilder extends ScopeListener<JumpTarget>
                 libraryBuilder.library);
             initializer = wrapper.operand;
           }
-          fieldBuilder.buildBody(initializer);
+          fieldBuilder.buildBody(coreTypes, initializer);
         }
       } else if (!fieldBuilder.hasBodyBeenBuilt) {
-        fieldBuilder.buildBody(null);
+        fieldBuilder.buildBody(coreTypes, null);
       }
     }
     {

pkg/front_end/lib/src/fasta/kernel/inference_visitor.dart

@@ -5082,7 +5082,11 @@ class InferenceVisitor
           new FunctionNode(
               node.initializer == null
                   ? late_lowering.createGetterBodyWithoutInitializer(
-                      fileOffset, node.name, node.type, 'Local',
+                      inferrer.coreTypes,
+                      fileOffset,
+                      node.name,
+                      node.type,
+                      'Local',
                       createVariableRead: createVariableRead,
                       createIsSetRead: createIsSetRead)
                   : late_lowering.createGetterWithInitializer(
@@ -5108,8 +5112,13 @@ class InferenceVisitor
                 setVariable,
                 new FunctionNode(
                     node.isFinal
-                        ? late_lowering.createSetterBodyFinal(fileOffset,
-                            node.name, setterParameter, node.type, 'Local',
+                        ? late_lowering.createSetterBodyFinal(
+                            inferrer.coreTypes,
+                            fileOffset,
+                            node.name,
+                            setterParameter,
+                            node.type,
+                            'Local',
                             shouldReturnValue: true,
                             createVariableRead: createVariableRead,
                             createVariableWrite: createVariableWrite,

pkg/front_end/lib/src/fasta/kernel/kernel_target.dart

@@ -284,7 +284,7 @@ class KernelTarget extends TargetImplementation {
       loader.checkRedirectingFactories(myClasses);
       loader.addNoSuchMethodForwarders(myClasses);
       loader.checkMixins(myClasses);
-      loader.buildOutlineExpressions();
+      loader.buildOutlineExpressions(loader.coreTypes);
       installAllComponentProblems(loader.allComponentProblems);
       loader.allComponentProblems.clear();
       return component;