Use entities for globals in Namer.

pkg/compiler/lib/src/js_emitter/startup_emitter/emitter.dart

 // Copyright (c) 2015, 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.startup_emitter;
 
 import 'package:js_runtime/shared/embedded_names.dart'
     show JsBuiltin, METADATA, STATIC_FUNCTION_NAME_TO_CLOSURE, TYPES;
 
 import '../../common.dart';
 import '../../compiler.dart' show Compiler;
 import '../../constants/values.dart' show ConstantValue;
 import '../../deferred_load.dart' show OutputUnit;
-import '../../elements/elements.dart'
-    show ClassElement, Element, FieldElement, MethodElement;
+import '../../elements/elements.dart' show ClassElement, MethodElement;
+import '../../elements/entities.dart';
 import '../../js/js.dart' as js;
 import '../../js_backend/js_backend.dart' show JavaScriptBackend, Namer;
 import '../../world.dart' show ClosedWorld;
 import '../js_emitter.dart' show CodeEmitterTask, NativeEmitter;
-import '../js_emitter.dart' as emitterTask show Emitter, EmitterFactory;
+import '../js_emitter.dart' as emitterTask show EmitterBase, EmitterFactory;
 import '../model.dart';
 import '../program_builder/program_builder.dart' show ProgramBuilder;
 import 'model_emitter.dart';
 
 class EmitterFactory implements emitterTask.EmitterFactory {
   final bool generateSourceMap;
 
   EmitterFactory({this.generateSourceMap});
 
   @override
   bool get supportsReflection => false;
 
   @override
   Emitter createEmitter(
       CodeEmitterTask task, Namer namer, ClosedWorld closedWorld) {
     return new Emitter(task.compiler, namer, task.nativeEmitter, closedWorld,
         task, generateSourceMap);
   }
 }
 
-class Emitter implements emitterTask.Emitter {
+class Emitter extends emitterTask.EmitterBase {
   final Compiler _compiler;
   final Namer namer;
   final ModelEmitter _emitter;
 
   JavaScriptBackend get _backend => _compiler.backend;
 
   Emitter(
       Compiler compiler,
       Namer namer,
       NativeEmitter nativeEmitter,
@@ skipping 32 matching lines @@
   js.Expression generateEmbeddedGlobalAccess(String global) {
     return _emitter.generateEmbeddedGlobalAccess(global);
   }
 
   @override
   // TODO(herhut): Use a single shared function.
   js.Expression generateFunctionThatReturnsNull() {
     return js.js('function() {}');
   }
 
-  js.PropertyAccess _globalPropertyAccess(Element element) {
-    js.Name name = namer.globalPropertyName(element);
-    js.PropertyAccess pa = new js.PropertyAccess(
-        new js.VariableUse(namer.globalObjectFor(element)), name);
-    return pa;
+  @override
+  js.Expression isolateLazyInitializerAccess(FieldEntity element) {
+    return js.js('#.#', [
+      namer.globalObjectForMember(element),
+      namer.lazyInitializerName(element)
+    ]);
   }
 
   @override
-  js.Expression isolateLazyInitializerAccess(FieldElement element) {
-    return js.js('#.#',
-        [namer.globalObjectFor(element), namer.lazyInitializerName(element)]);
-  }
-
-  @override
   js.Expression isolateStaticClosureAccess(MethodElement element) {
     return _emitter.generateStaticClosureAccess(element);
   }
 
   @override
-  js.PropertyAccess staticFieldAccess(FieldElement element) {
-    return _globalPropertyAccess(element);
-  }
-
-  @override
-  js.PropertyAccess staticFunctionAccess(MethodElement element) {
-    return _globalPropertyAccess(element);
-  }
-
-  @override
-  js.PropertyAccess constructorAccess(ClassElement element) {
-    return _globalPropertyAccess(element);
-  }
-
-  @override
   js.PropertyAccess prototypeAccess(
       ClassElement element, bool hasBeenInstantiated) {
     js.Expression constructor =
         hasBeenInstantiated ? constructorAccess(element) : typeAccess(element);
     return js.js('#.prototype', constructor);
   }
 
   @override
-  js.Expression interceptorClassAccess(ClassElement element) {
-    return _globalPropertyAccess(element);
-  }
-
-  @override
-  js.Expression typeAccess(Element element) {
-    return _globalPropertyAccess(element);
-  }
-
-  @override
   js.Template templateForBuiltin(JsBuiltin builtin) {
     String typeNameProperty = ModelEmitter.typeNameProperty;
 
     switch (builtin) {
       case JsBuiltin.dartObjectConstructor:
         ClassElement objectClass = _compiler.commonElements.objectClass;
         return js.js.expressionTemplateYielding(typeAccess(objectClass));
 
       case JsBuiltin.isCheckPropertyToJsConstructorName:
         int isPrefixLength = namer.operatorIsPrefix.length;
@@ skipping 41 matching lines @@
     }
   }
 
   @override
   int generatedSize(OutputUnit unit) {
     Fragment key = _emitter.outputBuffers.keys
         .firstWhere((Fragment fragment) => fragment.outputUnit == unit);
     return _emitter.outputBuffers[key].length;
   }
 }