Inline addLocalDeclarations

R=brianwilkerson@google.com

Change-Id: I74bb5b6c1d74ba0a61d117e56e2081dcf6119909
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/201140
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>

Author: scheglov

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

@@ -82,39 +82,6 @@ class LibraryBuilder {
     }
   }
 
-  /// Add top-level declaration of the library units to the local scope.
-  void addLocalDeclarations() {
-    for (var linkingUnit in context.units) {
-      for (var node in linkingUnit.unit.declarations) {
-        if (node is ast.ClassDeclaration) {
-          // Handled in ElementBuilder.
-        } else if (node is ast.ClassTypeAlias) {
-          // Handled in ElementBuilder.
-        } else if (node is ast.EnumDeclarationImpl) {
-          // Handled in ElementBuilder.
-        } else if (node is ast.ExtensionDeclarationImpl) {
-          // Handled in ElementBuilder.
-        } else if (node is ast.FunctionDeclarationImpl) {
-          // Handled in ElementBuilder.
-        } else if (node is ast.FunctionTypeAlias) {
-          // Handled in ElementBuilder.
-        } else if (node is ast.GenericTypeAlias) {
-          // Handled in ElementBuilder.
-        } else if (node is ast.MixinDeclarationImpl) {
-          // Handled in ElementBuilder.
-        } else if (node is ast.TopLevelVariableDeclaration) {
-          // Handled in ElementBuilder.
-        } else {
-          throw UnimplementedError('${node.runtimeType}');
-        }
-      }
-    }
-    if ('$uri' == 'dart:core') {
-      localScope.declare('dynamic', reference.getChild('dynamic'));
-      localScope.declare('Never', reference.getChild('Never'));
-    }
-  }
-
   /// Return `true` if the export scope was modified.
   bool addToExportScope(String name, Reference reference) {
     if (name.startsWith('_')) return false;
@@ -135,6 +102,8 @@ class LibraryBuilder {
         as LibraryElementImpl;
   }
 
+  /// Build elements for declarations in the library units, add top-level
+  /// declarations to the local scope, for combining into export scopes.
   void buildElements() {
     for (var unitContext in context.units) {
       var elementBuilder = ElementBuilder(
@@ -147,6 +116,10 @@ class LibraryBuilder {
       }
       elementBuilder.buildDeclarationElements(unitContext.unit);
     }
+    if ('$uri' == 'dart:core') {
+      localScope.declare('dynamic', reference.getChild('dynamic'));
+      localScope.declare('Never', reference.getChild('Never'));
+    }
   }
 
   void buildEnumChildren() {

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

@@ -119,7 +119,6 @@ class Linker {
     }
 
     for (var library in builders.values) {
-      library.addLocalDeclarations();
       library.buildElements();
     }