Avoid generating VariableUse nodes with non-identifier names

sdk/lib/_internal/compiler/implementation/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 1595 matching lines @@
     List<DartType> instantiatedTypes = node.instantiatedTypes;
 
     world.registerStaticUse(element);
 
     if (instantiatedTypes != null && !instantiatedTypes.isEmpty) {
       instantiatedTypes.forEach((type) {
         world.registerInstantiatedType(type, work.resolutionTree);
       });
     }
 
-    push(new js.VariableUse(backend.namer.isolateAccess(node.element)));
+    push(backend.namer.elementAccess(node.element));
     push(new js.Call(pop(), visitArguments(node.inputs, start: 0)), node);
   }
 
   visitInvokeSuper(HInvokeSuper node) {
     Element superMethod = node.element;
     world.registerStaticUse(superMethod);
     ClassElement superClass = superMethod.getEnclosingClass();
     if (superMethod.kind == ElementKind.FIELD) {
       String fieldName = backend.namer.instanceFieldPropertyName(superMethod);
       use(node.inputs[0]);
@@ skipping 111 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) {
-    String jsClassReference = backend.namer.isolateAccess(node.element);
+    js.Expression jsClassReference = backend.namer.elementAccess(node.element);
     List<js.Expression> arguments = visitArguments(node.inputs, start: 0);
-    // TODO(floitsch): jsClassReference is an Access. We shouldn't treat it
-    // as if it was a string.
-    push(new js.New(new js.VariableUse(jsClassReference), arguments), node);
+    push(new js.New(jsClassReference, arguments), node);
     registerForeignTypes(node);
     if (node.instantiatedTypes == null) {
       return;
     }
     node.instantiatedTypes.forEach((type) {
       world.registerInstantiatedType(type, work.resolutionTree);
     });
   }
 
   js.Expression newLiteralBool(bool value) {
@@ skipping 215 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 = compiler.findHelper(helperName);
     world.registerStaticUse(helper);
-    js.VariableUse jsHelper =
-        new js.VariableUse(backend.namer.isolateAccess(helper));
+    js.Expression jsHelper = backend.namer.elementAccess(helper);
     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 = compiler.findHelper("throwExpression");
     world.registerStaticUse(helper);
 
-    js.VariableUse jsHelper =
-        new js.VariableUse(backend.namer.isolateAccess(helper));
+    js.Expression jsHelper = backend.namer.elementAccess(helper);
     js.Call value = new js.Call(jsHelper, [pop()]);
     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(new js.VariableUse(
-          backend.namer.isolateStaticClosureAccess(node.element)));
+      push(backend.namer.isolateStaticClosureAccess(node.element));
     } else {
-      push(new js.VariableUse(backend.namer.isolateAccess(node.element)));
+      push(backend.namer.elementAccess(node.element));
     }
     world.registerStaticUse(element);
   }
 
   void visitLazyStatic(HLazyStatic node) {
     Element element = node.element;
     world.registerStaticUse(element);
-    String lazyGetter = backend.namer.isolateLazyInitializerAccess(element);
-    js.VariableUse target = new js.VariableUse(lazyGetter);
-    js.Call call = new js.Call(target, <js.Expression>[]);
+    js.Expression lazyGetter = backend.namer.isolateLazyInitializerAccess(element);

[floitsch, 2014/04/28 14:17:51]

long line.

[sra1, 2014/04/28 23:00:41]

Done.

+    //js.VariableUse target = new js.VariableUse(lazyGetter);

[floitsch, 2014/04/28 14:17:51]

dead code.

[sra1, 2014/04/28 23:00:41]

Done.

+    js.Call call = new js.Call(lazyGetter, <js.Expression>[]);
     push(call, node);
   }
 
   void visitStaticStore(HStaticStore node) {
     world.registerStaticUse(node.element);
     js.Node variable = backend.namer.elementAccess(node.element);
     use(node.inputs[0]);
     push(new js.Assignment(variable, pop()), node);
   }
 
@@ skipping 16 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();
       world.registerStaticUse(convertToString);
-      js.VariableUse variableUse =
-          new js.VariableUse(backend.namer.isolateAccess(convertToString));
+      js.Expression jsHelper = backend.namer.elementAccess(convertToString);
       use(input);
-      push(new js.Call(variableUse, <js.Expression>[pop()]), node);
+      push(new js.Call(jsHelper, <js.Expression>[pop()]), node);
     }
   }
 
   void visitLiteralList(HLiteralList node) {
     world.registerInstantiatedClass(
         compiler.listClass, work.resolutionTree);
     generateArrayLiteral(node);
   }
 
   void generateArrayLiteral(HLiteralList node) {
@@ skipping 583 matching lines @@
   js.PropertyAccess accessHelper(String name) {
     Element helper = compiler.findHelper(name);
     if (helper == null) {
       // For mocked-up tests.
       return js.js('(void 0).$name');
     }
     world.registerStaticUse(helper);
     return backend.namer.elementAccess(helper);
   }
 }