Fine. Put 'implemented' and 'superImplemented' into library manifest and requirements.

Change-Id: I3248f6f69192c08bb6deec07b4e8736414805cb4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/448230
Reviewed-by: Johnni Winther <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -106,7 +106,7 @@ testFineAfterLibraryAnalyzerHook;
 // TODO(scheglov): Clean up the list of implicitly analyzed files.
 class AnalysisDriver {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 541;
+  static const int DATA_VERSION = 542;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.

pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart

@@ -207,30 +207,55 @@ class InheritanceManager3 {
     element as InterfaceElementImpl; // TODO(scheglov): remove cast
 
     var interface = _getInterface(element);
+
+    InternalExecutableElement? result;
     if (forSuper) {
       if (element is ExtensionTypeElementImpl) {
-        return null;
-      }
-      var superImplemented = interface.superImplemented;
-      if (forMixinIndex >= 0) {
-        return superImplemented[forMixinIndex][name];
-      }
-      if (superImplemented.isNotEmpty) {
-        return superImplemented.last[name];
+        result = null;
       } else {
-        assert(element.name == 'Object');
-        return null;
+        var superImplemented = interface.superImplemented;
+        if (forMixinIndex >= 0) {
+          result = superImplemented[forMixinIndex][name];
+        } else if (superImplemented.isNotEmpty) {
+          result = superImplemented.last[name];
+        } else {
+          assert(element.name == 'Object');
+          result = null;
+        }
       }
+    } else if (concrete) {
+      result = interface.implemented[name];
+    } else {
+      result = interface.map[name];
     }
-    if (concrete) {
-      return interface.implemented[name];
-    }
 
-    var result = interface.map[name];
+    // if (forSuper) {
+    //   if (element is ExtensionTypeElementImpl) {
+    //     return null;
+    //   }
+    //   var superImplemented = interface.superImplemented;
+    //   if (forMixinIndex >= 0) {
+    //     return superImplemented[forMixinIndex][name];
+    //   }
+    //   if (superImplemented.isNotEmpty) {
+    //     return superImplemented.last[name];
+    //   } else {
+    //     assert(element.name == 'Object');
+    //     return null;
+    //   }
+    // }
+    // if (concrete) {
+    //   return interface.implemented[name];
+    // }
+    // var result = interface.map[name];
+
     globalResultRequirements?.record_interface_getMember(
       element: element,
       nameObj: name,
       methodElement: result,
+      concrete: concrete,
+      forSuper: forSuper,
+      forMixinIndex: forMixinIndex,
     );
     return result;
   }

pkg/analyzer/lib/src/fine/library_manifest.dart

@@ -876,6 +876,7 @@ class LibraryManifestBuilder {
     item.interface.beforeUpdating();
 
     var interface = element.inheritanceManager.getInterface(element);
+
     for (var entry in interface.map.entries) {
       var executable = entry.value.baseElement;
 
@@ -915,6 +916,27 @@ class LibraryManifestBuilder {
       item.interface.map[lookupName] = id;
     }
 
+    for (var entry in interface.implemented.entries) {
+      var executable = entry.value.baseElement;
+      var lookupName = executable.lookupName?.asLookupName;
+      if (lookupName != null && !lookupName.isPrivate) {
+        var id = _getInterfaceElementMemberId(executable);
+        item.interface.implemented[lookupName] = id;
+      }
+    }
+
+    for (var superImplemented in interface.superImplemented) {
+      var layer = <LookupName, ManifestItemId>{};
+      for (var entry in superImplemented.entries) {
+        var executable = entry.value.baseElement;
+        var lookupName = executable.lookupName?.asLookupName;
+        if (lookupName != null && !lookupName.isPrivate) {
+          layer[lookupName] = _getInterfaceElementMemberId(executable);
+        }
+      }
+      item.interface.superImplemented.add(layer);
+    }
+
     item.interface.afterUpdate();
   }
 

pkg/analyzer/lib/src/fine/manifest_item.dart

@@ -986,10 +986,22 @@ sealed class InterfaceItem<E extends InterfaceElementImpl>
     required this.interface,
   });
 
+  ManifestItemId? getImplementedMethodId(LookupName name) {
+    return interface.implemented[name];
+  }
+
   ManifestItemId? getInterfaceMethodId(LookupName name) {
     return interface.map[name];
   }
 
+  ManifestItemId? getSuperImplementedMethodId(int index, LookupName name) {
+    if (index < interface.superImplemented.length) {
+      return interface.superImplemented[index][name];
+    } else {
+      return null;
+    }
+  }
+
   /// Intentionally omits [hasNonFinalField], which is tracked as a separate
   /// requirement.
   @override
