Move elementAccess() from namer to emitter.

pkg/compiler/lib/src/ssa/codegen.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.
 
 part of ssa;
 
 class SsaCodeGeneratorTask extends CompilerTask {
 
   final JavaScriptBackend backend;
 
@@ skipping 1623 matching lines @@
     List<DartType> instantiatedTypes = node.instantiatedTypes;
 
     registry.registerStaticInvocation(element);
 
     if (instantiatedTypes != null && !instantiatedTypes.isEmpty) {
       instantiatedTypes.forEach((type) {
         registry.registerInstantiatedType(type);
       });
     }
 
-    push(backend.namer.elementAccess(node.element));
+    push(backend.emitter.globalPropertyAccess(node.element));

[floitsch, 2014/12/03 17:02:26]

staticFunctionAccess

[zarah, 2014/12/05 08:22:52]

Done.

     push(new js.Call(pop(), visitArguments(node.inputs, start: 0)), node);
   }
 
   visitInvokeSuper(HInvokeSuper node) {
     Element superMethod = node.element;
     registry.registerSuperInvocation(superMethod);
     ClassElement superClass = superMethod.enclosingClass;
     if (superMethod.kind == ElementKind.FIELD) {
       String fieldName = backend.namer.instanceFieldPropertyName(superMethod);
       use(node.inputs[0]);
@@ skipping 20 matching lines @@
           // TODO(floitsch): we know the target. We shouldn't register a
           // dynamic getter.
           registry.registerDynamicGetter(selector);
           registry.registerGetterForSuperMethod(node.element);
           methodName = backend.namer.invocationName(selector);
         } else {
           assert(invariant(node, compiler.hasIncrementalSupport));
           methodName = backend.namer.getNameOfInstanceMember(superMethod);
         }
         push(js.js('#.prototype.#.call(#)',
-                   [backend.namer.elementAccess(superClass),
+                   [backend.emitter.globalPropertyAccess(superClass),

[floitsch, 2014/12/03 17:02:26]

jsConstructorAccess
oder
prototypeAccess (since we are going to the prototype).

[zarah, 2014/12/05 08:22:52]

Done.

                     methodName, visitArguments(node.inputs, start: 0)]),
              node);
       } else {
         use(node.receiver);
         push(
           js.js('#.#(#)', [
             pop(), backend.namer.getNameOfAliasedSuperMember(superMethod),
             visitArguments(node.inputs, start: 1)]), // Skip receiver argument.
           node);
       }
@@ skipping 82 matching lines @@
         interpolatedExpressions.add(pop());
       }
       push(node.codeTemplate.instantiate(interpolatedExpressions));
     }
 
     // TODO(sra): Tell world.nativeEnqueuer about the types created here.
     registerForeignTypes(node);
   }
 
   visitForeignNew(HForeignNew node) {
-    js.Expression jsClassReference = backend.namer.elementAccess(node.element);
+    js.Expression jsClassReference =
+        backend.emitter.globalPropertyAccess(node.element);

[floitsch, 2014/12/03 17:02:26]

jsConstructorAccess

[zarah, 2014/12/05 08:22:52]

Done.

     List<js.Expression> arguments = visitArguments(node.inputs, start: 0);
     push(new js.New(jsClassReference, arguments), node);
     registerForeignTypes(node);
     if (node.instantiatedTypes == null) {
       return;
     }
     node.instantiatedTypes.forEach((type) {
       registry.registerInstantiatedType(type);
     });
   }
@@ skipping 217 matching lines @@
       thenBody = unwrapStatement(thenBody);
       pushStatement(new js.If.noElse(underOver, thenBody), node);
     } else {
       generateThrowWithHelper('ioore', [node.array, node.index]);
     }
   }
 
   void generateThrowWithHelper(String helperName, argument) {
     Element helper = backend.findHelper(helperName);
     registry.registerStaticUse(helper);
-    js.Expression jsHelper = backend.namer.elementAccess(helper);
+    js.Expression jsHelper = backend.emitter.globalPropertyAccess(helper);

[floitsch, 2014/12/03 17:02:26]

staticFunctionAccess

[zarah, 2014/12/05 08:22:52]

Done.

     List arguments = [];
     var location;
     if (argument is List) {
       location = argument[0];
       argument.forEach((instruction) {
         use(instruction);
         arguments.add(pop());
       });
     } else {
       location = argument;
@@ skipping 12 matching lines @@
     }
   }
 
   visitThrowExpression(HThrowExpression node) {
     HInstruction argument = node.inputs[0];
     use(argument);
 
     Element helper = backend.findHelper("throwExpression");
     registry.registerStaticUse(helper);
 
-    js.Expression jsHelper = backend.namer.elementAccess(helper);
+    js.Expression jsHelper = backend.emitter.globalPropertyAccess(helper);

[floitsch, 2014/12/03 17:02:26]

staticFunctionAccess

[zarah, 2014/12/05 08:22:51]

Done.

     js.Call value = new js.Call(jsHelper, [pop()]);
     value = attachLocation(value, argument);
     push(value, node);
   }
 
   void visitSwitch(HSwitch node) {
     // Switches are handled using [visitSwitchInfo].
   }
 
   void visitStatic(HStatic node) {
     Element element = node.element;
     if (element.isFunction) {
       push(backend.namer.isolateStaticClosureAccess(node.element));
     } else {
-      push(backend.namer.elementAccess(node.element));
+      push(backend.emitter.globalPropertyAccess(node.element));

[floitsch, 2014/12/03 17:02:26]

not sure.
I don't think it's a staticFunctionAccess, but I'm not sure.

[zarah, 2014/12/05 08:22:51]

FieldAccess.

     }
     registry.registerStaticUse(element);
   }
 
   void visitLazyStatic(HLazyStatic node) {
     Element element = node.element;
     registry.registerStaticUse(element);
     js.Expression lazyGetter =
         backend.namer.isolateLazyInitializerAccess(element);
     js.Call call = new js.Call(lazyGetter, <js.Expression>[]);
     push(call, node);
   }
 
   void visitStaticStore(HStaticStore node) {
     registry.registerStaticUse(node.element);
-    js.Node variable = backend.namer.elementAccess(node.element);
+    js.Node variable = backend.emitter.globalPropertyAccess(node.element);

[floitsch, 2014/12/03 17:02:26]

staticFieldAccess

[zarah, 2014/12/05 08:22:51]

Done.

     use(node.inputs[0]);
     push(new js.Assignment(variable, pop()), node);
   }
 
   void visitStringConcat(HStringConcat node) {
     use(node.left);
     js.Expression jsLeft = pop();
     use(node.right);
     push(new js.Binary('+', jsLeft, pop()), node);
   }
