Fine. Avoid recording opaque API usages in a few places.

Change-Id: I14bf34c6c008d2aa05c78cd66400c69c7b1aae5f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/449480
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 = 554;
+  static const int DATA_VERSION = 555;
 
   /// 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

@@ -30,6 +30,7 @@ import 'package:analyzer/src/dart/ast/token.dart';
 import 'package:analyzer/src/dart/constant/compute.dart';
 import 'package:analyzer/src/dart/constant/evaluation.dart';
 import 'package:analyzer/src/dart/constant/value.dart';
+import 'package:analyzer/src/dart/element/class_hierarchy.dart';
 import 'package:analyzer/src/dart/element/display_string_builder.dart';
 import 'package:analyzer/src/dart/element/field_name_non_promotability_info.dart';
 import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
@@ -52,6 +53,7 @@ import 'package:analyzer/src/generated/utilities_collection.dart';
 import 'package:analyzer/src/generated/utilities_dart.dart';
 import 'package:analyzer/src/summary2/ast_binary_tokens.dart';
 import 'package:analyzer/src/summary2/export.dart';
+import 'package:analyzer/src/summary2/linked_element_factory.dart';
 import 'package:analyzer/src/summary2/reference.dart';
 import 'package:analyzer/src/util/file_paths.dart' as file_paths;
 import 'package:analyzer/src/utilities/extensions/collection.dart';
@@ -4895,7 +4897,7 @@ abstract class InterfaceElementImpl extends InstanceElementImpl
   @override
   @trackedIncludedInId
   List<InterfaceTypeImpl> get allSupertypes {
-    return _allSupertypes ??= library.session.classHierarchy
+    return _allSupertypes ??= library.internal.classHierarchy
         .implementedInterfaces(this);
   }
 
@@ -4970,7 +4972,7 @@ abstract class InterfaceElementImpl extends InstanceElementImpl
 
   @trackedIndirectly
   InheritanceManager3 get inheritanceManager {
-    return library.session.inheritanceManager;
+    return library.internal.inheritanceManager;
   }
 
   @override
@@ -5889,11 +5891,9 @@ class LibraryElementImpl extends ElementImpl
 
   MetadataImpl _metadata = MetadataImpl(const []);
 
-  @override
-  String? documentationComment;
+  String? _documentationComment;
 
-  @override
-  AnalysisSessionImpl session;
+  AnalysisSessionImpl _session;
 
   /// The first (defining) fragment of this library.
   @override
@@ -5928,15 +5928,9 @@ class LibraryElementImpl extends ElementImpl
   /// for this library.
   late final LoadLibraryFunctionProvider loadLibraryProvider;
 
-  // TODO(scheglov): replace with `LibraryName` or something.
-  @override
-  String name;
-
-  // TODO(scheglov): replace with `LibraryName` or something.
-  int nameOffset;
-
-  // TODO(scheglov): replace with `LibraryName` or something.
-  int nameLength;
+  String _name;
+  int _nameOffset;
+  int _nameLength;
 
   List<ClassElementImpl> _classes = [];
   List<EnumElementImpl> _enums = [];
@@ -5979,10 +5973,10 @@ class LibraryElementImpl extends ElementImpl
   /// the given [name] and [offset].
   LibraryElementImpl(
     this._context,
-    this.session,
-    this.name,
-    this.nameOffset,
-    this.nameLength,
+    this._session,
+    this._name,
+    this._nameOffset,
+    this._nameLength,
     this.featureSet,
   );
 
@@ -6036,6 +6030,17 @@ class LibraryElementImpl extends ElementImpl
     return _context.declaredVariables;
   }
 
+  @override
+  @trackedDirectlyOpaque
+  String? get documentationComment {
+    globalResultRequirements?.recordOpaqueApiUse(this, 'documentationComment');
+    return _documentationComment;
+  }
+
+  set documentationComment(String? value) {
+    _documentationComment = value;
+  }
+
   @override
   @trackedIncludedInId
   Null get enclosingElement => null;
@@ -6296,11 +6301,42 @@ class LibraryElementImpl extends ElementImpl
     _mixins = value;
   }
 