@@ -1141,10 +1153,14 @@ class ManifestInterface {
 
   /// The map of names to their IDs in the interface.
   Map<LookupName, ManifestItemId> map;
+  Map<LookupName, ManifestItemId> implemented;
+  List<Map<LookupName, ManifestItemId>> superImplemented;
 
   /// We move [map] into here during building the manifest, so that we can
   /// compare after building, and decide if [id] should be updated.
   Map<LookupName, ManifestItemId> mapPrevious = {};
+  Map<LookupName, ManifestItemId> implementedPrevious = {};
+  List<Map<LookupName, ManifestItemId>> superImplementedPrevious = [];
 
   /// Key: IDs of method declarations.
   /// Value: ID assigned last time.
@@ -1158,13 +1174,17 @@ class ManifestInterface {
   ManifestInterface({
     required this.id,
     required this.map,
+    required this.implemented,
+    required this.superImplemented,
     required this.combinedIds,
   });
 
   factory ManifestInterface.empty() {
     return ManifestInterface(
       id: ManifestItemId.generate(),
       map: {},
+      implemented: {},
+      superImplemented: [],
       combinedIds: {},
     );
   }
@@ -1173,6 +1193,10 @@ class ManifestInterface {
     return ManifestInterface(
       id: ManifestItemId.read(reader),
       map: reader.readLookupNameToIdMap(),
+      implemented: reader.readLookupNameToIdMap(),
+      superImplemented: reader.readTypedList(() {
+        return reader.readLookupNameToIdMap();
+      }),
       combinedIds: reader.readMap(
         readKey: () => ManifestItemIdList.read(reader),
         readValue: () => ManifestItemId.read(reader),
@@ -1182,10 +1206,17 @@ class ManifestInterface {
 
   void afterUpdate() {
     const mapEquality = MapEquality<LookupName, ManifestItemId>();
-    if (!mapEquality.equals(map, mapPrevious)) {
+    const listEquality = ListEquality<Map<LookupName, ManifestItemId>>(
+      MapEquality<LookupName, ManifestItemId>(),
+    );
+    if (!mapEquality.equals(map, mapPrevious) ||
+        !mapEquality.equals(implemented, implementedPrevious) ||
+        !listEquality.equals(superImplemented, superImplementedPrevious)) {
       id = ManifestItemId.generate();
     }
     mapPrevious = {};
+    implementedPrevious = {};
+    superImplementedPrevious = [];
 
     combinedIdsTemp = {};
   }
@@ -1194,13 +1225,21 @@ class ManifestInterface {
     mapPrevious = map;
     map = {};
 
+    implementedPrevious = implemented;
+    implemented = {};
+
+    superImplementedPrevious = superImplemented;
+    superImplemented = [];
+
     combinedIdsTemp = combinedIds;
     combinedIds = {};
   }
 
   void write(BufferedSink sink) {
     id.write(sink);
     map.write(sink);
+    implemented.write(sink);
+    sink.writeList(superImplemented, (map) => map.write(sink));
     sink.writeMap(
       combinedIds,
       writeKey: (key) => key.write(sink),

pkg/analyzer/lib/src/fine/requirement_failure.dart

@@ -84,6 +84,30 @@ final class ExportLibraryMissing extends ExportFailure {
   }
 }
 
+class ImplementedMethodIdMismatch extends RequirementFailure {
+  final Uri libraryUri;
+  final LookupName interfaceName;
+  final LookupName methodName;
+  final ManifestItemId? expectedId;
+  final ManifestItemId? actualId;
+
+  ImplementedMethodIdMismatch({
+    required this.libraryUri,
+    required this.interfaceName,
+    required this.methodName,
+    required this.expectedId,
+    required this.actualId,
+  });
+
+  @override
+  String toString() {
+    return 'ImplementedMethodIdMismatch(libraryUri: $libraryUri, '
+        'interfaceName: ${interfaceName.asString}, '
+        'methodName: ${methodName.asString}, '
+        'expectedId: $expectedId, actualId: $actualId)';
+  }
+}
+
 class InstanceChildrenIdsMismatch extends RequirementFailure {
   final Uri libraryUri;
   final LookupName instanceName;
@@ -274,6 +298,33 @@ final class OpaqueApiUseFailure extends RequirementFailure {
 
 sealed class RequirementFailure {}
 
+class SuperImplementedMethodIdMismatch extends RequirementFailure {
+  final Uri libraryUri;
+  final LookupName interfaceName;
+  final int superIndex;
+  final LookupName methodName;
+  final ManifestItemId? expectedId;
+  final ManifestItemId? actualId;
+
+  SuperImplementedMethodIdMismatch({
+    required this.libraryUri,
+    required this.interfaceName,
+    required this.superIndex,
+    required this.methodName,
+    required this.expectedId,
+    required this.actualId,
+  });
+
+  @override
+  String toString() {
+    return 'SuperImplementedMethodIdMismatch(libraryUri: $libraryUri, '
+        'interfaceName: ${interfaceName.asString}, '
+        'superIndex: $superIndex, '
+        'methodName: ${methodName.asString}, '
+        'expectedId: $expectedId, actualId: $actualId)';
+  }
+}
+
 sealed class TopLevelFailure extends RequirementFailure {
   final Uri libraryUri;
   final LookupName name;