Fine. Tracking for LibraryElementImpl.exportNamespace

Change-Id: I175f032c551e4993a1959e7ba0aa1a48c8e4345e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/449981
Reviewed-by: Johnni Winther <[email protected]>

Author: scheglov

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

@@ -42,7 +42,7 @@ import 'package:analyzer/src/dart/element/type_algebra.dart';
 import 'package:analyzer/src/dart/element/type_provider.dart';
 import 'package:analyzer/src/dart/element/type_system.dart';
 import 'package:analyzer/src/dart/resolver/scope.dart'
-    show Namespace, NamespaceBuilder;
+    show Namespace, NamespaceBuilder, RecordingExportNamespace;
 import 'package:analyzer/src/error/inference_error.dart';
 import 'package:analyzer/src/fine/annotations.dart';
 import 'package:analyzer/src/fine/library_manifest.dart';
@@ -6111,9 +6111,13 @@ class LibraryElementImpl extends ElementImpl
   }
 
   @override
+  @trackedDirectly
   Namespace get exportNamespace {
     _ensureReadResolution();
-    return _exportNamespace ??= Namespace({});
+    return RecordingExportNamespace(
+      owner: this,
+      base: _exportNamespace ??= Namespace({}),
+    );
   }
 
   set exportNamespace(Namespace exportNamespace) {

pkg/analyzer/lib/src/dart/resolver/scope.dart

@@ -7,6 +7,7 @@ import 'package:_fe_analyzer_shared/src/scanner/string_canonicalizer.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
 import 'package:analyzer/src/dart/element/element.dart';
+import 'package:analyzer/src/fine/requirements.dart';
 import 'package:analyzer/src/generated/engine.dart';
 
 /// The scope defined by a block.
@@ -325,3 +326,35 @@ class PrefixedNamespace implements Namespace {
     return null;
   }
 }
+
+class RecordingExportNamespace implements Namespace {
+  final LibraryElementImpl owner;
+  final Namespace base;
+
+  RecordingExportNamespace({required this.owner, required this.base});
+
+  @override
+  Map<String, Element> get definedNames2 {
+    globalResultRequirements?.record_library_allExportedTopLevels(
+      element: owner,
+    );
+    return base.definedNames2;
+  }
+
+  @override
+  Map<String, Element> get _definedNames => throw UnimplementedError();
+
+  @override
+  Element? get2(String name) {
+    globalResultRequirements?.record_library_exportScope_get(
+      element: owner,
+      name: name,
+    );
+    return base.get2(name);
+  }
+
+  @override
+  Element? getPrefixed2(String prefix, String name) {
+    return base.getPrefixed2(prefix, name);
+  }
+}

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

@@ -15,6 +15,7 @@ import 'package:analyzer/src/fine/manifest_id.dart';
 import 'package:analyzer/src/fine/manifest_item.dart';
 import 'package:analyzer/src/fine/requirement_failure.dart';
 import 'package:analyzer/src/summary2/linked_element_factory.dart';
+import 'package:analyzer/src/utilities/extensions/string.dart';
 import 'package:collection/collection.dart';
 import 'package:meta/meta.dart';
 
@@ -368,6 +369,84 @@ class LibraryExportRequirements {
     declaredTopNames.write(sink);
     sink.writeList(exports, (export) => export.write(sink));
   }
+
+  static LibraryExportRequirements? build(LibraryElementImpl libraryElement) {
+    var declaredTopNames = libraryElement.children
+        .map((element) => element.lookupName)
+        .nonNulls
+        .map((nameStr) => nameStr.asLookupName)
+        .toSet();
+
+    var fragments = <ExportRequirement>[];
+
+    for (var fragment in libraryElement.fragments) {
+      for (var export in fragment.libraryExports) {
+        var exportedLibrary = export.exportedLibrary;
+
+        // If no library, then there is nothing to re-export.
+        if (exportedLibrary == null) {
+          continue;
+        }
+
+        var combinators = export.combinators.map((combinator) {
+          switch (combinator) {
+            case HideElementCombinator():
+              return ExportRequirementHideCombinator(
+                hiddenBaseNames: combinator.hiddenNames.toBaseNameSet(),
+              );
+            case ShowElementCombinator():
+              return ExportRequirementShowCombinator(
+                shownBaseNames: combinator.shownNames.toBaseNameSet(),
+              );
+          }
+        }).toList();
+
+        // SAFETY: every library has the manifest.
+        var manifest = exportedLibrary.manifest!;
+
+        var exportMap = globalResultRequirements.untracked(
+          reason: 'Recoding requirements',
+          operation: () {
+            return NamespaceBuilder()
+                .createExportNamespaceForDirective2(export)
+                .definedNames2;
+          },
+        );
+
+        var exportedIds = <LookupName, ManifestItemId>{};
+        for (var entry in exportMap.entries) {
+          var lookupName = entry.key.asLookupName;
+          if (declaredTopNames.contains(lookupName)) {
+            continue;
+          }
+          // TODO(scheglov): must always be not null.
+          var id = manifest.getExportedId(lookupName);
+          if (id != null) {
+            exportedIds[lookupName] = id;
+          }
+        }
+
+        fragments.add(
+          ExportRequirement(
+            fragmentUri: fragment.source.uri,
+            exportedUri: exportedLibrary.uri,
+            combinators: combinators,
+            exportedIds: exportedIds,
+          ),
+        );
+      }
+    }
+
+    if (fragments.isNotEmpty) {
+      return LibraryExportRequirements(
+        libraryUri: libraryElement.uri,
+        declaredTopNames: declaredTopNames,
+        exports: fragments,
+      );
+    } else {
+      return null;
+    }
+  }
 }
 
 class LibraryRequirements {
@@ -670,8 +749,11 @@ class RequirementsManifest {
     required Set<Uri> libraryUriSet,
   }) {
     for (var libraryUri in libraryUriSet) {
-      var libraryElement = elementFactory.libraryOfUri2(libraryUri);
-      _addExports(libraryElement);
+      var element = elementFactory.libraryOfUri2(libraryUri);
+      var exports = LibraryExportRequirements.build(element);
+      if (exports != null) {
+        exportRequirements.add(exports);
+      }
     }
   }
 
