[cfe] Move indexedLibrary and exporter fields to CompilationUnits

Change-Id: I7c3d9ea07a908413f2300599c021f589bd668f7c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/374983
Commit-Queue: Johnni Winther <johnniwinther@google.com>
Reviewed-by: Johnni Winther <johnniwinther@google.com>
Reviewed-by: Jens Johansen <jensj@google.com>

Author: johnniwinther

pkg/front_end/lib/src/builder/library_builder.dart

@@ -6,6 +6,7 @@ library fasta.library_builder;
 
 import 'package:_fe_analyzer_shared/src/messages/severity.dart' show Severity;
 import 'package:kernel/ast.dart' show Class, Library, Version;
+import 'package:kernel/reference_from_index.dart';
 
 import '../api_prototype/experimental_flags.dart';
 import '../base/combinator.dart' show CombinatorBuilder;
@@ -79,6 +80,8 @@ sealed class CompilationUnit {
   void recordAccess(
       CompilationUnit accessor, int charOffset, int length, Uri fileUri);
 
+  List<Export> get exporters;
+
   void addExporter(LibraryBuilder exporter,
       List<CombinatorBuilder>? combinators, int charOffset);
 
@@ -159,8 +162,6 @@ abstract class SourceCompilationUnit implements CompilationUnit {
 
   List<ConstructorReferenceBuilder> get constructorReferences;
 
-  List<Export> get exporters;
-
   LanguageVersion get languageVersion;
 
   // TODO(johnniwinther): Remove this.
@@ -228,6 +229,9 @@ abstract class SourceCompilationUnit implements CompilationUnit {
 
   void markLanguageVersionFinal();
 
+  /// Index of the library we use references for.
+  IndexedLibrary? get indexedLibrary;
+
   void addSyntheticImport(
       {required String uri,
       required String? prefix,
@@ -396,9 +400,6 @@ abstract class LibraryBuilderImpl extends ModifierBuilderImpl
   @override
   final Scope exportScope;
 
-  @override
-  final List<Export> exporters = <Export>[];
-
   @override
   final Uri fileUri;
 

pkg/front_end/lib/src/dill/dill_library_builder.dart

@@ -57,13 +57,15 @@ class LazyLibraryScope extends LazyScope {
 class DillCompilationUnitImpl extends DillCompilationUnit {
   final DillLibraryBuilder _dillLibraryBuilder;
 
+  @override
+  final List<Export> exporters = <Export>[];
+
   DillCompilationUnitImpl(this._dillLibraryBuilder);
 
   @override
   void addExporter(LibraryBuilder exporter,
       List<CombinatorBuilder>? combinators, int charOffset) {
-    _dillLibraryBuilder.exporters
-        .add(new Export(exporter, this, combinators, charOffset));
+    exporters.add(new Export(exporter, this, combinators, charOffset));
   }
 
   @override
@@ -154,6 +156,9 @@ class DillLibraryBuilder extends LibraryBuilderImpl {
     lazyExportScope.libraryBuilder = this;
   }
 
+  @override
+  List<Export> get exporters => mainCompilationUnit.exporters;
+
   @override
   LibraryBuilder get origin => this;
 

pkg/front_end/lib/src/source/source_compilation_unit.dart

@@ -44,6 +44,9 @@ class SourceCompilationUnitImpl
 
   final List<Export> exports = <Export>[];
 
+  @override
+  final List<Export> exporters = <Export>[];
+
   /// List of [PrefixBuilder]s for imports with prefixes.
   List<PrefixBuilder>? _prefixBuilders;
 
@@ -68,11 +71,16 @@ class SourceCompilationUnitImpl
   bool postponedProblemsIssued = false;
   List<PostponedProblem>? postponedProblems;
 
+  /// Index of the library we use references for.
+  @override
+  final IndexedLibrary? indexedLibrary;
+
   SourceCompilationUnitImpl(
       this._sourceLibraryBuilder, this._libraryTypeParameterScopeBuilder,
       {required this.importUri,
       required this.fileUri,
-      required this.packageLanguageVersion})
+      required this.packageLanguageVersion,
+      required this.indexedLibrary})
       : currentTypeParameterScopeBuilder = _libraryTypeParameterScopeBuilder,
         _languageVersion = packageLanguageVersion;
 
@@ -134,16 +142,14 @@ class SourceCompilationUnitImpl
     return previous;
   }
 
-  IndexedLibrary? get indexedLibrary => _sourceLibraryBuilder.indexedLibrary;
-
   // TODO(johnniwinther): Use [_indexedContainer] for library members and make
   // it [null] when there is null corresponding [IndexedContainer].
   IndexedContainer? _indexedContainer;
 
   @override
   void beginIndexedContainer(String name,
       {required bool isExtensionTypeDeclaration}) {
-    if (_sourceLibraryBuilder.indexedLibrary != null) {
+    if (indexedLibrary != null) {
       if (isExtensionTypeDeclaration) {
         _indexedContainer =
             indexedLibrary!.lookupIndexedExtensionTypeDeclaration(name);
@@ -170,8 +176,7 @@ class SourceCompilationUnitImpl
   @override
   void addExporter(LibraryBuilder exporter,
       List<CombinatorBuilder>? combinators, int charOffset) {
-    _sourceLibraryBuilder.exporters
-        .add(new Export(exporter, this, combinators, charOffset));
+    exporters.add(new Export(exporter, this, combinators, charOffset));
   }
 
   @override
@@ -436,9 +441,6 @@ class SourceCompilationUnitImpl
   List<ConstructorReferenceBuilder> get constructorReferences =>
       _sourceLibraryBuilder.constructorReferences;
 
-  @override
-  List<Export> get exporters => _sourceLibraryBuilder.exporters;
-
   @override
   Library get library => _sourceLibraryBuilder.library;
 
@@ -2345,8 +2347,7 @@ class SourceCompilationUnitImpl
     }
     Reference? procedureReference;
     Reference? tearOffReference;
-    IndexedContainer? indexedContainer =
-        _indexedContainer ?? _sourceLibraryBuilder.indexedLibrary;
+    IndexedContainer? indexedContainer = _indexedContainer ?? indexedLibrary;
 
     bool isAugmentation = isAugmenting && (modifiers & augmentMask) != 0;
     if (indexedContainer != null && !isAugmentation) {
@@ -2490,11 +2491,10 @@ class SourceCompilationUnitImpl
         isInstanceMember: isInstanceMember,
         containerName: containerName,
         containerType: containerType,
-        libraryName: _sourceLibraryBuilder.indexedLibrary != null
-            ? new LibraryName(_sourceLibraryBuilder.indexedLibrary!.reference)
+        libraryName: indexedLibrary != null
+            ? new LibraryName(indexedLibrary!.reference)
             : libraryName);
-    IndexedContainer? indexedContainer =
-        _indexedContainer ?? _sourceLibraryBuilder.indexedLibrary;
+    IndexedContainer? indexedContainer = _indexedContainer ?? indexedLibrary;
     if (indexedContainer != null) {
       if ((isExtensionMember || isExtensionTypeMember) &&
           isInstanceMember &&

pkg/front_end/lib/src/source/source_library_builder.dart

@@ -200,8 +200,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
   final LibraryBuilder? _nameOrigin;
 
   /// Index of the library we use references for.
-  // TODO(johnniwinther): Move this to [SourceCompilationUnitImpl].
-  final IndexedLibrary? indexedLibrary;
+  IndexedLibrary? get indexedLibrary => compilationUnit.indexedLibrary;
 
   /// Exports that can't be serialized.
   ///
@@ -285,7 +284,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
       SourceLibraryBuilder? origin,
       this.library,
       this._nameOrigin,
-      this.indexedLibrary,
+      IndexedLibrary? indexedLibrary,
       {required this.isUnsupported,
       required bool isAugmentation,
       required bool isPatch,
@@ -317,7 +316,8 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
         this, libraryTypeParameterScopeBuilder,
         importUri: importUri,
         fileUri: fileUri,
-        packageLanguageVersion: packageLanguageVersion);
+        packageLanguageVersion: packageLanguageVersion,
+        indexedLibrary: indexedLibrary);
   }
 
   MergedLibraryScope get mergedScope {
@@ -427,6 +427,9 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
   @override
   bool get isPart => compilationUnit.isPart;
 
+  @override
+  List<Export> get exporters => compilationUnit.exporters;
+
   @override
   // Coverage-ignore(suite): Not run.
   Iterator<T> fullMemberIterator<T extends Builder>() =>