Elements. Clean up deferred applying members offsets.

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

Author: scheglov

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

@@ -1087,6 +1087,12 @@ class ConstructorFragmentImpl extends ExecutableFragmentImpl
 /// element is the simplest way to do this.
 mixin DeferredMembersReadingMixin {
   void Function()? _readMembersCallback;
+  void Function()? _applyMembersOffsets;
+
+  void deferApplyMembersOffsets(void Function() callback) {
+    assert(_applyMembersOffsets == null);
+    _applyMembersOffsets = callback;
+  }
 
   void deferReadMembers(void Function()? callback) {
     assert(_readMembersCallback == null);
@@ -1098,6 +1104,11 @@ mixin DeferredMembersReadingMixin {
       _readMembersCallback = null;
       callback();
     }
+
+    if (_applyMembersOffsets case var callback?) {
+      _applyMembersOffsets = null;
+      callback();
+    }
   }
 }
 
@@ -4596,8 +4607,6 @@ abstract class InstanceFragmentImpl extends _ExistingFragmentImpl
         DeferredResolutionReadingMixin,
         TypeParameterizedFragmentMixin
     implements InstanceFragment {
-  void Function()? applyMembersConstantOffsets;
-
   @override
   final String? name;
 

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

@@ -317,12 +317,6 @@ class LibraryReader {
                 if (!fragment.isMixinApplication) {
                   fragment.constructors = _readConstructorFragments();
                 }
-
-                // TODO(scheglov): this is ugly
-                if (fragment.applyMembersConstantOffsets case var callback?) {
-                  fragment.applyMembersConstantOffsets = null;
-                  callback();
-                }
               });
             });
           });

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

@@ -26,15 +26,12 @@ Uint8List writeUnitInformative(CompilationUnit unit) {
 }
 
 class InformativeDataApplier {
+  bool _shouldDeferApplyMembersOffsets = true;
+
   void applyFromNode(LibraryFragmentImpl fragment, CompilationUnit node) {
+    _shouldDeferApplyMembersOffsets = false;
     var unitInfo = _InfoBuilder().build(node);
     _applyFromInfo(fragment, unitInfo);
-
-    // TODO(scheglov): generalize
-    for (var classFragment in fragment.classes) {
-      classFragment.applyMembersConstantOffsets?.call();
-      classFragment.applyMembersConstantOffsets = null;
-    }
   }
 
   void applyToLibrary(
@@ -200,15 +197,15 @@ class InformativeDataApplier {
       applier.applyToTypeParameters(element.typeParameters);
     });
 
-    element.applyMembersConstantOffsets = () {
+    _scheduleApplyMembersOffsets(element, () {
       element.withoutLoadingResolution(() {
         _applyToConstructors(element.constructors, info.constructors);
         _applyToFields(element.fields, info.fields);
         _applyToAccessors(element.getters, info.getters);
         _applyToAccessors(element.setters, info.setters);
         _applyToMethods(element.methods, info.methods);
       });
-    };
+    });
   }
 
   void _applyToClassTypeAlias(
@@ -612,6 +609,18 @@ class InformativeDataApplier {
     }
   }
 
+  /// Either defer, or eagerly invoke [callback].
+  void _scheduleApplyMembersOffsets(
+    InstanceFragmentImpl fragment,
+    void Function() callback,
+  ) {
+    if (_shouldDeferApplyMembersOffsets) {
+      fragment.deferApplyMembersOffsets(callback);
+    } else {
+      callback();
+    }
+  }
+
   void _setupApplyConstantOffsetsForTypeAlias(
     TypeAliasFragmentImpl element,
     Uint32List constantOffsets, {