Less inequivalence on Hello World!

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 Future;
 
 import '../compiler_new.dart' as api;
 import 'backend_strategy.dart';
@@ skipping 14 matching lines @@
 import 'common_elements.dart' show CommonElements, 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/resolution_types.dart' show ResolutionDartType, Types;
-import 'elements/types.dart' show DartTypes;
 import 'enqueue.dart' show Enqueuer, EnqueueTask, ResolutionEnqueuer;
 import 'environment.dart';
 import 'frontend_strategy.dart';
 import 'id_generator.dart';
 import 'io/source_information.dart' show SourceInformation;
 import 'io/source_file.dart' show Binary;
 import 'js_backend/backend.dart' show JavaScriptBackend;
 import 'js_backend/element_strategy.dart' show ElementBackendStrategy;
 import 'kernel/kernel_backend_strategy.dart';
 import 'kernel/kernel_strategy.dart';
@@ skipping 31 matching lines @@
 import 'util/util.dart' show Link;
 import 'world.dart' show ClosedWorld, ClosedWorldRefiner;
 
 typedef CompilerDiagnosticReporter MakeReporterFunction(
     Compiler compiler, CompilerOptions options);
 
 abstract class Compiler {
   Measurer get measurer;
 
   final IdGenerator idGenerator = new IdGenerator();
-  DartTypes types;
   FrontendStrategy frontendStrategy;
   BackendStrategy backendStrategy;
   CompilerDiagnosticReporter _reporter;
   CompilerResolution _resolution;
   ParsingContext _parsingContext;
 
   ImpactStrategy impactStrategy = const ImpactStrategy();
 
   /**
    * Map from token to the first preceding comment token.
@@ skipping 92 matching lines @@
     } else {
       _reporter = new CompilerDiagnosticReporter(this, options);
     }
     frontendStrategy = options.loadFromDill
         ? new KernelFrontEndStrategy(reporter, environment)
         : new ResolutionFrontEndStrategy(this);
     backendStrategy = options.loadFromDill
         ? new KernelBackendStrategyImpl(this)
         : new ElementBackendStrategy(this);
     _resolution = createResolution();
-    types = new Types(_resolution);
 
     if (options.verbose) {
       progress = new Stopwatch()..start();
     }
 
     backend = createBackend();
     enqueuer = backend.makeEnqueuer();
 
     tasks = [
       dietParser = new DietParserTask(idGenerator, backend, reporter, measurer),
@@ skipping 1076 matching lines @@
   }
 }
 
 // TODO(johnniwinther): Move [ResolverTask] here.
 class CompilerResolution implements Resolution {
   final Compiler _compiler;
   final Map<Element, ResolutionImpact> _resolutionImpactCache =
       <Element, ResolutionImpact>{};
   final Map<Element, WorldImpact> _worldImpactCache = <Element, WorldImpact>{};
   bool retainCachesForTesting = false;
+  Types _types;
 
-  CompilerResolution(this._compiler);
+  CompilerResolution(this._compiler) {
+    _types = new Types(this);
+  }
 
   @override
   DiagnosticReporter get reporter => _compiler.reporter;
 
   @override
   ParsingContext get parsingContext => _compiler.parsingContext;
 
   @override
   ElementEnvironment get elementEnvironment =>
       _compiler.frontendStrategy.elementEnvironment;
 
   @override
   CommonElements get commonElements =>
       _compiler.frontendStrategy.commonElements;
 
   @override
-  Types get types => _compiler.types;
+  Types get types => _types;
 
   @override
   Target get target => _compiler.backend.target;
 
   @override
   ResolverTask get resolver => _compiler.resolver;
 
   @override
   ResolutionEnqueuer get enqueuer => _compiler.enqueuer.resolution;
 
@@ skipping 268 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;
 }