Remove Compiler.mainApp and Compiler.mainFunction

pkg/compiler/lib/src/resolution/resolution_strategy.dart

 // Copyright (c) 2017, 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.resolution_strategy;
 
 import 'package:front_end/src/fasta/scanner.dart' show Token;
 
 import '../common.dart';
 import '../common_elements.dart';
@@ skipping 29 matching lines @@
 import '../universe/call_structure.dart';
 import '../universe/use.dart';
 import '../universe/world_builder.dart';
 import '../universe/world_impact.dart';
 import 'no_such_method_resolver.dart';
 
 /// [FrontendStrategy] that loads '.dart' files and creates a resolved element
 /// model using the resolver.
 class ResolutionFrontEndStrategy implements FrontendStrategy {
   final Compiler _compiler;
-  final ElementEnvironment elementEnvironment;
+  final _CompilerElementEnvironment _elementEnvironment;
   final CommonElements commonElements;
 
   AnnotationProcessor _annotationProcessor;
 
   factory ResolutionFrontEndStrategy(Compiler compiler) {
     ElementEnvironment elementEnvironment =
         new _CompilerElementEnvironment(compiler);
     CommonElements commonElements = new CommonElements(elementEnvironment);
     return new ResolutionFrontEndStrategy.internal(
         compiler, elementEnvironment, commonElements);
   }
 
   ResolutionFrontEndStrategy.internal(
-      this._compiler, this.elementEnvironment, this.commonElements);
+      this._compiler, this._elementEnvironment, this.commonElements);
+
+  ElementEnvironment get elementEnvironment => _elementEnvironment;
 
   DartTypes get dartTypes => _compiler.types;
 
   LibraryLoaderTask createLibraryLoader(
       ResolvedUriTranslator uriTranslator,
       ScriptLoader scriptLoader,
       ElementScanner scriptScanner,
       LibraryDeserializer deserializer,
       PatchResolverFunction patchResolverFunc,
       PatchParserTask patchParser,
@@ skipping 59 matching lines @@
 
   WorkItemBuilder createResolutionWorkItemBuilder(
       NativeBasicData nativeBasicData,
       NativeDataBuilder nativeDataBuilder,
       ImpactTransformer impactTransformer) {
     return new ResolutionWorkItemBuilder(_compiler.resolution);
   }
 
   FunctionEntity computeMain(
       LibraryElement mainApp, WorldImpactBuilder impactBuilder) {
+    _elementEnvironment._mainLibrary = mainApp;
     if (mainApp == null) return null;
     MethodElement mainFunction;
     Element main = mainApp.findExported(Identifiers.main);
     ErroneousElement errorElement = null;
     if (main == null) {
       if (_compiler.options.analyzeOnly) {
         if (!_compiler.analyzeAll) {
           errorElement = new ErroneousElementX(MessageKind.CONSIDER_ANALYZE_ALL,
               {'main': Identifiers.main}, Identifiers.main, mainApp);
         }
@@ skipping 50 matching lines @@
         errorElement.isSynthesized &&
         !mainApp.isSynthesized) {
       _compiler.reporter.reportWarningMessage(errorElement,
           errorElement.messageKind, errorElement.messageArguments);
     }
     MethodElement mainMethod;
     if (mainFunction != null && !mainFunction.isMalformed) {
       mainFunction.computeType(_compiler.resolution);
       mainMethod = mainFunction;
     }
+    _elementEnvironment._mainFunction = mainMethod;
     return mainMethod;
   }
 
   SourceSpan spanFromToken(Element currentElement, Token token) =>
       _spanFromTokens(currentElement, token, token);
 
   SourceSpan _spanFromTokens(Element currentElement, Token begin, Token end,
       [Uri uri]) {
     if (begin == null || end == null) {
       // TODO(ahe): We can almost always do better. Often it is only
@@ skipping 139 matching lines @@
       return node.sourcePosition;
     }
     return null;
   }
 }
 
 /// An element environment base on a [Compiler].
 class _CompilerElementEnvironment implements ElementEnvironment {
   final Compiler _compiler;
 
+  LibraryEntity _mainLibrary;
+  FunctionEntity _mainFunction;
+
   _CompilerElementEnvironment(this._compiler);
 
   LibraryProvider get _libraryProvider => _compiler.libraryLoader;
   Resolution get _resolution => _compiler.resolution;
 
   ResolutionDynamicType get dynamicType => const ResolutionDynamicType();
 
   @override
-  LibraryEntity get mainLibrary => _compiler.mainApp;
+  LibraryEntity get mainLibrary => _mainLibrary;
 
   @override
-  FunctionEntity get mainFunction => _compiler.mainFunction;
+  FunctionEntity get mainFunction => _mainFunction;
 
   @override
   Iterable<LibraryEntity> get libraries => _compiler.libraryLoader.libraries;
 
   @override
   String getLibraryName(LibraryElement library) => library.libraryName;
 
   @override
   ResolutionInterfaceType getThisType(ClassElement cls) {
     cls.ensureResolved(_resolution);
@@ skipping 462 matching lines @@
   @override
   WorkItem createWorkItem(MemberElement element) {
     assert(element.isDeclaration, failedAt(element));
     if (element.isMalformed) return null;
 
     assert(element is AnalyzableElement,
         failedAt(element, 'Element $element is not analyzable.'));
     return _resolution.createWorkItem(element);
   }
 }