Fill references to dynamic/Naver in LinkedElementFactory.

[email protected], [email protected]

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

Author: scheglov

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

@@ -352,10 +352,6 @@ class LibraryContext {
       analysisSession,
       Reference.root(),
     );
-
-    var dartCoreRef = elementFactory.rootReference.getChild('dart:core');
-    dartCoreRef.getChild('dynamic').element = DynamicElementImpl.instance;
-    dartCoreRef.getChild('Never').element = NeverElementImpl.instance;
   }
 
   void _createElementFactoryTypeProvider() {

pkg/analyzer/lib/src/summary/summary_file_builder.dart

@@ -11,7 +11,6 @@ import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
-import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/scanner/reader.dart';
 import 'package:analyzer/src/dart/scanner/scanner.dart';
 import 'package:analyzer/src/dart/sdk/sdk.dart';
@@ -148,15 +147,10 @@ class _Builder {
   }
 
   void _link2() {
-    var rootReference = summary2.Reference.root();
-    var dartCoreRef = rootReference.getChild('dart:core');
-    dartCoreRef.getChild('dynamic').element = DynamicElementImpl.instance;
-    dartCoreRef.getChild('Never').element = NeverElementImpl.instance;
-
     var elementFactory = summary2.LinkedElementFactory(
       context,
       null,
-      rootReference,
+      summary2.Reference.root(),
     );
 
     var linkResult = summary2.link(elementFactory, inputLibraries);

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

@@ -5,7 +5,6 @@
 import 'package:analyzer/dart/analysis/declared_variables.dart';
 import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/ast/ast.dart' show CompilationUnit;
-import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/inheritance_manager2.dart';
 import 'package:analyzer/src/generated/constant.dart';
 import 'package:analyzer/src/generated/engine.dart';
@@ -50,12 +49,9 @@ class Linker {
   InheritanceManager2 inheritance; // TODO(scheglov) cache it
 
   Linker(this.elementFactory) {
-    var dynamicRef = rootReference.getChild('dart:core').getChild('dynamic');
-    dynamicRef.element = DynamicElementImpl.instance;
-    var neverRef = rootReference.getChild('dart:core').getChild('Never');
-    neverRef.element = NeverElementImpl.instance;
-
-    linkingBundleContext = LinkingBundleContext(dynamicRef);
+    linkingBundleContext = LinkingBundleContext(
+      elementFactory.dynamicRef,
+    );
 
     bundleContext = LinkedBundleContext.forAst(
       elementFactory,

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

@@ -23,12 +23,23 @@ class LinkedElementFactory {
   CoreTypes _coreTypes;
 
   LinkedElementFactory(
-      this.analysisContext, this.analysisSession, this.rootReference);
+    this.analysisContext,
+    this.analysisSession,
+    this.rootReference,
+  ) {
+    var dartCoreRef = rootReference.getChild('dart:core');
+    dartCoreRef.getChild('dynamic').element = DynamicElementImpl.instance;
+    dartCoreRef.getChild('Never').element = NeverElementImpl.instance;
+  }
 
   CoreTypes get coreTypes {
     return _coreTypes ??= CoreTypes(this);
   }
 
+  Reference get dynamicRef {
+    return rootReference.getChild('dart:core').getChild('dynamic');
+  }
+
   bool get hasDartCore {
     return libraryMap.containsKey('dart:core');
   }

pkg/analyzer/test/src/summary/resynthesize_ast2_test.dart

@@ -51,11 +51,6 @@ class ResynthesizeAst2Test extends ResynthesizeTestStrategyTwoPhase
       );
     }
 
-    var rootReference = Reference.root();
-    var dartCoreRef = rootReference.getChild('dart:core');
-    dartCoreRef.getChild('dynamic').element = DynamicElementImpl.instance;
-    dartCoreRef.getChild('Never').element = NeverElementImpl.instance;
-
     var elementFactory = LinkedElementFactory(
       RestrictedAnalysisContext(
         SynchronousSession(
@@ -65,7 +60,7 @@ class ResynthesizeAst2Test extends ResynthesizeTestStrategyTwoPhase
         sourceFactory,
       ),
       _AnalysisSessionForLinking(),
-      rootReference,
+      Reference.root(),
     );
 
     var sdkLinkResult = link(elementFactory, inputLibraries);
@@ -90,16 +85,10 @@ class ResynthesizeAst2Test extends ResynthesizeTestStrategyTwoPhase
       sourceFactory,
     );
 
-    var rootReference = Reference.root();
-    rootReference.getChild('dart:core').getChild('dynamic').element =
-        DynamicElementImpl.instance;
-    rootReference.getChild('dart:core').getChild('Never').element =
-        NeverElementImpl.instance;
-
     var elementFactory = LinkedElementFactory(
       analysisContext,
       _AnalysisSessionForLinking(),
-      rootReference,
+      Reference.root(),
     );
     elementFactory.addBundle(
       LinkedBundleContext(elementFactory, sdkBundle),

pkg/analyzer_cli/lib/src/build_mode.dart

@@ -18,7 +18,6 @@ import 'package:analyzer/src/dart/analysis/file_state.dart';
 import 'package:analyzer/src/dart/analysis/performance_logger.dart';
 import 'package:analyzer/src/dart/analysis/restricted_analysis_context.dart';
 import 'package:analyzer/src/dart/analysis/session.dart';
-import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/sdk/sdk.dart';
 import 'package:analyzer/src/generated/engine.dart' show AnalysisOptionsImpl;
 import 'package:analyzer/src/generated/engine.dart';
@@ -534,11 +533,6 @@ class BuildMode with HasContextMixin {
   }
 
   void _createLinkedElementFactory() {
-    var rootReference = summary2.Reference.root();
-    var dartCoreRef = rootReference.getChild('dart:core');
-    dartCoreRef.getChild('dynamic').element = DynamicElementImpl.instance;
-    dartCoreRef.getChild('Never').element = NeverElementImpl.instance;
-
     var analysisContext = RestrictedAnalysisContext(
       SynchronousSession(analysisOptions, declaredVariables),
       sourceFactory,
@@ -547,7 +541,7 @@ class BuildMode with HasContextMixin {
     elementFactory = summary2.LinkedElementFactory(
       analysisContext,
       null,
-      rootReference,
+      summary2.Reference.root(),
     );
 
     for (var bundle in summaryDataStore.bundles) {