Elements. Store FieldElementImpl.type, not get it from the fragment.

I will pull shared portions of TopLevelVariableElementImpl and
FieldElementImpl into PropertyInducingElementImpl in a separate CL.

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

Author: scheglov

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

@@ -110,7 +110,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 = 491;
+  static const int DATA_VERSION = 492;
 
   /// 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/element.dart

@@ -2605,14 +2605,17 @@ class FieldElementImpl extends PropertyInducingElementImpl
     with
         FragmentedAnnotatableElementMixin<FieldFragmentImpl>,
         FragmentedElementMixin<FieldFragmentImpl>,
-        _HasSinceSdkVersionMixin
+        _HasSinceSdkVersionMixin,
+        DeferredResolutionReadingMixin
     implements FieldElement2OrMember {
   @override
   final Reference reference;
 
   @override
   final FieldFragmentImpl firstFragment;
 
+  TypeImpl? _type;
+
   FieldElementImpl({required this.reference, required this.firstFragment}) {
     reference.element = this;
     firstFragment.element = this;
@@ -2696,7 +2699,41 @@ class FieldElementImpl extends PropertyInducingElementImpl
   String? get name3 => firstFragment.name2;
 
   @override
-  TypeImpl get type => firstFragment.type;
+  TypeImpl get type {
+    _ensureReadResolution();
+    if (_type != null) return _type!;
+
+    // We must be linking, and the type has not been set yet.
+    var type = firstFragment.typeInference?.perform();
+    type ??= InvalidTypeImpl.instance;
+    _type = type;
+    firstFragment._type = type;
+    firstFragment.shouldUseTypeForInitializerInference = false;
+
+    // TODO(scheglov): We repeat this code.
+    var element = this;
+    if (element.getter2 case var getterElement?) {
+      getterElement.returnType = type;
+      getterElement.firstFragment.returnType = type;
+    }
+    if (element.setter2 case var setterElement?) {
+      if (setterElement.isSynthetic) {
+        setterElement.returnType = VoidTypeImpl.instance;
+        setterElement.firstFragment.returnType = VoidTypeImpl.instance;
+        (setterElement.formalParameters.single as FormalParameterElementImpl)
+            .type = type;
+        (setterElement.formalParameters.single as FormalParameterElementImpl)
+            .firstFragment
+            .type = type;
+      }
+    }
+
+    return _type!;
+  }
+
+  set type(TypeImpl value) {
+    _type = value;
+  }
 
   @override
   T? accept<T>(ElementVisitor2<T> visitor) {

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

@@ -1157,8 +1157,10 @@ class InheritanceManager3 {
 
       if (firstElement is GetterElement) {
         field.type = resultFragment.returnType;
+        fieldElement.type = resultFragment.returnType;
       } else {
         field.type = resultFragment.parameters[0].type;
+        fieldElement.type = resultFragment.parameters[0].type;
       }
 
       return resultElement;

pkg/analyzer/lib/src/summary2/bundle_reader.dart

@@ -695,10 +695,21 @@ class LibraryReader {
       var reference = _readReference();
       var fragments = _readFragmentsById<FieldFragmentImpl>();
       // TODO(scheglov): link fragments.
-      return FieldElementImpl(
+      var element = FieldElementImpl(
         reference: reference,
         firstFragment: fragments.first,
       );
+
+      element.deferReadResolution(
+        _createDeferredReadResolutionCallback((reader) {
+          var enclosingElement =
+              element.enclosingElement as InstanceElementImpl;
+          reader._addTypeParameters2(enclosingElement.typeParameters2);
+          element.type = reader.readRequiredType();
+        }),
+      );
+
+      return element;
     });
   }
 

pkg/analyzer/lib/src/summary2/bundle_writer.dart

@@ -413,6 +413,9 @@ class BundleWriter {
     _sink.writeList(elements, (element) {
       _writeReference(element.reference);
       _sink.writeList(element.fragments, _writeFragmentId);
+      _writeElementResolution(() {
+        _resolutionSink.writeType(element.type);
+      });
     });
   }
 

pkg/analyzer/lib/src/summary2/extension_type.dart

@@ -153,11 +153,14 @@ class _Node extends graph.Node<_Node> {
   void _evaluateWithType(TypeImpl type) {
     var typeSystem = element.library.typeSystem;
 
-    var representation = element.firstFragment.representation;
-    representation.type = type;
+    var representationFragment = element.firstFragment.representation;
+    var representationElement = representationFragment.element;
+
+    representationFragment.type = type;
+    representationElement.type = type;
     // TODO(scheglov): we repeat similar code in many places
-    representation.element.getter2!.returnType = type;
-    representation.element.getter2!.firstFragment.returnType = type;
+    representationElement.getter2!.returnType = type;
+    representationElement.getter2!.firstFragment.returnType = type;
 
     element.firstFragment.typeErasure = type.extensionTypeErasure;
     element.firstFragment.interfaces =

pkg/analyzer/lib/src/summary2/instance_member_inferrer.dart

@@ -180,8 +180,9 @@ class InstanceMemberInferrer {
         accessor.returnType = returnType;
         accessor.element.returnType = returnType;
         // TODO(scheglov): store type in FieldElementImpl itself
-        (accessor.element.variable3 as FieldElementImpl).firstFragment.type =
-            returnType;
+        var fieldElement = accessor.element.variable3 as FieldElementImpl;
+        fieldElement.type = returnType;
+        fieldElement.firstFragment.type = returnType;
         return;
       }
 
@@ -194,8 +195,9 @@ class InstanceMemberInferrer {
         accessor.returnType = returnType;
         accessor.element.returnType = returnType;
         // TODO(scheglov): store type in FieldElementImpl itself
-        (accessor.element.variable3 as FieldElementImpl).firstFragment.type =
-            returnType;
+        var fieldElement = accessor.element.variable3 as FieldElementImpl;
+        fieldElement.type = returnType;
+        fieldElement.firstFragment.type = returnType;
         return;
       }
 
@@ -222,7 +224,10 @@ class InstanceMemberInferrer {
       // to be the return type of the combined member signature of said getter
       // in the direct superinterfaces.
       if (overriddenGetters.isNotEmpty && overriddenSetters.isEmpty) {
-        parameter.type = combinedGetterType();
+        var valueType = combinedGetterType();
+        parameter.type = valueType;
+        var fieldElement = accessor.element.variable3 as FieldElementImpl;
+        fieldElement.type = valueType;
         return;
       }
 
@@ -235,7 +240,10 @@ class InstanceMemberInferrer {
       // setter and a getter is inferred to be the parameter type of the
       // combined member signature of said setter in the direct superinterfaces.
       if (overriddenSetters.isNotEmpty) {
-        parameter.type = combinedSetterType();
+        var valueType = combinedSetterType();
+        parameter.type = valueType;
+        var fieldElement = accessor.element.variable3 as FieldElementImpl;
+        fieldElement.type = valueType;
         return;
       }
 
@@ -385,7 +393,7 @@ class InstanceMemberInferrer {
         if (parameter is FieldFormalParameterFragmentImpl) {
           var field = parameter.field;
           if (field != null) {
-            parameter.type = field.type;
+            parameter.type = field.element.type;
           }
         } else if (parameter is SuperFormalParameterFragmentImpl) {
           var superParameter = parameter.element.superConstructorParameter2;
@@ -774,6 +782,7 @@ class InstanceMemberInferrer {
 
   static void _setFieldType(FieldFragmentImpl field, TypeImpl type) {
     field.type = type;
+    field.element.type = type;
     // TODO(scheglov): We repeat this code.
     field.element.getter2?.returnType = type;
     field.element.getter2?.firstFragment.returnType = type;

pkg/analyzer/lib/src/summary2/library_builder.dart

@@ -212,6 +212,7 @@ class LibraryBuilder {
       );
       enum_.valuesTypeNode.type = valuesType;
       enum_.valuesElement.type = valuesType;
+      enum_.valuesElement.element.type = valuesType;
       // TODO(scheglov): We repeat this code.
       enum_.valuesElement.element.getter2!.returnType = valuesType;
       enum_.valuesElement.element.getter2!.firstFragment.returnType =

pkg/analyzer/lib/src/summary2/types_builder.dart

@@ -229,15 +229,23 @@ class TypesBuilder {
       switch (element) {
         case GetterElementImpl():
           element.returnType = returnType;
+          (element.variable3 as FieldElementImpl).type = returnType;
           element.variable3!.firstFragment.type = returnType;
         case SetterElementImpl():
           element.returnType = returnType;
-          var fragmentValue =
+          var valueElement =
               element.formalParameters.singleOrNull
                   as FormalParameterElementImpl?;
           var valueNode = node.parameters?.parameters.firstOrNull;
           var valueNodeType = valueNode?.declaredFragment!.type;
-          fragmentValue?.type = valueNodeType ?? InvalidTypeImpl.instance;
+          var valueType = valueNodeType ?? InvalidTypeImpl.instance;
+          valueElement?.type = valueType;
+
+          var variableElement = element.variable3 as FieldElementImpl;
+          if (variableElement.isSynthetic && variableElement.getter2 == null) {
+            variableElement.type = valueType;
+            variableElement.firstFragment.type = valueType;
+          }
         case MethodElementImpl():
           element.returnType = returnType;
       }
@@ -257,6 +265,9 @@ class TypesBuilder {
           var variableFragment = variable.declaredFragment!;
           var variableElement = variableFragment.element;
           variableFragment.type = type;
+          if (variableElement is FieldElementImpl) {
+            variableElement.type = type;
+          }
           if (variableElement is TopLevelVariableElementImpl) {
             variableElement.type = type;
           }

pkg/analyzer/test/generated/elements_types_mixin.dart

@@ -271,10 +271,15 @@ mixin ElementsTypesMixin {
       name2: representationName,
       nameOffset: -1,
     );
-    FieldElementImpl(reference: Reference.root(), firstFragment: fieldFragment);
     fieldFragment.type = representationType;
     fragment.fields = [fieldFragment];
 
+    var fieldElement = FieldElementImpl(
+      reference: Reference.root(),
+      firstFragment: fieldFragment,
+    );
+    fieldElement.type = representationType;
+
     fragment.typeErasure = representationType;
 
     return ExtensionTypeElementImpl(Reference.root(), fragment);