Remove Compiler.inferenceWorld

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 'cache_strategy.dart' show CacheStrategy;
@@ skipping 261 matching lines @@
     if (options.resolveOnly) {
       serialization.supportSerialization = true;
     }
 
     _parsingContext =
         new ParsingContext(reporter, parser, patchParser, backend);
 
     tasks.addAll(backend.tasks);
   }
 
-  /// The world currently being computed by resolution. This forms a basis for
-  /// the [inferenceWorld] and later the [closedWorld].
-  OpenWorld get openWorld => _world;
-
-  /// The closed world after resolution but currently refined by inference.
-  ClosedWorldRefiner get inferenceWorld => _world;
-
   /// The closed world after resolution and inference.
   ClosedWorld get closedWorld {
     assert(invariant(CURRENT_ELEMENT_SPANNABLE, _world.isClosed,
         message: "Closed world not computed yet."));
     return _world;
   }
 
   /// Creates the backend.
   ///
   /// Override this to mock the backend for testing.
@@ skipping 422 matching lines @@
             // If compilation failed, it is possible that the error prevents the
             // compiler from analyzing all the code.
             // TODO(johnniwinther): Reenable this when the reporting is more
             // precise.
             //reportUnusedCode();
           }
           return;
         }
         assert(mainFunction != null);
 
-        closeResolution();
+        ClosedWorldRefiner closedWorldRefiner = closeResolution();
 
         reporter.log('Inferring types...');
-        globalInference.runGlobalTypeInference(mainFunction);
+        globalInference.runGlobalTypeInference(
+            mainFunction, closedWorld, closedWorldRefiner);
 
         if (stopAfterTypeInference) return;
 
         backend.onTypeInferenceComplete();
 
         reporter.log('Compiling...');
         phase = PHASE_COMPILING;
 
         enqueuer.codegen.applyImpact(backend.onCodegenStart());
         if (compileAll) {
@@ skipping 11 matching lines @@
           dumpInfoTask.reportSize(programSize);
           dumpInfoTask.dumpInfo();
         }
 
         backend.sourceInformationStrategy.onComplete();
 
         checkQueues();
       });
 
   /// Perform the steps needed to fully end the resolution phase.
-  void closeResolution() {
+  ClosedWorldRefiner closeResolution() {
     phase = PHASE_DONE_RESOLVING;
 
-    resolverWorld.openWorld.closeWorld(reporter);
+    WorldImpl world = resolverWorld.openWorld.closeWorld(reporter);
     // Compute whole-program-knowledge that the backend needs. (This might
     // require the information computed in [world.closeWorld].)
-    backend.onResolutionComplete();
+    backend.onResolutionComplete(world);
 
     deferredLoadTask.onResolutionComplete(mainFunction);
 
     // TODO(johnniwinther): Move this after rti computation but before
     // reflection members computation, and (re-)close the world afterwards.
-    closureToClassMapper.createClosureClasses();
+    closureToClassMapper.createClosureClasses(world);
+    return world;
   }
 
   /// Compute the [WorldImpact] for accessing all elements in [library].
   WorldImpact computeImpactForLibrary(LibraryElement library) {
     WorldImpactBuilderImpl impactBuilder = new WorldImpactBuilderImpl();
 
     void registerStaticUse(Element element) {
       impactBuilder.registerStaticUse(new StaticUse.directUse(element));
     }
 
@@ skipping 1451 matching lines @@
   _ElementScanner(this.scanner);
   void scanLibrary(LibraryElement library) => scanner.scanLibrary(library);
   void scanUnit(CompilationUnitElement unit) => scanner.scan(unit);
 }
 
 class _EmptyEnvironment implements Environment {
   const _EmptyEnvironment();
 
   String valueOf(String key) => null;
 }