Functional JavaScript AST source position updates

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 13 matching lines @@
     Token endToken;
     if (expression == null) {
       // Synthesized node. Use the enclosing element for the location.
       beginToken = endToken = element.position();
     } else {
       beginToken = expression.getBeginToken();
       endToken = expression.getEndToken();
     }
     // TODO(podivilov): find the right sourceFile here and remove offset
     // checks below.
+    var sourcePosition, endSourcePosition;
     if (beginToken.charOffset < sourceFile.length) {
-      node.sourcePosition =
-          new TokenSourceFileLocation(sourceFile, beginToken);
+      sourcePosition = new TokenSourceFileLocation(sourceFile, beginToken);
     }
     if (endToken.charOffset < sourceFile.length) {
-      node.endSourcePosition =
-          new TokenSourceFileLocation(sourceFile, endToken);
+      endSourcePosition = new TokenSourceFileLocation(sourceFile, endToken);
     }
-    return node;
+    return node.withPosition(sourcePosition, endSourcePosition);
   }
 
   SourceFile sourceFileOfElement(Element element) {
     // TODO(johnniwinther): remove the 'element.patch' hack.
     FunctionElement functionElement = element.asFunctionElement();
     if (functionElement != null && functionElement.patch != null) {
       element = functionElement.patch;
     }
     return element.getCompilationUnit().script.file;
   }
@@ skipping 144 matching lines @@
     return hasNonBitOpUser(instruction, new Set<HPhi>());
   }
 
   /**
    * If the [instruction] is not `null` it will be used to attach the position
    * to the [statement].
    */
   void pushStatement(js.Statement statement, [HInstruction instruction]) {
     assert(expressionStack.isEmpty);
     if (instruction != null) {
-      attachLocation(statement, instruction);
+      statement = attachLocation(statement, instruction);
     }
     currentContainer.statements.add(statement);
   }
 
   void insertStatementAtStart(js.Statement statement) {
     currentContainer.statements.insert(0, statement);
   }
 
   /**
    * If the [instruction] is not `null` it will be used to attach the position
    * to the [expression].
    */
   pushExpressionAsStatement(js.Expression expression,
                             [HInstruction instruction]) {
     pushStatement(new js.ExpressionStatement(expression), instruction);
   }
 
   /**
    * If the [instruction] is not `null` it will be used to attach the position
    * to the [expression].
    */
   push(js.Expression expression, [HInstruction instruction]) {
     if (instruction != null) {
-      attachLocation(expression, instruction);
+      expression = attachLocation(expression, instruction);
     }
     expressionStack.add(expression);
   }
 
   js.Expression pop() {
     return expressionStack.removeLast();
   }
 
   attachLocationToLast(HInstruction instruction) {
-    attachLocation(expressionStack.last, instruction);
+    int index = expressionStack.length - 1;
+    expressionStack[index] =
+        attachLocation(expressionStack[index], instruction);
   }
 
   js.Node attachLocation(js.Node jsNode, HInstruction instruction) {
-    jsNode.sourcePosition = instruction.sourcePosition;
-    return jsNode;
+    return jsNode.withLocation(instruction.sourcePosition);
   }
 
   js.Node attachLocationRange(js.Node jsNode,
                               SourceFileLocation sourcePosition,
                               SourceFileLocation endSourcePosition) {
-    jsNode.sourcePosition = sourcePosition;
-    jsNode.endSourcePosition = endSourcePosition;
-    return jsNode;
+    return jsNode.withPosition(sourcePosition, endSourcePosition);
   }
 
   void preGenerateMethod(HGraph graph) {
     new SsaInstructionSelection(compiler).visitGraph(graph);
     new SsaTypeKnownRemover().visitGraph(graph);
     new SsaInstructionMerger(generateAtUseSite, compiler).visitGraph(graph);
     new SsaConditionMerger(
         generateAtUseSite, controlFlowOperators).visitGraph(graph);
     SsaLiveIntervalBuilder intervalBuilder = new SsaLiveIntervalBuilder(
         compiler, generateAtUseSite, controlFlowOperators);
@@ skipping 648 matching lines @@
             jsCondition = newLiteralBool(true);
           }
           loop = new js.Do(unwrapStatement(body), jsCondition);
         }
         currentContainer = oldContainer;
         break;
       default:
         compiler.internalError(condition.conditionExpression,
             'Unexpected loop kind: ${info.kind}.');
     }
-    attachLocationRange(loop, info.sourcePosition, info.endSourcePosition);
+    loop = attachLocationRange(loop, info.sourcePosition, info.endSourcePosition);

[floitsch, 2014/04/28 12:28:11]

long line.

[sra1, 2014/04/28 18:24:09]

Done.

     js.Statement result = loop;
     if (info.kind == HLoopBlockInformation.SWITCH_CONTINUE_LOOP) {
       String continueLabelString =
           backend.namer.implicitContinueLabelName(info.target);
       result = new js.LabeledStatement(continueLabelString, result);
     }
     pushStatement(wrapIntoLabels(result, info.labels));
     return true;
   }
 
@@ skipping 1060 matching lines @@
       argument.forEach((instruction) {
         use(instruction);
         arguments.add(pop());
       });
     } else {
       location = argument;
       use(argument);
       arguments.add(pop());
     }
     js.Call value = new js.Call(jsHelper, arguments);
-    attachLocation(value, location);
+    value = attachLocation(value, location);
     // BUG(4906): Using throw/return here adds to the size of the generated code
     // but it has the advantage of explicitly telling the JS engine that
     // this code path will terminate abruptly. Needs more work.
     if (helperName == 'wrapException') {
       pushStatement(new js.Throw(value));
     } else {
       pushStatement(new js.Return(value));
     }
   }
 
   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.Call value = new js.Call(jsHelper, [pop()]);
-    attachLocation(value, argument);
+    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()) {
@@ skipping 647 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);
   }
 }