Linking libraries is not async anymore.

Change-Id: Id009fe12ae6283c4faa2500a86ed589d9729bb60
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/407300
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

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

@@ -1332,20 +1332,17 @@ class AnalysisDriver {
           return;
         }
 
-        await performance.runAsync(
-          'libraryContext',
-          (performance) async {
-            await libraryContext.load(
-              targetLibrary: library,
-              performance: performance,
-            );
-          },
-        );
+        performance.run('libraryContext', (performance) {
+          libraryContext.load(
+            targetLibrary: library,
+            performance: performance,
+          );
+        });
 
         for (var import in library.docLibraryImports) {
           if (import is LibraryImportWithFile) {
             if (import.importedLibrary case var libraryFileKind?) {
-              await libraryContext.load(
+              libraryContext.load(
                 targetLibrary: libraryFileKind,
                 performance: OperationPerformanceImpl('<root>'),
               );
@@ -1776,15 +1773,12 @@ class AnalysisDriver {
         var kind = file.kind;
         var library = kind.library ?? kind.asLibrary;
 
-        await performance.runAsync(
-          'libraryContext',
-          (performance) async {
-            await libraryContext.load(
-              targetLibrary: library,
-              performance: performance,
-            );
-          },
-        );
+        performance.run('libraryContext', (performance) {
+          libraryContext.load(
+            targetLibrary: library,
+            performance: performance,
+          );
+        });
 
         var element = libraryContext.computeUnitElement(library, file);
         var result = UnitElementResultImpl(
@@ -1877,7 +1871,7 @@ class AnalysisDriver {
     var library = kind.library ?? kind.asLibrary;
 
     // Errors are based on elements, so load them.
-    await libraryContext.load(
+    libraryContext.load(
       targetLibrary: library,
       performance: OperationPerformanceImpl('<root>'),
     );
@@ -2012,15 +2006,12 @@ class AnalysisDriver {
       var kind = file.kind;
       var library = kind.library ?? kind.asLibrary;
 
-      await performance.runAsync(
-        'libraryContext',
-        (performance) async {
-          await libraryContext.load(
-            targetLibrary: library,
-            performance: performance,
-          );
-        },
-      );
+      performance.run('libraryContext', (performance) {
+        libraryContext.load(
+          targetLibrary: library,
+          performance: performance,
+        );
+      });
       var unitElement = libraryContext.computeUnitElement(library, file);
       var analysisOptions = libraryContext.analysisContext
           .getAnalysisOptionsForFile(file.resource);

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

@@ -118,10 +118,10 @@ class LibraryContext {
   }
 
   /// Load data required to access elements of the given [targetLibrary].
-  Future<void> load({
+  void load({
     required LibraryFileKind targetLibrary,
     required OperationPerformanceImpl performance,
-  }) async {
+  }) {
     addToLogRing('[load][targetLibrary: ${targetLibrary.file}]');
     var librariesTotal = 0;
     var librariesLoaded = 0;
@@ -130,7 +130,7 @@ class LibraryContext {
     var bytesGet = 0;
     var bytesPut = 0;
 
-    Future<void> loadBundle(LibraryCycle cycle) async {
+    void loadBundle(LibraryCycle cycle) {
       if (!loadedBundles.add(cycle)) return;
 
       performance.getDataInt('cycleCount').increment();
@@ -139,7 +139,7 @@ class LibraryContext {
       librariesTotal += cycle.libraries.length;
 
       for (var directDependency in cycle.directDependencies) {
-        await loadBundle(directDependency);
+        loadBundle(directDependency);
       }
 
       var unitsInformativeBytes = <Uri, Uint8List>{};
@@ -160,16 +160,13 @@ class LibraryContext {
 
         LinkResult linkResult;
         try {
-          linkResult = await performance.runAsync(
-            'link',
-            (performance) async {
-              return await link(
-                elementFactory: elementFactory,
-                performance: performance,
-                inputLibraries: cycle.libraries,
-              );
-            },
-          );
+          linkResult = performance.run('link', (performance) {
+            return link(
+              elementFactory: elementFactory,
+              performance: performance,
+              inputLibraries: cycle.libraries,
+            );
+          });
           librariesLinked += cycle.libraries.length;
         } catch (exception, stackTrace) {
           _throwLibraryCycleLinkException(cycle, exception, stackTrace);
@@ -199,7 +196,7 @@ class LibraryContext {
       }
     }
 
-    await logger.runAsync('Prepare linked bundles', () async {
+    logger.run('Prepare linked bundles', () {
       var libraryCycle = performance.run('libraryCycle', (performance) {
         fileSystemState.newFileOperationPerformance = performance;
         try {
@@ -208,7 +205,7 @@ class LibraryContext {
           fileSystemState.newFileOperationPerformance = null;
         }
       });
-      await loadBundle(libraryCycle);
+      loadBundle(libraryCycle);
       logger.writeln(
         '[librariesTotal: $librariesTotal]'
         '[librariesLoaded: $librariesLoaded]'

pkg/analyzer/lib/src/dart/micro/resolve_file.dart

@@ -415,8 +415,8 @@ class FileResolver {
       throw ArgumentError('$uri is not a library.');
     }
 
-    await performance.runAsync('libraryContext', (performance) async {
-      await libraryContext!.load(
+    performance.run('libraryContext', (performance) {
+      libraryContext!.load(
         targetLibrary: kind,
         performance: performance,
       );
@@ -470,7 +470,7 @@ class FileResolver {
     var libraryKind = file.kind.library ?? file.kind.asLibrary;
 
     // Load the library, link if necessary.
-    await libraryContext!.load(
+    libraryContext!.load(
       targetLibrary: libraryKind,
       performance: performance,
     );
@@ -480,7 +480,7 @@ class FileResolver {
     var linkedKeysToRelease = libraryContext!.unloadAll();
 
     // Load the library again, the reference count is `>= 2`.
-    await libraryContext!.load(
+    libraryContext!.load(
       targetLibrary: libraryKind,
       performance: performance,
     );
@@ -569,8 +569,8 @@ class FileResolver {
       var lineOffset = file.lineInfo.getOffsetOfLine(completionLine);
       var completionOffset = lineOffset + completionColumn;
 
-      await performance.runAsync('libraryContext', (performance) async {
-        await libraryContext!.load(
+      performance.run('libraryContext', (performance) {
+        libraryContext!.load(
           targetLibrary: libraryKind,
           performance: performance,
         );
@@ -645,8 +645,8 @@ class FileResolver {
       var file = fileContext.file;
       var libraryKind = file.kind.library ?? file.kind.asLibrary;
 
-      await performance.runAsync('libraryContext', (performance) async {
-        await libraryContext!.load(
+      performance.run('libraryContext', (performance) {
+        libraryContext!.load(
           targetLibrary: libraryKind,
           performance: performance,
         );

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

@@ -30,13 +30,13 @@ import 'package:analyzer/src/util/performance/operation_performance.dart';
 import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:analyzer/src/utilities/uri_cache.dart';
 
-Future<LinkResult> link({
+LinkResult link({
   required LinkedElementFactory elementFactory,
   required OperationPerformanceImpl performance,
   required List<LibraryFileKind> inputLibraries,
-}) async {
+}) {
   var linker = Linker(elementFactory);
-  await linker.link(
+  linker.link(
     performance: performance,
     inputLibraries: inputLibraries,
   );
@@ -87,10 +87,10 @@ class Linker {
     return elementNodes[element.asElement];
   }
 
-  Future<void> link({
+  void link({
     required OperationPerformanceImpl performance,
     required List<LibraryFileKind> inputLibraries,
-  }) async {
+  }) {
     performance.run('LibraryBuilder.build', (performance) {
       for (var inputLibrary in inputLibraries) {
         LibraryBuilder.build(
@@ -101,8 +101,8 @@ class Linker {
       }
     });
 
-    await performance.runAsync('buildOutlines', (performance) async {
-      await _buildOutlines(
+    performance.run('buildOutlines', (performance) {
+      _buildOutlines(
         performance: performance,
       );
     });
@@ -189,19 +189,16 @@ class Linker {
     }
   }
 
-  Future<void> _buildOutlines({
+  void _buildOutlines({
     required OperationPerformanceImpl performance,
-  }) async {
+  }) {
     _createTypeSystemIfNotLinkingDartCore();
 
-    await performance.runAsync(
-      'computeLibraryScopes',
-      (performance) async {
-        await _computeLibraryScopes(
-          performance: performance,
-        );
-      },
-    );
+    performance.run('computeLibraryScopes', (performance) {
+      _computeLibraryScopes(
+        performance: performance,
+      );
+    });
 
     _createTypeSystem();
     _resolveTypes();
@@ -237,9 +234,9 @@ class Linker {
     }
   }
 
-  Future<void> _computeLibraryScopes({
+  void _computeLibraryScopes({
     required OperationPerformanceImpl performance,
-  }) async {
+  }) {
     for (var library in builders.values) {
       library.buildElements();
     }