Remove Compiler.mainApp and Compiler.mainFunction

pkg/compiler/lib/src/deferred_load.dart

 // Copyright (c) 2014, 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 deferred_load;
 
 import 'common/tasks.dart' show CompilerTask;
 import 'common.dart';
 import 'compiler.dart' show Compiler;
 import 'constants/expressions.dart' show ConstantExpression;
@@ skipping 773 matching lines @@
               });
 
               // Generate a unique name for each OutputUnit.
               _assignNamesToOutputUnits(allOutputUnits);
             }));
     // Notify the impact strategy impacts are no longer needed for deferred
     // load.
     compiler.impactStrategy.onImpactUsed(IMPACT_USE);
   }
 
-  void beforeResolution(Compiler compiler) {
-    if (compiler.mainApp == null) return;
+  void beforeResolution(LibraryEntity mainLibrary) {
+    if (mainLibrary == null) return;
     // TODO(johnniwinther): Support deferred load for kernel based elements.
     if (compiler.options.loadFromDill) return;
-    _allDeferredImports[_fakeMainImport] = compiler.mainApp;
+    _allDeferredImports[_fakeMainImport] = mainLibrary;
     var lastDeferred;
     // When detecting duplicate prefixes of deferred libraries there are 4
     // cases of duplicate prefixes:
     // 1.
     // import "lib.dart" deferred as a;
     // import "lib2.dart" deferred as a;
     // 2.
     // import "lib.dart" deferred as a;
     // import "lib2.dart" as a;
     // 3.
@@ skipping 39 matching lines @@
           if (import.isDeferred) {
             _DeferredImport key = new _DeclaredDeferredImport(import);
             LibraryElement importedLibrary = import.importedLibrary;
             _allDeferredImports[key] = importedLibrary;
 
             if (prefix == null) {
               reporter.reportErrorMessage(
                   import, MessageKind.DEFERRED_LIBRARY_WITHOUT_PREFIX);
             } else {
               prefixDeferredImport[prefix] = import;
+              Uri mainLibraryUri = compiler.mainLibraryUri;
               _deferredImportDescriptions[key] =
-                  new ImportDescription(import, library, compiler);
+                  new ImportDescription(import, library, mainLibraryUri);
             }
             isProgramSplit = true;
             lastDeferred = import;
           }
           if (prefix != null) {
             if (previousDeferredImport != null ||
                 (import.isDeferred && usedPrefixes.contains(prefix))) {
               ImportElement failingImport = (previousDeferredImport != null)
                   ? previousDeferredImport
                   : import;
@@ skipping 154 matching lines @@
 
 class ImportDescription {
   /// Relative uri to the importing library.
   final String importingUri;
 
   /// The prefix this import is imported as.
   final String prefix;
   final LibraryElement _importingLibrary;
 
   ImportDescription(
-      ImportElement import, LibraryElement importingLibrary, Compiler compiler)
-      : importingUri = uri_extras.relativize(compiler.mainApp.canonicalUri,
-            importingLibrary.canonicalUri, false),
+      ImportElement import, LibraryElement importingLibrary, Uri mainLibraryUri)
+      : importingUri = uri_extras.relativize(
+            mainLibraryUri, importingLibrary.canonicalUri, false),
         prefix = import.prefix.name,
         _importingLibrary = importingLibrary;
 
   String get importingLibraryName {
     return _importingLibrary.hasLibraryName
         ? _importingLibrary.libraryName
         : "<unnamed>";
   }
 }
 
@@ skipping 54 matching lines @@
 
   bool operator ==(other) {
     if (other is! _DeclaredDeferredImport) return false;
     return declaration == other.declaration;
   }
 
   int get hashCode => declaration.hashCode * 17;
 
   String toString() => '$declaration';
 }