Derive CommonElements directly from ElementEnvironment.

pkg/compiler/lib/src/compiler.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library dart2js.compiler_base;
 
 import 'dart:async' show EventSink, Future;
 
 import '../compiler_new.dart' as api;
 import 'closure.dart' as closureMapping show ClosureTask;
 import 'common/names.dart' show Selectors;
 import 'common/names.dart' show Identifiers, Uris;
 import 'common/resolution.dart'
     show
         ParsingContext,
         Resolution,
         ResolutionWorkItem,
         ResolutionImpact,
         Target;
 import 'common/tasks.dart' show CompilerTask, GenericTask, Measurer;
 import 'common/work.dart' show WorkItem;
 import 'common.dart';
 import 'compile_time_constants.dart';
 import 'constants/values.dart';
 import 'common_elements.dart'
-    show CommonElements, CommonElementsMixin, ElementEnvironment;
+    show CommonElements, CommonElementsImpl, ElementEnvironment;
 import 'deferred_load.dart' show DeferredLoadTask;
 import 'diagnostics/code_location.dart';
 import 'diagnostics/diagnostic_listener.dart' show DiagnosticReporter;
 import 'diagnostics/invariant.dart' show REPORT_EXCESS_RESOLUTION;
 import 'diagnostics/messages.dart' show Message, MessageTemplate;
 import 'dump_info.dart' show DumpInfoTask;
 import 'elements/elements.dart';
 import 'elements/entities.dart';
 import 'elements/modelx.dart' show ErroneousElementX;
 import 'elements/resolution_types.dart'
