[cfe] Add isInternalImplementation to Extension(Type)MemberDescriptor

This adds a flag to the member descriptors that allow us to skip these when building the name space for extensions and extension types from dill.

The late lowering of fields in dart2js is fixed to support lookup from dill.

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

Author: johnniwinther

pkg/compiler/lib/src/kernel/transformations/modular/late_lowering.dart

@@ -4,6 +4,7 @@
 
 import 'package:kernel/ast.dart';
 import 'package:kernel/core_types.dart';
+import 'package:kernel/extension_table.dart';
 import 'package:kernel/type_algebra.dart';
 
 import '../../../options.dart';
@@ -73,6 +74,8 @@ class LateLowering {
 
   Member? _contextMember;
 
+  final ExtensionTable _extensionTable = ExtensionTable();
+
   LateLowering(this._coreTypes, CompilerOptions? _options)
     : _omitLateNames = _options?.omitLateNames ?? false,
       _readLocal = _Reader(_coreTypes.cellReadLocal),
@@ -363,6 +366,17 @@ class LateLowering {
       // We need to unbind the canonical name since we reuse the reference but
       // change the name.
       field.fieldReference.canonicalName?.unbind();
+      ExtensionMemberInfo? extensionMemberInfo;
+      if (field.isExtensionMember) {
+        extensionMemberInfo = _extensionTable.getExtensionMemberInfo(field);
+      }
+      ExtensionTypeMemberInfo? extensionTypeMemberInfo;
+      if (field.isExtensionTypeMember) {
+        extensionTypeMemberInfo = _extensionTable.getExtensionTypeMemberInfo(
+          field,
+        );
+      }
+
       Field fieldCell =
           Field.immutable(
               _mangleFieldCellName(field),
@@ -396,6 +410,8 @@ class LateLowering {
         isStatic: true,
         fileUri: fileUri,
         reference: field.getterReference,
+        isExtensionMember: field.isExtensionMember,
+        isExtensionTypeMember: field.isExtensionTypeMember,
       )..fileOffset = fileOffset;
 
       VariableDeclaration setterValue = VariableDeclaration(
@@ -426,17 +442,67 @@ class LateLowering {
         isStatic: true,
         fileUri: fileUri,
         reference: field.setterReference,
+        isExtensionMember: field.isExtensionMember,
+        isExtensionTypeMember: field.isExtensionTypeMember,
       )..fileOffset = fileOffset;
 
-      TreeNode parent = field.parent!;
-      if (parent is Class) {
-        parent.addProcedure(getter);
-        parent.addProcedure(setter);
-      } else if (parent is Library) {
-        parent.addProcedure(getter);
-        parent.addProcedure(setter);
+      if (extensionMemberInfo != null) {
+        extensionMemberInfo.descriptor.isInternalImplementation = true;
+        extensionMemberInfo.extension.memberDescriptors.add(
+          ExtensionMemberDescriptor(
+            name: extensionMemberInfo.descriptor.name,
+            kind: ExtensionMemberKind.Getter,
+            isStatic: extensionMemberInfo.descriptor.isStatic,
+            memberReference: getter.reference,
+            tearOffReference: null,
+          ),
+        );
+        extensionMemberInfo.extension.memberDescriptors.add(
+          ExtensionMemberDescriptor(
+            name: extensionMemberInfo.descriptor.name,
+            kind: ExtensionMemberKind.Setter,
+            isStatic: extensionMemberInfo.descriptor.isStatic,
+            memberReference: setter.reference,
+            tearOffReference: null,
+          ),
+        );
+        field.enclosingLibrary.addProcedure(getter);
+        field.enclosingLibrary.addProcedure(setter);
+      } else if (extensionTypeMemberInfo != null) {
+        extensionTypeMemberInfo.descriptor.isInternalImplementation = true;
+        extensionTypeMemberInfo.extensionTypeDeclaration.memberDescriptors.add(
+          ExtensionTypeMemberDescriptor(
+            name: extensionTypeMemberInfo.descriptor.name,
+            kind: ExtensionTypeMemberKind.Getter,
+            isStatic: extensionTypeMemberInfo.descriptor.isStatic,
+            memberReference: getter.reference,
+            tearOffReference: null,
+          ),
+        );
+        extensionTypeMemberInfo.extensionTypeDeclaration.memberDescriptors.add(
+          ExtensionTypeMemberDescriptor(
+            name: extensionTypeMemberInfo.descriptor.name,
+            kind: ExtensionTypeMemberKind.Setter,
+            isStatic: extensionTypeMemberInfo.descriptor.isStatic,
+            memberReference: setter.reference,
+            tearOffReference: null,
+          ),
+        );
+        field.enclosingLibrary.addProcedure(getter);
+        field.enclosingLibrary.addProcedure(setter);
+      } else {
+        switch (field.enclosingTypeDeclaration) {
+          case null:
+            field.enclosingLibrary.addProcedure(getter);
+            field.enclosingLibrary.addProcedure(setter);
+          case Class cls:
+            cls.addProcedure(getter);
+            cls.addProcedure(setter);
+          case ExtensionTypeDeclaration extensionTypeDeclaration:
+            extensionTypeDeclaration.addProcedure(getter);
+            extensionTypeDeclaration.addProcedure(setter);
+        }
       }
-
       return fieldCell;
     });
   }

pkg/front_end/lib/src/builder/library_builder.dart

@@ -571,7 +571,6 @@ abstract class LibraryBuilderImpl extends BuilderImpl
         exportNameSpace.addLocalMember(name, member, setter: isSetter);
         return true;
       } else if (existing != null) {
-        exportNameSpace.lookupLocalMember(name);
         Builder result = _computeAmbiguousDeclarationForExport(
             name, existing, member,
             uriOffset: uriOffset);

pkg/front_end/lib/src/dill/dill_extension_builder.dart

@@ -28,6 +28,8 @@ class DillExtensionBuilder extends ExtensionBuilderImpl
   DillExtensionBuilder(this.extension, this.libraryBuilder)
       : _nameSpace = new DeclarationNameSpaceImpl() {
     for (ExtensionMemberDescriptor descriptor in extension.memberDescriptors) {
+      if (descriptor.isInternalImplementation) continue;
+
       Name name = descriptor.name;
       switch (descriptor.kind) {
         case ExtensionMemberKind.Method:

pkg/front_end/lib/src/dill/dill_extension_type_declaration_builder.dart

@@ -65,6 +65,8 @@ class DillExtensionTypeDeclarationBuilder
     }
     for (ExtensionTypeMemberDescriptor descriptor
         in _extensionTypeDeclaration.memberDescriptors) {
+      if (descriptor.isInternalImplementation) continue;
+
       Name name = descriptor.name;
       switch (descriptor.kind) {
         case ExtensionTypeMemberKind.Method:

pkg/front_end/lib/src/dill/dill_library_builder.dart

@@ -183,7 +183,6 @@ class DillLibraryBuilder extends LibraryBuilderImpl {
       }
     }
     nonTearOffs.forEach(_addMember);
-    library.procedures.forEach(_addMember);
     for (Typedef typedef in library.typedefs) {
       addTypedef(typedef, tearOffs[typedef.name]);
     }

pkg/front_end/lib/src/dill/dill_member_builder.dart

@@ -59,6 +59,15 @@ abstract class DillMemberBuilder extends MemberBuilderImpl {
     final Member member = this.member;
     return member is Constructor && member.isSynthetic;
   }
+
+  @override
+  String toString() {
+    String fullName = member.name.text;
+    if (member.enclosingTypeDeclaration != null) {
+      fullName = '${member.enclosingTypeDeclaration?.name}.$fullName';
+    }
+    return '${runtimeType}($fullName)';
+  }
 }
 
 class DillFieldBuilder extends DillMemberBuilder

pkg/front_end/lib/src/fragment/field/encoding.dart

@@ -613,12 +613,7 @@ abstract class AbstractLateFieldEncoding implements FieldEncoding {
 
   @override
   void registerMembers(BuildNodesCallback f) {
-    f(
-        member: _field!,
-        kind: _fragment.builder.isExtensionMember ||
-                _fragment.builder.isExtensionTypeMember
-            ? BuiltMemberKind.ExtensionField
-            : BuiltMemberKind.Field);
+    f(member: _field!, kind: BuiltMemberKind.LateBackingField);
     if (_lateIsSetField != null) {
       _forceIncludeIsSetField = true;
       f(member: _lateIsSetField!, kind: BuiltMemberKind.LateIsSetField);

pkg/front_end/lib/src/source/source_extension_builder.dart

@@ -209,6 +209,7 @@ class SourceExtensionBuilder extends ExtensionBuilderImpl
       Reference? tearOffReference) {
     String name = memberBuilder.name;
     ExtensionMemberKind kind;
+    bool isInternalImplementation = false;
     switch (memberKind) {
       case BuiltMemberKind.Constructor:
       case BuiltMemberKind.RedirectingFactory:
@@ -230,7 +231,11 @@ class SourceExtensionBuilder extends ExtensionBuilderImpl
             memberBuilder.fileOffset,
             memberBuilder.fileUri);
       case BuiltMemberKind.ExtensionField:
+        kind = ExtensionMemberKind.Field;
+        break;
+      case BuiltMemberKind.LateBackingField:
       case BuiltMemberKind.LateIsSetField:
+        isInternalImplementation = true;
         kind = ExtensionMemberKind.Field;
         break;
       case BuiltMemberKind.ExtensionMethod:
@@ -253,6 +258,7 @@ class SourceExtensionBuilder extends ExtensionBuilderImpl
         memberReference: memberReference,
         tearOffReference: tearOffReference,
         isStatic: memberBuilder.isStatic,
+        isInternalImplementation: isInternalImplementation,
         kind: kind));
   }
 }

pkg/front_end/lib/src/source/source_extension_type_declaration_builder.dart

@@ -748,6 +748,7 @@ class SourceExtensionTypeDeclarationBuilder
       case BuiltMemberKind.ExtensionSetter:
       case BuiltMemberKind.ExtensionOperator:
       case BuiltMemberKind.ExtensionField:
+      case BuiltMemberKind.LateBackingField:
       case BuiltMemberKind.LateIsSetField:
       case BuiltMemberKind.ExtensionTypeConstructor:
       case BuiltMemberKind.ExtensionTypeFactory:
@@ -778,6 +779,7 @@ class SourceExtensionTypeDeclarationBuilder
       Reference? tearOffReference) {
     String name = memberBuilder.name;
     ExtensionTypeMemberKind kind;
+    bool isInternalImplementation = false;
     switch (memberKind) {
       case BuiltMemberKind.Constructor:
       case BuiltMemberKind.RedirectingFactory:
@@ -793,7 +795,11 @@ class SourceExtensionTypeDeclarationBuilder
         unhandled("$memberBuilder(${memberBuilder.runtimeType}):${memberKind}",
             "buildMembers", memberBuilder.fileOffset, memberBuilder.fileUri);
       case BuiltMemberKind.ExtensionField:
+        kind = ExtensionTypeMemberKind.Field;
+        break;
+      case BuiltMemberKind.LateBackingField:
       case BuiltMemberKind.LateIsSetField:
+        isInternalImplementation = true;
         kind = ExtensionTypeMemberKind.Field;
         break;
       case BuiltMemberKind.ExtensionTypeConstructor:
@@ -826,6 +832,7 @@ class SourceExtensionTypeDeclarationBuilder
             memberReference: memberReference,
             tearOffReference: tearOffReference,
             isStatic: memberBuilder.isStatic,
+            isInternalImplementation: isInternalImplementation,
             kind: kind));
   }
 

pkg/front_end/lib/src/source/source_member_builder.dart

@@ -145,6 +145,7 @@ enum BuiltMemberKind {
   ExtensionTypeFactory,
   ExtensionTypeRedirectingFactory,
   ExtensionTypeRepresentationField,
+  LateBackingField,
   LateIsSetField,
   LateGetter,
   LateSetter,