@@ -1408,6 +1490,11 @@ class RequirementsManifest {
     required String id,
   }) {
     assert(!id.endsWith('='));
+
+    if (_recordingLockLevel != 0) {
+      return;
+    }
+
     var getterLookupName = id.asLookupName;
     var setterLookupName = '$id='.asLookupName;
 
@@ -1720,6 +1807,22 @@ class RequirementsManifest {
     );
   }
 
+  void record_library_allExportedTopLevels({
+    required LibraryElementImpl element,
+  }) {
+    if (_recordingLockLevel != 0) {
+      return;
+    }
+
+    var manifest = element.manifest;
+    if (manifest == null) {
+      return;
+    }
+
+    var requirements = _getLibraryRequirements(element);
+    requirements.exportedTopLevels.addAll(manifest.exportedIds);
+  }
+
   void record_library_allExtensions({required LibraryElementImpl element}) {
     if (_recordingLockLevel != 0) {
       return;
@@ -1882,6 +1985,16 @@ class RequirementsManifest {
     requirements.exportedLibraryUris = manifest.exportedLibraryUris;
   }
 
+  void record_library_exportScope_get({
+    required LibraryElementImpl element,
+    required String name,
+  }) {
+    record_importPrefixScope_lookup(
+      importedLibraries: [element],
+      id: name.removeSuffix('=') ?? name,
+    );
+  }
+
   void record_library_featureSet({required LibraryElementImpl element}) {
     if (_recordingLockLevel != 0) {
       return;
@@ -2207,78 +2320,6 @@ class RequirementsManifest {
     sink.writeList(opaqueApiUses, (usage) => usage.write(sink));
   }
 
-  void _addExports(LibraryElementImpl libraryElement) {
-    var declaredTopNames = libraryElement.children
-        .map((element) => element.lookupName)
-        .nonNulls
-        .map((nameStr) => nameStr.asLookupName)
-        .toSet();
-
-    var fragments = <ExportRequirement>[];
-
-    for (var fragment in libraryElement.fragments) {
-      for (var export in fragment.libraryExports) {
-        var exportedLibrary = export.exportedLibrary;
-
-        // If no library, then there is nothing to re-export.
-        if (exportedLibrary == null) {
-          continue;
-        }
-
-        var combinators = export.combinators.map((combinator) {
-          switch (combinator) {
-            case HideElementCombinator():
-              return ExportRequirementHideCombinator(
-                hiddenBaseNames: combinator.hiddenNames.toBaseNameSet(),
-              );
-            case ShowElementCombinator():
-              return ExportRequirementShowCombinator(
-                shownBaseNames: combinator.shownNames.toBaseNameSet(),
-              );
-          }
-        }).toList();
-
-        // SAFETY: every library has the manifest.
-        var manifest = exportedLibrary.manifest!;
-
-        var exportedIds = <LookupName, ManifestItemId>{};
-        var exportMap = NamespaceBuilder().createExportNamespaceForDirective2(
-          export,
-        );
-        for (var entry in exportMap.definedNames2.entries) {
-          var lookupName = entry.key.asLookupName;
-          if (declaredTopNames.contains(lookupName)) {
-            continue;
-          }
-          // TODO(scheglov): must always be not null.
-          var id = manifest.getExportedId(lookupName);
-          if (id != null) {
-            exportedIds[lookupName] = id;
-          }
-        }
-
-        fragments.add(
-          ExportRequirement(
-            fragmentUri: fragment.source.uri,
-            exportedUri: exportedLibrary.uri,
-            combinators: combinators,
-            exportedIds: exportedIds,
-          ),
-        );
-      }
-    }
-
-    if (fragments.isNotEmpty) {
-      exportRequirements.add(
-        LibraryExportRequirements(
-          libraryUri: libraryElement.uri,
-          declaredTopNames: declaredTopNames,
-          exports: fragments,
-        ),
-      );
-    }
-  }
-
   _InstanceItemWithRequirements? _getInstanceItem(InstanceElementImpl element) {
     var libraryElement = element.library;
     var manifest = libraryElement.manifest;