Fine. Put declared fields into manifest.

Because there is separate getField(name).

And we remove the constant initializer from the getter ID, so if
the code uses only the type of a constant, probably quite often for
the analyzer, we don't re-analyze when the initializer changes,
because we depend only on the getter (type).

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

Author: scheglov

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

@@ -2913,7 +2913,7 @@ class FieldElementImpl2 extends PropertyInducingElementImpl2
         FragmentedAnnotatableElementMixin<FieldFragmentImpl>,
         FragmentedElementMixin<FieldFragmentImpl>,
         _HasSinceSdkVersionMixin
-    implements FieldElement2OrMember {
+    implements FieldElement2OrMember, AnnotatableElementImpl {
   @override
   final FieldFragmentImpl firstFragment;
 

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

@@ -137,7 +137,7 @@ class LibraryManifestBuilder {
       typeParameters,
     ) {
       classItem.declaredMembers.clear();
-      _addInterfaceElementExecutables(
+      _addInterfaceElementMembers(
         encodingContext: encodingContext,
         instanceElement: element,
         interfaceItem: classItem,
@@ -205,34 +205,25 @@ class LibraryManifestBuilder {
     }
   }
 
-  void _addInstanceElementExecutables({
+  void _addInstanceElementField({
     required EncodeContext encodingContext,
-    required InstanceElementImpl2 instanceElement,
     required InstanceItem instanceItem,
+    required FieldElementImpl2 element,
   }) {
-    for (var method in instanceElement.methods2) {
-      _addInstanceElementMethod(
-        encodingContext: encodingContext,
-        instanceItem: instanceItem,
-        element: method,
-      );
+    var lookupName = element.lookupName?.asLookupName;
+    if (lookupName == null) {
+      return;
     }
 
-    for (var getter in instanceElement.getters2) {
-      _addInstanceElementGetter(
-        encodingContext: encodingContext,
-        instanceItem: instanceItem,
-        element: getter,
+    var item = _getOrBuildElementItem(element, () {
+      return InstanceItemFieldItem.fromElement(
+        id: ManifestItemId.generate(),
+        context: encodingContext,
+        element: element,
       );
-    }
+    });
 
-    for (var setter in instanceElement.setters2) {
-      _addInstanceElementSetter(
-        encodingContext: encodingContext,
-        instanceItem: instanceItem,
-        element: setter,
-      );
-    }
+    instanceItem.declaredFields[lookupName] = item;
   }
 
   void _addInstanceElementGetter({
@@ -257,6 +248,44 @@ class LibraryManifestBuilder {
     instanceItem.declaredMembers.addDeclaredGetter(baseName, item);
   }
 
+  void _addInstanceElementMembers({
+    required EncodeContext encodingContext,
+    required InstanceElementImpl2 instanceElement,
+    required InstanceItem instanceItem,
+  }) {
+    for (var field in instanceElement.fields2) {
+      _addInstanceElementField(
+        encodingContext: encodingContext,
+        instanceItem: instanceItem,
+        element: field,
+      );
+    }
+
+    for (var method in instanceElement.methods2) {
+      _addInstanceElementMethod(
+        encodingContext: encodingContext,
+        instanceItem: instanceItem,
+        element: method,
+      );
+    }
+
+    for (var getter in instanceElement.getters2) {
+      _addInstanceElementGetter(
+        encodingContext: encodingContext,
+        instanceItem: instanceItem,
+        element: getter,
+      );
+    }
+
+    for (var setter in instanceElement.setters2) {
+      _addInstanceElementSetter(
+        encodingContext: encodingContext,
+        instanceItem: instanceItem,
+        element: setter,
+      );
+    }
+  }
+
   void _addInstanceElementMethod({
     required EncodeContext encodingContext,
     required InstanceItem instanceItem,
@@ -327,7 +356,7 @@ class LibraryManifestBuilder {
     interfaceItem.declaredMembers.addDeclaredConstructor(baseName, item);
   }
 
-  void _addInterfaceElementExecutables({
+  void _addInterfaceElementMembers({
     required EncodeContext encodingContext,
     required InterfaceElementImpl2 instanceElement,
     required InterfaceItem interfaceItem,
@@ -347,7 +376,7 @@ class LibraryManifestBuilder {
       );
     }
 
-    _addInstanceElementExecutables(
+    _addInstanceElementMembers(
       encodingContext: encodingContext,
       instanceElement: instanceElement,
       instanceItem: interfaceItem,
@@ -373,7 +402,7 @@ class LibraryManifestBuilder {
       typeParameters,
     ) {
       mixinItem.declaredMembers.clear();
-      _addInterfaceElementExecutables(
+      _addInterfaceElementMembers(
         encodingContext: encodingContext,
         instanceElement: element,
         interfaceItem: mixinItem,
@@ -907,11 +936,45 @@ class _LibraryMatch {
     }
   }
 
+  bool _matchInstanceElementField({
+    required InstanceItem instanceItem,
+    required MatchContext instanceMatchContext,
+    required FieldElementImpl2 field,
+  }) {
+    var lookupName = field.lookupName?.asLookupName;
+    if (lookupName == null) {
+      return true;
+    }
+
+    var item = instanceItem.declaredFields[lookupName];
+    if (item == null) {
+      return false;
+    }
+
+    var matchContext = MatchContext(parent: instanceMatchContext);
+    if (!item.match(matchContext, field)) {
+      return false;
+    }
+
+    _addMatchingElementItem(field, item, matchContext);
+    return true;
+  }
+
   void _matchInstanceElementStaticExecutables({
     required MatchContext matchContext,
     required InstanceElementImpl2 element,
     required InstanceItem item,
   }) {
+    for (var field in element.fields2) {
+      if (!_matchInstanceElementField(
+        instanceItem: item,
+        instanceMatchContext: matchContext,
+        field: field,
+      )) {
+        structureMismatched.add(field);
+      }
+    }
+
     var executables = [
       ...element.getters2,
       ...element.methods2,