@@ skipping 10 matching lines @@
           && node.usedBy[0] is HStringConcat
           && node.usedBy[0].inputs[1] == node) {
         // The context is already <string> + value.
       } else {
         // Force an empty string for the first operand.
         push(new js.Binary('+', js.string(""), pop()), node);
       }
     } else {
       Element convertToString = backend.getStringInterpolationHelper();
       registry.registerStaticUse(convertToString);
-      js.Expression jsHelper = backend.namer.elementAccess(convertToString);
+      js.Expression jsHelper =
+          backend.emitter.globalPropertyAccess(convertToString);

[floitsch, 2014/12/03 17:02:26]

staticFunctionAccess

[zarah, 2014/12/05 08:22:52]

Done.

       use(input);
       push(new js.Call(jsHelper, <js.Expression>[pop()]), node);
     }
   }
 
   void visitLiteralList(HLiteralList node) {
     registry.registerInstantiatedClass(compiler.listClass);
     generateArrayLiteral(node);
   }
 
@@ skipping 534 matching lines @@
   void visitReadTypeVariable(HReadTypeVariable node) {
     TypeVariableElement element = node.dartType.element;
     Element helperElement = backend.findHelper('convertRtiToRuntimeType');
     registry.registerStaticUse(helperElement);
 
     use(node.inputs[0]);
     if (node.hasReceiver) {
       if (backend.isInterceptorClass(element.enclosingClass)) {
         int index = RuntimeTypes.getTypeVariableIndex(element);
         js.Expression receiver = pop();
-        js.Expression helper = backend.namer.elementAccess(helperElement);
+        js.Expression helper = backend.emitter.globalPropertyAccess(helperElement);

[floitsch, 2014/12/03 17:02:26]

staticFunctionAccess

long line.

[zarah, 2014/12/05 08:22:52]

Done.

         push(js.js(r'#(#.$builtinTypeInfo && #.$builtinTypeInfo[#])',
                 [helper, receiver, receiver, js.js.number(index)]));
       } else {
         backend.emitter.registerReadTypeVariable(element);
         push(js.js('#.#()',
                 [pop(), backend.namer.readTypeVariableName(element)]));
       }
     } else {
       push(js.js('#(#)', [
-          backend.namer.elementAccess(
+          backend.emitter.globalPropertyAccess(

[floitsch, 2014/12/03 17:02:26]

staticFunctionAccess

[zarah, 2014/12/05 08:22:52]

Done.

               backend.findHelper('convertRtiToRuntimeType')),
           pop()]));
     }
   }
 
   void visitInterfaceType(HInterfaceType node) {
     List<js.Expression> typeArguments = <js.Expression>[];
     for (HInstruction type in node.inputs) {
       use(type);
       typeArguments.add(pop());
     }
 
     ClassElement cls = node.dartType.element;
-    var arguments = [backend.namer.elementAccess(cls)];
+    var arguments = [backend.emitter.globalPropertyAccess(cls)];

[floitsch, 2014/12/03 17:02:26]

classAccess

[zarah, 2014/12/05 08:22:52]

Done.

     if (!typeArguments.isEmpty) {
       arguments.add(new js.ArrayInitializer(typeArguments));
     }
     push(js.js('#(#)', [accessHelper('buildInterfaceType'), arguments]));
   }
 
   void visitVoidType(HVoidType node) {
     push(js.js('#()', accessHelper('getVoidRuntimeType')));
   }
 
   void visitDynamicType(HDynamicType node) {
     push(js.js('#()', accessHelper('getDynamicRuntimeType')));
   }
 
   js.PropertyAccess accessHelper(String name) {
     Element helper = backend.findHelper(name);
     if (helper == null) {
       // For mocked-up tests.
       return js.js('(void 0).$name');
     }
     registry.registerStaticUse(helper);
-    return backend.namer.elementAccess(helper);
+    return backend.emitter.globalPropertyAccess(helper);

[floitsch, 2014/12/03 17:02:26]

staticFunctionAccess

[zarah, 2014/12/05 08:22:52]

Done.

   }
 }