@@ skipping 44 matching lines @@
 import 'world.dart' show ClosedWorld, ClosedWorldRefiner, ClosedWorldImpl;
 
 typedef CompilerDiagnosticReporter MakeReporterFunction(
     Compiler compiler, CompilerOptions options);
 
 abstract class Compiler {
   Measurer get measurer;
 
   final IdGenerator idGenerator = new IdGenerator();
   Types types;
-  _CompilerCommonElements _commonElements;
+  CommonElementsImpl _commonElements;
   _CompilerElementEnvironment _elementEnvironment;
   CompilerDiagnosticReporter _reporter;
   CompilerResolution _resolution;
   ParsingContext _parsingContext;
 
   ImpactStrategy impactStrategy = const ImpactStrategy();
 
   /**
    * Map from token to the first preceding comment token.
    */
@@ skipping 88 matching lines @@
         this.userOutputProvider = outputProvider == null
             ? const NullCompilerOutput()
             : outputProvider {
     if (makeReporter != null) {
       _reporter = makeReporter(this, options);
     } else {
       _reporter = new CompilerDiagnosticReporter(this, options);
     }
     _resolution = createResolution();
     _elementEnvironment = new _CompilerElementEnvironment(this);
-    _commonElements =
-        new _CompilerCommonElements(_elementEnvironment, _resolution, reporter);
+    _commonElements = new CommonElementsImpl(_elementEnvironment);
     types = new Types(_resolution);
 
     if (options.verbose) {
       progress = new Stopwatch()..start();
     }
 
     backend = createBackend();
     enqueuer = backend.makeEnqueuer();
 
     tasks = [
@@ skipping 868 matching lines @@
     return userOutputProvider.createOutputSink(name, extension, type);
   }
 }
 
 /// Information about suppressed warnings and hints for a given library.
 class SuppressionInfo {
   int warnings = 0;
   int hints = 0;
 }
 
-class _CompilerCommonElements extends CommonElementsMixin {
-  final Resolution resolution;
-  final DiagnosticReporter reporter;
-
-  final ElementEnvironment environment;
-
-  _CompilerCommonElements(this.environment, this.resolution, this.reporter);
-
-  @override
-  ResolutionDynamicType get dynamicType => const ResolutionDynamicType();
-
-  LibraryEntity _coreLibrary;
-  LibraryEntity get coreLibrary =>
-      _coreLibrary ??= environment.lookupLibrary(Uris.dart_core);
-
-  LibraryEntity _typedDataLibrary;
-  LibraryEntity get typedDataLibrary => _typedDataLibrary ??=
-      environment.lookupLibrary(Uris.dart__native_typed_data);
-
-  LibraryEntity _mirrorsLibrary;
-  LibraryEntity get mirrorsLibrary =>
-      _mirrorsLibrary ??= environment.lookupLibrary(Uris.dart_mirrors);
-
-  LibraryEntity _asyncLibrary;
-  LibraryEntity get asyncLibrary =>
-      _asyncLibrary ??= environment.lookupLibrary(Uris.dart_async);
-
-  @override
-  MemberElement findLibraryMember(LibraryElement library, String name,
-      {bool setter: false, bool required: true}) {
-    Element member = _findLibraryMember(library, name, required: required);
-    if (member != null && member.isAbstractField) {
-      AbstractFieldElement abstractField = member;
-      if (setter) {
-        member = abstractField.setter;
-      } else {
-        member = abstractField.getter;
-      }
-      if (member == null && required) {
-        reporter.internalError(
-            library,
-            "The library '${library.canonicalUri}' does not contain required "
-            "${setter ? 'setter' : 'getter'}: '$name'.");
-      }
-    }
-    return member;
-  }
-
-  @override
-  MemberElement findClassMember(ClassElement cls, String name,
-      {bool setter: false, bool required: true}) {
-    cls.ensureResolved(resolution);
-    Element member = cls.lookupLocalMember(name);
-    if (member != null && member.isAbstractField) {
-      AbstractFieldElement abstractField = member;
-      if (setter) {
-        member = abstractField.setter;
-      } else {
-        member = abstractField.getter;
-      }
-    }
-    if (member == null && required) {
-      reporter.internalError(
-          cls,
-          "The class '${cls}' in '${cls.library.canonicalUri}' does not "
-          "contain required member: '$name'.");
-    }
-    return member;
-  }
-
-  @override
-  ConstructorElement findConstructor(ClassElement cls, String name,
-      {bool required: true}) {
-    cls.ensureResolved(resolution);
-    ConstructorElement constructor = cls.lookupConstructor(name);
-    if (constructor == null && required) {
-      reporter.internalError(
-          cls,
-          "The class '${cls}' in '${cls.library.canonicalUri}' does not "
-          "contain required constructor: '$name'.");
-    }
-    return constructor;
-  }
-
-  @override
-  ClassElement findClass(LibraryElement library, String name,
-      {bool required: true}) {
-    return _findLibraryMember(library, name, required: required);
-  }
-
-  Element _findLibraryMember(LibraryElement library, String name,
-      {bool required: true}) {
-    // If the script of the library is synthesized, the library does not exist
-    // and we do not try to load the helpers.
-    //
-    // This could for example happen if dart:async is disabled, then loading it
-    // should not try to find the given element.
-    if (library == null || library.isSynthesized) return null;
-
-    Element element = library.find(name);
-    if (element == null && required) {
-      reporter.internalError(
-          library,
-          "The library '${library.canonicalUri}' does not contain required "
-          "element: '$name'.");
-    }
-    return element;
-  }
-}
-
 class CompilerDiagnosticReporter extends DiagnosticReporter {
   final Compiler compiler;
   final DiagnosticOptions options;
 
   Element _currentElement;
   bool hasCrashed = false;
 
   /// `true` if the last diagnostic was filtered, in which case the
   /// accompanying info message should be filtered as well.
   bool lastDiagnosticWasFiltered = false;
@@ skipping 707 matching lines @@
 
 /// An element environment base on a [Compiler].
 class _CompilerElementEnvironment implements ElementEnvironment {
   final Compiler _compiler;
 
   _CompilerElementEnvironment(this._compiler);
 
   LibraryProvider get _libraryProvider => _compiler.libraryLoader;
   Resolution get _resolution => _compiler.resolution;
 
+  ResolutionDynamicType get dynamicType => const ResolutionDynamicType();
+
   @override
   LibraryEntity get mainLibrary => _compiler.mainApp;
 
   @override
   FunctionEntity get mainFunction => _compiler.mainFunction;
 
   @override
   ResolutionInterfaceType getThisType(ClassElement cls) {
     cls.ensureResolved(_resolution);
     return cls.thisType;
@@ skipping 90 matching lines @@
           cls,
           "The library '${library.libraryName}' does not "
           "contain required class: '$name'.");
     }
     return cls?.declaration;
   }
 
   @override
   LibraryElement lookupLibrary(Uri uri, {bool required: false}) {
     LibraryElement library = _libraryProvider.lookupLibrary(uri);
+    // If the script of the library is synthesized, the library does not exist
+    // and we do not try to load the helpers.
+    //
+    // This could for example happen if dart:async is disabled, then loading it
+    // should not try to find the given element.
     if (library != null && library.isSynthesized) {
       return null;
     }
     if (library == null && required) {
       throw new SpannableAssertionFailure(
           library, "The library '${uri}' was not found.");
     }
     return library;
   }
 }