+  @override
+  @trackedDirectly
+  String get name {
+    globalResultRequirements?.record_library_getName(element: this);
+    return _name;
+  }
+
+  set name(String name) {
+    _name = name;
+  }
+
   @Deprecated('Use name instead')
   @override
   @trackedIndirectly
   String? get name3 => name;
 
+  @trackedDirectlyOpaque
+  int get nameLength {
+    globalResultRequirements?.recordOpaqueApiUse(this, 'nameLength');
+    return _nameLength;
+  }
+
+  set nameLength(int nameLength) {
+    _nameLength = nameLength;
+  }
+
+  @trackedDirectlyOpaque
+  int get nameOffset {
+    globalResultRequirements?.recordOpaqueApiUse(this, 'nameOffset');
+    return _nameOffset;
+  }
+
+  set nameOffset(int nameOffset) {
+    _nameOffset = nameOffset;
+  }
+
   @override
   @trackedIncludedInId
   LibraryElementImpl get nonSynthetic => this;
@@ -6315,6 +6351,17 @@ class LibraryElementImpl extends ElementImpl
     _publicNamespace = publicNamespace;
   }
 
+  @override
+  @trackedDirectlyOpaque
+  AnalysisSessionImpl get session {
+    globalResultRequirements?.recordOpaqueApiUse(this, 'session');
+    return _session;
+  }
+
+  set session(AnalysisSessionImpl value) {
+    _session = value;
+  }
+
   @override
   @trackedDirectlyExpensive
   List<SetterElementImpl> get setters {
@@ -6723,9 +6770,21 @@ class LibraryElementImplInternal {
 
   LibraryElementImplInternal(this._library);
 
+  ClassHierarchy get classHierarchy {
+    return _library._session.classHierarchy;
+  }
+
+  LinkedElementFactory get elementFactory {
+    return _library._session.elementFactory;
+  }
+
   LibraryFragmentImpl get firstFragment => _library._firstFragment;
 
   List<LibraryFragmentImpl> get fragments => _library._fragments;
+
+  InheritanceManager3 get inheritanceManager {
+    return _library._session.inheritanceManager;
+  }
 }
 
 class LibraryExportImpl extends ElementDirectiveImpl implements LibraryExport {

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

@@ -48,7 +48,7 @@ class DocumentationCommentScope with _GettersAndSetters implements Scope {
         // TODO(kallentu): Handle combinators.
         for (var exportedReference in importedLibrary.exportedReferences) {
           var reference = exportedReference.reference;
-          var element = importedLibrary.session.elementFactory
+          var element = importedLibrary.internal.elementFactory
               .elementOfReference3(reference);
           if (element is SetterElement) {
             _addSetter(element);
@@ -179,7 +179,7 @@ class ImportsTrackingOfPrefix {
 
     // SAFETY: the scope adds only imports with libraries.
     var importedLibrary = import.importedLibrary!;
-    var elementFactory = importedLibrary.session.elementFactory;
+    var elementFactory = importedLibrary.internal.elementFactory;
 
     for (var exportedReference in importedLibrary.exportedReferences) {
       var reference = exportedReference.reference;
@@ -246,7 +246,7 @@ class ImportsTrackingOfPrefix {
   void _buildElementToImportsMap() {
     for (var import in scope._importElements) {
       var importedLibrary = import.importedLibrary!;
-      var elementFactory = importedLibrary.session.elementFactory;
+      var elementFactory = importedLibrary.internal.elementFactory;
       var combinators = import.combinators.build();
       for (var exportedReference in importedLibrary.exportedReferences) {
         var reference = exportedReference.reference;

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

@@ -811,8 +811,9 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
     }
   }
 
-  InheritanceManager3 get _inheritanceManager =>
-      element.library.session.inheritanceManager;
+  InheritanceManager3 get _inheritanceManager {
+    return element.library.internal.inheritanceManager;
+  }
 
   @override
   bool operator ==(Object other) {

pkg/analyzer/lib/src/diagnostic/diagnostic_factory.dart

@@ -431,7 +431,8 @@ class DiagnosticFactory {
     // Elements enclosing members that can participate in overrides are always
     // named, so we can safely assume `_thisMember.enclosingElement3.name` and
     // `superMember.enclosingElement3.name` are non-`null`.
-    var superFragment = superMember.nonSynthetic.firstFragment;
+    var superElement = superMember.nonSynthetic.baseElement as ElementImpl;
+    var superLocation = superElement.firstFragmentLocation;
     return Diagnostic.tmp(
       source: source,
       offset: errorNode.offset,
@@ -452,18 +453,18 @@ class DiagnosticFactory {
         // concrete).
         if (code == CompileTimeErrorCode.invalidOverride)
           DiagnosticMessageImpl(
-            filePath: superFragment.libraryFragment!.source.fullName,
+            filePath: superLocation.libraryFragment!.source.fullName,
             message: "The member being overridden.",
-            offset: superFragment.nameOffset ?? -1,
-            length: superFragment.name!.length,
+            offset: superLocation.nameOffset ?? -1,
+            length: superLocation.name!.length,
             url: null,
           ),
         if (code == CompileTimeErrorCode.invalidOverrideSetter)
           DiagnosticMessageImpl(
-            filePath: superFragment.libraryFragment!.source.fullName,
+            filePath: superLocation.libraryFragment!.source.fullName,
             message: "The setter being overridden.",
-            offset: superFragment.nameOffset ?? -1,
-            length: superFragment.name!.length,
+            offset: superLocation.nameOffset ?? -1,
+            length: superLocation.name!.length,
             url: null,
           ),
       ],

pkg/analyzer/lib/src/error/must_call_super_verifier.dart

@@ -207,7 +207,7 @@ extension on InterfaceType? {
     var element = self.element;
 
     var library = element.library as LibraryElementImpl;
-    var inheritanceManager = library.session.inheritanceManager;
+    var inheritanceManager = library.internal.inheritanceManager;
 
     var concrete = inheritanceManager.getMember(
       element,

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

@@ -17,10 +17,13 @@ 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';
+import 'package:analyzer/src/utilities/extensions/string.dart';
 import 'package:collection/collection.dart';
 
 /// The manifest of a single library.
 class LibraryManifest {
+  String? name;
+
   /// The names that are re-exported by this library.
   /// This does not include names that are declared in this library.
   final Map<LookupName, ManifestItemId> reExportMap;
@@ -43,6 +46,7 @@ class LibraryManifest {
   ManifestItemIdList exportedExtensions;
 
   LibraryManifest({
+    required this.name,
     required this.reExportMap,
     required this.reExportDeprecatedOnly,
     required this.declaredClasses,
@@ -60,6 +64,7 @@ class LibraryManifest {
 
   factory LibraryManifest.read(SummaryDataReader reader) {
     return LibraryManifest(
+      name: reader.readOptionalStringUtf8(),
       reExportMap: reader.readLookupNameToIdMap(),
       reExportDeprecatedOnly: reader.readLookupNameSet(),
       declaredClasses: reader.readLookupNameMap(
@@ -137,6 +142,7 @@ class LibraryManifest {
   }
 
   void write(BufferedSink sink) {
+    sink.writeOptionalStringUtf8(name);
     reExportMap.write(sink);
     reExportDeprecatedOnly.write(sink);
     declaredClasses.write(sink);
@@ -845,6 +851,7 @@ class LibraryManifestBuilder {
       }
 
       var newManifest = LibraryManifest(
+        name: libraryElement.name.nullIfEmpty,
         reExportMap: {},
         reExportDeprecatedOnly: <LookupName>{},
         declaredClasses: newClassItems,
@@ -1062,6 +1069,7 @@ class LibraryManifestBuilder {
   LibraryManifest _getInputManifest(Uri uri) {
     return inputManifests[uri] ??
         LibraryManifest(
+          name: null,
           reExportMap: {},
           reExportDeprecatedOnly: <LookupName>{},
           declaredClasses: {},

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

@@ -306,6 +306,24 @@ class LibraryMissing extends RequirementFailure {
   }
 }
 
+class LibraryNameMismatch extends RequirementFailure {
+  final Uri libraryUri;
+  final String? expected;
+  final String? actual;
+
+  LibraryNameMismatch({
+    required this.libraryUri,
+    required this.expected,
+    required this.actual,
+  });
+
+  @override
+  String toString() {
+    return 'LibraryNameMismatch(libraryUri: $libraryUri, '
+        'expected: $expected, actual: $actual)';
+  }
+}
+
 final class OpaqueApiUseFailure extends RequirementFailure {
   final List<OpaqueApiUse> uses;