[kernel] Make Member.name non-nullable

Change-Id: Id2befd868e93985d6af463c2ccd410cd56b68187
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/194721
Reviewed-by: Jens Johansen <jensj@google.com>
Commit-Queue: Johnni Winther <johnniwinther@google.com>

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

@@ -142,6 +142,7 @@ class ConstructorBuilderImpl extends FunctionBuilderImpl
       Member referenceFrom,
       [String nativeMethodName])
       : _constructor = new Constructor(null,
+            name: new Name(name, compilationUnit.library),
             fileUri: compilationUnit.fileUri,
             reference: referenceFrom?.reference)
           ..startFileOffset = startCharOffset
@@ -196,17 +197,20 @@ class ConstructorBuilderImpl extends FunctionBuilderImpl
     f(member, BuiltMemberKind.Constructor);
   }
 
+  bool _hasBeenBuilt = false;
+
   @override
   Constructor build(SourceLibraryBuilder libraryBuilder) {
-    if (_constructor.name == null) {
+    if (!_hasBeenBuilt) {
       _constructor.function = buildFunction(libraryBuilder);
       _constructor.function.parent = _constructor;
       _constructor.function.fileOffset = charOpenParenOffset;
       _constructor.function.fileEndOffset = _constructor.fileEndOffset;
       _constructor.function.typeParameters = const <TypeParameter>[];
       _constructor.isConst = isConst;
       _constructor.isExternal = isExternal;
-      _constructor.name = new Name(name, libraryBuilder.library);
+      updatePrivateMemberName(_constructor, libraryBuilder);
+      _hasBeenBuilt = true;
     }
     if (formals != null) {
       bool needsInference = false;

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

@@ -172,6 +172,33 @@ class EnumBuilder extends SourceClassBuilder {
     ///   static const List<E> values = const <E>[id0, ..., idn-1];
     ///   String toString() => _name;
     /// }
+
+    FieldNameScheme instanceFieldNameScheme = new FieldNameScheme(
+        isInstanceMember: true,
+        className: name,
+        isExtensionMember: false,
+        extensionName: null,
+        libraryReference: referencesFrom != null
+            ? referencesFromIndexed.library.reference
+            : parent.library.reference);
+
+    FieldNameScheme staticFieldNameScheme = new FieldNameScheme(
+        isInstanceMember: false,
+        className: name,
+        isExtensionMember: false,
+        extensionName: null,
+        libraryReference: referencesFrom != null
+            ? referencesFromIndexed.library.reference
+            : parent.library.reference);
+
+    ProcedureNameScheme procedureNameScheme = new ProcedureNameScheme(
+        isStatic: false,
+        isExtensionMember: false,
+        extensionName: null,
+        libraryReference: referencesFrom != null
+            ? referencesFromIndexed.library.reference
+            : parent.library.reference);
+
     Constructor constructorReference;
     Reference toStringReference;
     Reference indexGetterReference;
@@ -210,6 +237,8 @@ class EnumBuilder extends SourceClassBuilder {
         parent,
         charOffset,
         charOffset,
+        instanceFieldNameScheme,
+        isInstanceMember: true,
         fieldGetterReference: indexGetterReference,
         fieldSetterReference: indexSetterReference);
     members["_name"] = new SourceFieldBuilder(
@@ -221,6 +250,8 @@ class EnumBuilder extends SourceClassBuilder {
         parent,
         charOffset,
         charOffset,
+        instanceFieldNameScheme,
+        isInstanceMember: true,
         fieldGetterReference: _nameGetterReference,
         fieldSetterReference: _nameSetterReference);
     ConstructorBuilder constructorBuilder = new ConstructorBuilderImpl(
@@ -251,6 +282,8 @@ class EnumBuilder extends SourceClassBuilder {
         parent,
         charOffset,
         charOffset,
+        staticFieldNameScheme,
+        isInstanceMember: false,
         fieldGetterReference: valuesGetterReference,
         fieldSetterReference: valuesSetterReference);
     members["values"] = valuesBuilder;
@@ -263,18 +296,20 @@ class EnumBuilder extends SourceClassBuilder {
         0,
         stringType,
         "toString",
-        null,
-        null,
+        /* typeVariables = */ null,
+        /* formals = */ null,
         ProcedureKind.Method,
         parent,
         charOffset,
         charOffset,
         charOffset,
         charEndOffset,
         toStringReference,
-        null,
+        /* tearOffReference = */ null,
         AsyncMarker.Sync,
-        /* isExtensionInstanceMember = */ false);
+        procedureNameScheme,
+        isExtensionMember: false,
+        isInstanceMember: true);
     members["toString"] = toStringBuilder;
     String className = name;
     if (enumConstantInfos != null) {
@@ -329,6 +364,8 @@ class EnumBuilder extends SourceClassBuilder {
             parent,
             enumConstantInfo.charOffset,
             enumConstantInfo.charOffset,
+            staticFieldNameScheme,
+            isInstanceMember: false,
             fieldGetterReference: getterReference,
             fieldSetterReference: setterReference);
         members[name] = fieldBuilder..next = existing;