Fine. Access specifically constructor ID for dependencies.

Change-Id: Ida8aa508af02a12441a134098f4d147758cc4730
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/424707
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Paul Berry <[email protected]>

Author: scheglov

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

@@ -305,6 +305,9 @@ extension LinkedElementFactoryExtension on LinkedElementFactory {
     // TODO(scheglov): When implementation is complete, cast unconditionally.
     if (topLevelItem is InstanceItem) {
       var memberName = memberElement.lookupName!.asLookupName;
+      if (element is ConstructorElement) {
+        return topLevelItem.getConstructorId(memberName);
+      }
       var memberId = topLevelItem.getMemberId(memberName);
       // TODO(scheglov): When implementation is complete, null assert.
       return memberId;

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

@@ -78,6 +78,15 @@ sealed class InstanceItem<E extends InstanceElementImpl2>
     required this.members,
   });
 
+  ManifestItemId? getConstructorId(LookupName name) {
+    var baseNameMembers = members[name.asBaseName];
+    if (baseNameMembers == null) {
+      return null;
+    }
+
+    return baseNameMembers.constructorId;
+  }
+
   ManifestItemId? getMemberId(LookupName name) {
     var baseNameMembers = members[name.asBaseName];
     if (baseNameMembers == null) {
@@ -92,8 +101,7 @@ sealed class InstanceItem<E extends InstanceElementImpl2>
       return baseNameMembers.indexEqId;
     }
 
-    // TODO(scheglov): separate constructors
-    return baseNameMembers.getterOrMethodId ?? baseNameMembers.constructorId;
+    return baseNameMembers.getterOrMethodId;
   }
 
   @override

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

@@ -318,7 +318,7 @@ class RequirementsManifest {
         var constructors = interfaceEntry.value.constructors;
         for (var constructorEntry in constructors.entries) {
           var constructorName = constructorEntry.key;
-          var constructorId = interfaceItem.getMemberId(constructorName);
+          var constructorId = interfaceItem.getConstructorId(constructorName);
           var expectedId = constructorEntry.value;
           if (expectedId != constructorId) {
             return InterfaceConstructorIdMismatch(
@@ -372,7 +372,7 @@ class RequirementsManifest {
 
     var (interfaceItem, interface) = interfacePair;
     var constructorName = name.asLookupName;
-    var constructorId = interfaceItem.getMemberId(constructorName);
+    var constructorId = interfaceItem.getConstructorId(constructorName);
     interface.constructors[constructorName] = constructorId;
   }