Fine. Tracking for 'LibraryElementImpl.exportedReferences' and 'isFromDeprecatedExport'.

Change-Id: I66c304832c2eb1a05402b2eb2630b7dca1a790c9
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/449382
Reviewed-by: Johnni Winther <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

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

@@ -106,7 +106,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 = 553;
+  static const int DATA_VERSION = 554;
 
   /// 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

@@ -5905,6 +5905,7 @@ class LibraryElementImpl extends ElementImpl
   @override
   late TypeSystemImpl typeSystem;
 
+  @trackedInternal
   late List<ExportedReference> exportedReferences;
 
   /// The union of names for all searchable elements in this library.
@@ -6603,6 +6604,7 @@ class LibraryElementImpl extends ElementImpl
   }
 
   /// Return `true` if [reference] comes only from deprecated exports.
+  @trackedInternal
   bool isFromDeprecatedExport(ExportedReference reference) {
     if (reference is ExportedReferenceExported) {
       for (var location in reference.locations) {

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

@@ -13,6 +13,7 @@ import 'package:analyzer/src/fine/lookup_name.dart';
 import 'package:analyzer/src/fine/manifest_context.dart';
 import 'package:analyzer/src/fine/manifest_id.dart';
 import 'package:analyzer/src/fine/manifest_item.dart';
+import 'package:analyzer/src/summary2/export.dart';
 import 'package:analyzer/src/summary2/linked_element_factory.dart';
 import 'package:analyzer/src/util/performance/operation_performance.dart';
 import 'package:analyzer/src/utilities/extensions/collection.dart';
@@ -24,6 +25,9 @@ class LibraryManifest {
   /// This does not include names that are declared in this library.
   final Map<LookupName, ManifestItemId> reExportMap;
 
+  /// The names that re-exported exclusively via deprecated exports.
+  final Set<LookupName> reExportDeprecatedOnly;
+
   final Map<LookupName, ClassItem> declaredClasses;
   final Map<LookupName, EnumItem> declaredEnums;
   final Map<LookupName, ExtensionItem> declaredExtensions;
@@ -40,6 +44,7 @@ class LibraryManifest {
 
   LibraryManifest({
     required this.reExportMap,
+    required this.reExportDeprecatedOnly,
     required this.declaredClasses,
     required this.declaredEnums,
     required this.declaredExtensions,
@@ -56,6 +61,7 @@ class LibraryManifest {
   factory LibraryManifest.read(SummaryDataReader reader) {
     return LibraryManifest(
       reExportMap: reader.readLookupNameToIdMap(),
+      reExportDeprecatedOnly: reader.readLookupNameSet(),
       declaredClasses: reader.readLookupNameMap(
         readValue: () => ClassItem.read(reader),
       ),
@@ -132,6 +138,7 @@ class LibraryManifest {
 
   void write(BufferedSink sink) {
     reExportMap.write(sink);
+    reExportDeprecatedOnly.write(sink);
     declaredClasses.write(sink);
     declaredEnums.write(sink);
     declaredExtensions.write(sink);
@@ -600,18 +607,22 @@ class LibraryManifestBuilder {
       var libraryUri = libraryElement.uri;
       var manifest = newManifests[libraryUri]!;
 
-      for (var entry in libraryElement.exportNamespace.definedNames2.entries) {
-        var name = entry.key.asLookupName;
-        var element = entry.value;
-
-        // Skip elements that exist in nowhere.
-        var elementLibrary = element.library as LibraryElementImpl?;
-        if (elementLibrary == null) {
+      for (var exported in libraryElement.exportedReferences) {
+        // We want only re-exports, skip declared.
+        if (exported is! ExportedReferenceExported) {
           continue;
         }
 
-        // Skip if the element is declared in this library.
-        if (identical(elementLibrary, libraryElement)) {
+        var reference = exported.reference;
+        var lookupName = reference.isSetter
+            ? '${reference.name}='.asLookupName
+            : reference.name.asLookupName;
+
+        var element = elementFactory.elementOfReference3(reference);
+
+        // Skip elements that exist in nowhere.
+        var elementLibrary = element.library;
+        if (elementLibrary == null) {
           continue;
         }
 
@@ -621,8 +632,12 @@ class LibraryManifestBuilder {
 
         // We use the manifest of the library that declares this element.
         // So, the element must be declared in the manifest.
-        var id = elementLibraryManifest.getDeclaredId(name)!;
-        manifest.reExportMap[name] = id;
+        var id = elementLibraryManifest.getDeclaredId(lookupName)!;
+        manifest.reExportMap[lookupName] = id;
+
+        if (libraryElement.isFromDeprecatedExport(exported)) {
+          manifest.reExportDeprecatedOnly.add(lookupName);
+        }
       }
     }
   }
@@ -831,6 +846,7 @@ class LibraryManifestBuilder {
 
       var newManifest = LibraryManifest(
         reExportMap: {},
+        reExportDeprecatedOnly: <LookupName>{},
         declaredClasses: newClassItems,
         declaredEnums: newEnumItems,
         declaredExtensions: newExtensionItems,
@@ -1047,6 +1063,7 @@ class LibraryManifestBuilder {
     return inputManifests[uri] ??
         LibraryManifest(
           reExportMap: {},
+          reExportDeprecatedOnly: <LookupName>{},
           declaredClasses: {},
           declaredEnums: {},
           declaredExtensions: {},

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

@@ -317,6 +317,26 @@ final class OpaqueApiUseFailure extends RequirementFailure {
   }
 }
 
+class ReExportDeprecatedOnlyMismatch extends RequirementFailure {
+  final Uri libraryUri;
+  final LookupName name;
+  final bool expected;
+  final bool actual;
+
+  ReExportDeprecatedOnlyMismatch({
+    required this.libraryUri,
+    required this.name,
+    required this.expected,
+    required this.actual,
+  });
+
+  @override
+  String toString() {
+    return 'ReExportDeprecatedOnlyMismatch(libraryUri: $libraryUri, '
+        'name: ${name.asString}, expected: $expected, actual: $actual)';
+  }
+}
+
 sealed class RequirementFailure {}
 
 class SuperImplementedMethodIdMismatch extends RequirementFailure {

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

@@ -374,6 +374,9 @@ class LibraryRequirements {
   /// TopName => ID
   final Map<LookupName, ManifestItemId?> exportedTopLevels;
 
+  /// Names that must be in [LibraryManifest.reExportDeprecatedOnly].
+  final Map<LookupName, bool> reExportDeprecatedOnly;
+
   /// TopName => InstanceItemRequirements
   final Map<LookupName, InstanceItemRequirements> instances;
 
@@ -420,6 +423,7 @@ class LibraryRequirements {
     required this.requestedDeclaredVariables,
     required this.requestedDeclaredGetters,
     required this.requestedDeclaredSetters,
+    required this.reExportDeprecatedOnly,
     required this.allDeclaredClasses,
     required this.allDeclaredEnums,
     required this.allDeclaredExtensions,
@@ -448,6 +452,7 @@ class LibraryRequirements {
       requestedDeclaredVariables: {},
       requestedDeclaredGetters: {},
       requestedDeclaredSetters: {},
+      reExportDeprecatedOnly: {},
       allDeclaredClasses: null,
       allDeclaredEnums: null,
       allDeclaredExtensions: null,
@@ -483,6 +488,10 @@ class LibraryRequirements {
       requestedDeclaredVariables: reader.readNameToOptionalIdMap(),
       requestedDeclaredGetters: reader.readNameToOptionalIdMap(),
       requestedDeclaredSetters: reader.readNameToOptionalIdMap(),
+      reExportDeprecatedOnly: reader.readMap(
+        readKey: () => LookupName.read(reader),
+        readValue: () => reader.readBool(),
+      ),
       allDeclaredClasses: ManifestItemIdList.readOptional(reader),
       allDeclaredEnums: ManifestItemIdList.readOptional(reader),
       allDeclaredExtensions: ManifestItemIdList.readOptional(reader),
@@ -524,6 +533,12 @@ class LibraryRequirements {
     sink.writeNameToIdMap(requestedDeclaredGetters);
     sink.writeNameToIdMap(requestedDeclaredSetters);
 
+    sink.writeMap(
+      reExportDeprecatedOnly,
+      writeKey: (name) => name.write(sink),
+      writeValue: (value) => sink.writeBool(value),
+    );
+
     allDeclaredClasses.writeOptional(sink);
     allDeclaredEnums.writeOptional(sink);
     allDeclaredExtensions.writeOptional(sink);
@@ -686,6 +701,20 @@ class RequirementsManifest {
         }
       }
 
+      for (var entry in libraryRequirements.reExportDeprecatedOnly.entries) {
+        var name = entry.key;
+        var expected = entry.value;
+        var actual = libraryManifest.reExportDeprecatedOnly.contains(name);
+        if (expected != actual) {
+          return ReExportDeprecatedOnlyMismatch(
+            libraryUri: libraryUri,
+            name: name,
+            expected: expected,
+            actual: actual,
+          );
+        }
+      }
+
       for (var entry in libraryRequirements.requestedDeclaredClasses.entries) {
         var name = entry.key;
         var expectedId = entry.value;
@@ -1284,12 +1313,27 @@ class RequirementsManifest {
     required List<LibraryElementImpl> importedLibraries,
     required String id,
   }) {
-    var lookupName = id.asLookupName;
+    assert(!id.endsWith('='));
+    var getterLookupName = id.asLookupName;
+    var setterLookupName = '$id='.asLookupName;
+
     for (var importedLibrary in importedLibraries) {
       if (importedLibrary.manifest case var manifest?) {
         var libraryRequirements = _getLibraryRequirements(importedLibrary);
-        var nameToId = libraryRequirements.exportedTopLevels;
-        nameToId[lookupName] = manifest.getExportedId(lookupName);
+
+        var getterId = manifest.getExportedId(getterLookupName);
+        libraryRequirements.exportedTopLevels[getterLookupName] = getterId;
+        if (getterId != null) {
+          libraryRequirements.reExportDeprecatedOnly[getterLookupName] =
+              manifest.reExportDeprecatedOnly.contains(getterLookupName);
+        }
+
+        var setterId = manifest.getExportedId(setterLookupName);
+        libraryRequirements.exportedTopLevels[setterLookupName] = setterId;
+        if (setterId != null) {
+          libraryRequirements.reExportDeprecatedOnly[setterLookupName] =
+              manifest.reExportDeprecatedOnly.contains(setterLookupName);
+        }
       }
     }
   }

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

@@ -303,15 +303,14 @@ class BundleWriter {
   void _writeExportedReferences(List<ExportedReference> elements) {
     _sink.writeList(elements, (exported) {
       var index = _references._indexOfReference(exported.reference);
-      if (exported is ExportedReferenceDeclared) {
-        _sink.writeByte(0);
-        _sink.writeUint30(index);
-      } else if (exported is ExportedReferenceExported) {
-        _sink.writeByte(1);
-        _sink.writeUint30(index);
-        _sink.writeList(exported.locations, _writeExportLocation);
-      } else {
-        throw UnimplementedError('(${exported.runtimeType}) $exported');
+      switch (exported) {
+        case ExportedReferenceDeclared():
+          _sink.writeByte(0);
+          _sink.writeUint30(index);
+        case ExportedReferenceExported():
+          _sink.writeByte(1);
+          _sink.writeUint30(index);
+          _sink.writeList(exported.locations, _writeExportLocation);
       }
     });
   }

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

@@ -27,7 +27,7 @@ class Export {
   }
 }
 
-class ExportedReference {
+sealed class ExportedReference {
   final Reference reference;
 
   ExportedReference({required this.reference});