Less inequivalence on Hello World!

pkg/compiler/lib/src/js_emitter/code_emitter_task.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.js_emitter.code_emitter_task;
 
 import 'package:js_runtime/shared/embedded_names.dart' show JsBuiltin;
 
 import '../common.dart';
 import '../common/tasks.dart' show CompilerTask;
 import '../compiler.dart' show Compiler;
 import '../constants/values.dart';
 import '../deferred_load.dart' show OutputUnit;
 import '../elements/entities.dart';
 import '../js/js.dart' as jsAst;
 import '../js_backend/js_backend.dart' show JavaScriptBackend, Namer;
 import '../universe/world_builder.dart' show CodegenWorldBuilder;
 import '../world.dart' show ClosedWorld;
 import 'full_emitter/emitter.dart' as full_js_emitter;
 import 'lazy_emitter/emitter.dart' as lazy_js_emitter;
 import 'program_builder/program_builder.dart';
 import 'startup_emitter/emitter.dart' as startup_js_emitter;
 
 import 'metadata_collector.dart' show MetadataCollector;
+import 'model.dart';
 import 'native_emitter.dart' show NativeEmitter;
 import 'type_test_registry.dart' show TypeTestRegistry;
 import 'sorter.dart';
 
 const USE_LAZY_EMITTER = const bool.fromEnvironment("dart2js.use.lazy.emitter");
 
 /**
  * Generates the code for all used classes in the program. Static fields (even
  * in classes) are ignored, since they can be treated as non-class elements.
  *
  * The code for the containing (used) methods must exist in the `universe`.
  */
 class CodeEmitterTask extends CompilerTask {
   TypeTestRegistry typeTestRegistry;
   NativeEmitter _nativeEmitter;
   MetadataCollector metadataCollector;
   EmitterFactory _emitterFactory;
   Emitter _emitter;
   final Compiler compiler;
 
+  ProgramBuilder programForTesting;
+
   /// The [Sorter] use for ordering elements in the generated JavaScript.
   final Sorter sorter;
 
   JavaScriptBackend get backend => compiler.backend;
 
   @deprecated
   // This field should be removed. It's currently only needed for dump-info and
   // tests.
   // The field is set after the program has been emitted.
   /// Contains a list of all classes that are emitted.
@@ skipping 132 matching lines @@
   }
 
   int assembleProgram(Namer namer, ClosedWorld closedWorld) {
     return measure(() {
       _finalizeRti();
       ProgramBuilder programBuilder = new ProgramBuilder(
           compiler.options,
           compiler.reporter,
           closedWorld.elementEnvironment,
           closedWorld.commonElements,
-          compiler.types,
+          closedWorld.dartTypes,
           compiler.deferredLoadTask,
           compiler.backendStrategy.closureDataLookup,
           compiler.codegenWorldBuilder,
           backend.nativeCodegenEnqueuer,
           closedWorld.backendUsage,
           backend.constants,
           closedWorld.nativeData,
           backend.rtiNeed,
           backend.mirrorsData,
           closedWorld.interceptorData,
@@ skipping 22 matching lines @@
 abstract class EmitterFactory {
   /// Returns true, if the emitter supports reflection.
   bool get supportsReflection;
 
   /// Create the [Emitter] for the emitter [task] that uses the given [namer].
   Emitter createEmitter(
       CodeEmitterTask task, Namer namer, ClosedWorld closedWorld);
 }
 
 abstract class Emitter {
+  Program get programForTesting;
+
   /// Uses the [programBuilder] to generate a model of the program, emits
   /// the program, and returns the size of the generated output.
   int emitProgram(ProgramBuilder programBuilder);
 
   /// Returns the JS function that must be invoked to get the value of the
   /// lazily initialized static.
   jsAst.Expression isolateLazyInitializerAccess(covariant FieldEntity element);
 
   /// Returns the closure expression of a static function.
   jsAst.Expression isolateStaticClosureAccess(covariant FunctionEntity element);
@@ skipping 33 matching lines @@
   jsAst.Expression constantReference(ConstantValue constant);
 
   /// Returns the JS template for the given [builtin].
   jsAst.Template templateForBuiltin(JsBuiltin builtin);
 
   /// Returns the size of the code generated for a given output [unit].
   int generatedSize(OutputUnit unit);
 }
 
 abstract class EmitterBase implements Emitter {
+  Program programForTesting;
   Namer get namer;
 
   jsAst.PropertyAccess globalPropertyAccessForMember(MemberEntity element) {
     jsAst.Name name = namer.globalPropertyNameForMember(element);
     jsAst.PropertyAccess pa = new jsAst.PropertyAccess(
         new jsAst.VariableUse(namer.globalObjectForMember(element)), name);
     return pa;
   }
 
   jsAst.PropertyAccess globalPropertyAccessForClass(ClassEntity element) {
@@ skipping 28 matching lines @@
   @override
   jsAst.Expression interceptorClassAccess(ClassEntity element) {
     return globalPropertyAccessForClass(element);
   }
 
   @override
   jsAst.Expression typeAccess(Entity element) {
     return globalPropertyAccessForType(element);
   }
 }