Fix source locations for inlined and patched functions.

lib/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.
 
 class SsaCodeGeneratorTask extends CompilerTask {
 
   final JavaScriptBackend backend;
 
   SsaCodeGeneratorTask(JavaScriptBackend backend)
       : this.backend = backend,
         super(backend.compiler);
   String get name => 'SSA code generator';
   NativeEmitter get nativeEmitter => backend.emitter.nativeEmitter;
 
 
   js.Fun buildJavaScriptFunction(FunctionElement element,
                                  List<js.Parameter> parameters,
                                  js.Block body) {
     FunctionExpression expression = element.cachedNode;
     js.Fun result = new js.Fun(parameters, body);
-    result.sourcePosition = expression.getBeginToken();
-    result.endSourcePosition = expression.getEndToken();
+    Element sourceElement = element.patch == null ? element : element.patch;

[ahe, 2012/09/08 08:55:50]

Another TODO for Johnni.

[podivilov, 2012/09/10 11:13:23]

Done.

+    SourceFile sourceFile = sourceElement.getCompilationUnit().script.file;
+    result.sourcePosition = new SourceFileLocation(
+        sourceFile, expression.getBeginToken());
+    result.endSourcePosition = new SourceFileLocation(
+        sourceFile, expression.getEndToken());
     return result;
   }
 
-  CodeBuffer prettyPrint(js.Node node, Element positionElement) {
-    return js.prettyPrint(node, compiler, positionElement);
+  CodeBuffer prettyPrint(js.Node node) {
+    return js.prettyPrint(node, compiler);
   }
 
   CodeBuffer generateCode(WorkItem work, HGraph graph) {
     if (work.element.isField()) {
       return generateLazyInitializer(work, graph);
     } else {
       return generateMethod(work, graph);
     }
   }
 
   CodeBuffer generateLazyInitializer(work, graph) {
     return measure(() {
       compiler.tracer.traceGraph("codegen", graph);
       List<js.Parameter> parameters = <js.Parameter>[];
       SsaOptimizedCodeGenerator codegen = new SsaOptimizedCodeGenerator(
           backend, work, parameters, new Map<Element, String>());
       codegen.visitGraph(graph);
       js.Block body = codegen.body;
-      Element element = work.element;
       js.Fun fun = new js.Fun(parameters, body);
-      return prettyPrint(fun, element);
+      return prettyPrint(fun);
     });
   }
 
   CodeBuffer generateMethod(WorkItem work, HGraph graph) {
     return measure(() {
       JavaScriptItemCompilationContext context = work.compilationContext;
       HTypeMap types = context.types;
       graph.exit.predecessors.forEach((block) {
         assert(block.last is HGoto || block.last is HReturn);
         if (block.last is HReturn) {
@@ skipping 22 matching lines @@
       ClassElement enclosingClass = element.getEnclosingClass();
       if (element.isInstanceMember()
           && enclosingClass.isNative()
           && native.isOverriddenMethod(
               element, enclosingClass, nativeEmitter)) {
         // Record that this method is overridden. In case of optional
         // arguments, the emitter will generate stubs to handle them,
         // and needs to know if the method is overridden.
         nativeEmitter.overriddenMethods.add(element);
         StringBuffer buffer = new StringBuffer();
-        String codeString = prettyPrint(codegen.body, work.element).toString();
+        String codeString = prettyPrint(codegen.body).toString();
         native.generateMethodWithPrototypeCheckForElement(
             compiler, buffer, element, codeString, parametersString);
         js.Node nativeCode = new js.LiteralStatement(buffer.toString());
         body = new js.Block(<js.Statement>[nativeCode]);
       } else {
         body = codegen.body;
       }
       js.Fun fun = buildJavaScriptFunction(element, parameters, body);
-      return prettyPrint(fun, work.element);
+      return prettyPrint(fun);
     });
   }
 
   void addTypeParameters(Element element,
                         List<js.Parameter> parameters,
                         Map<Element, String> parameterNames) {
     if (element.isFactoryConstructor() || element.isGenerativeConstructor()) {
       ClassElement cls = element.enclosingElement;
       cls.typeVariables.forEach((TypeVariableType typeVariable) {
         String name = typeVariable.element.name.slowToString();
@@ skipping 22 matching lines @@
 
       SsaUnoptimizedCodeGenerator codegen = new SsaUnoptimizedCodeGenerator(
           backend, work, parameters, parameterNames);
       codegen.visitGraph(graph);
 
       js.Block body = new js.Block(<js.Statement>[]);
       if (codegen.setup != null) body.statements.add(codegen.setup);
       body.statements.add(codegen.body);
       js.Fun fun =
           buildJavaScriptFunction(work.element, codegen.newParameters, body);
-      return prettyPrint(fun, work.element);
+      return prettyPrint(fun);
     });
   }
 
   Map<Element, String> getParameterNames(WorkItem work) {
     Map<Element, String> parameterNames = new LinkedHashMap<Element, String>();
     FunctionElement function = work.element;
 
     // The dom/html libraries have inline JS code that reference
     // parameter names directly. Long-term such code will be rejected.
     // Now, just don't mangle the parameter name.
@@ skipping 177 matching lines @@
 
   js.Expression pop() {
     return expressionStack.removeLast();
   }
 
   attachLocationToLast(HInstruction instruction) {
     attachLocation(expressionStack.last(), instruction);
   }
 
   js.Node attachLocation(js.Node jsNode, HInstruction instruction) {
-    if (instruction.sourcePosition !== null) {
-      jsNode.sourcePosition = instruction.sourcePosition;
-    }
+    jsNode.sourcePosition = instruction.sourcePosition;
     return jsNode;
   }
 
-  js.Node attachLocationRange(js.Node jsNode, Node node) {
-    jsNode.sourcePosition = node.getBeginToken();
-    jsNode.endSourcePosition = node.getEndToken();
+  js.Node attachLocationRange(js.Node jsNode,
+                              SourceFileLocation sourcePosition,
+                              SourceFileLocation endSourcePosition) {
+    jsNode.sourcePosition = sourcePosition;
+    jsNode.endSourcePosition = endSourcePosition;
     return jsNode;
   }
 
   abstract visitTypeGuard(HTypeGuard node);
   abstract visitBailoutTarget(HBailoutTarget node);
 
   abstract beginGraph(HGraph graph);
   abstract endGraph(HGraph graph);
 
   abstract beginLoop(HBasicBlock block);
@@ skipping 563 matching lines @@
         currentContainer = oldContainer;
         body = unwrapStatement(body);
         loop = new js.Do(body, jsCondition);
         break;
       }
       default:
         compiler.internalError(
           'Unexpected loop kind: ${info.kind}',
           instruction: condition.conditionExpression);
     }
-    attachLocationRange(loop, info.sourcePosition);
+    attachLocationRange(loop, info.sourcePosition, info.endSourcePosition);
     pushStatement(wrapIntoLabels(loop, info.labels));
     return true;
   }
 
   bool visitLabeledBlockInfo(HLabeledBlockInformation labeledBlockInfo) {
     preLabeledBlock(labeledBlockInfo);
     Link<Element> continueOverrides = const EmptyLink<Element>();
 
     js.Block oldContainer = currentContainer;
     js.Block body = new js.Block.empty();
@@ skipping 1634 matching lines @@
     currentContainer = new js.Block.empty();
   }
 
   void endLoop(HBasicBlock block) {
     js.Statement body = currentContainer;
     currentContainer = oldContainerStack.removeLast();
     body = unwrapStatement(body);
     js.While loop = new js.While(new js.LiteralBool(true), body);
 
     HLoopInformation info = block.loopInformation;
-    attachLocationRange(loop, info.loopBlockInformation.sourcePosition);
+    attachLocationRange(loop,
+                        info.loopBlockInformation.sourcePosition,
+                        info.loopBlockInformation.endSourcePosition);
     pushStatement(wrapIntoLabels(loop, info.labels));
   }
 
   void handleLoopCondition(HLoopBranch node) {
     use(node.inputs[0]);
     pushStatement(new js.If.noElse(pop(), new js.Break(null)), node);
   }
 
 
   void preLabeledBlock(HLabeledBlockInformation labeledBlockInfo) {
@@ skipping 233 matching lines @@
     HLoopInformation info = header.loopInformation;
     if (header.hasBailoutTargets()) {
       endBailoutSwitch();
       if (info.target != null) breakAction.remove(info.target);
     }
 
     js.Statement body = unwrapStatement(currentContainer);
     currentContainer = oldContainerStack.removeLast();
 
     js.Statement result = new js.While(new js.LiteralBool(true), body);
-    attachLocationRange(result, info.loopBlockInformation.sourcePosition);
+    attachLocationRange(result,
+                        info.loopBlockInformation.sourcePosition,
+                        info.loopBlockInformation.endSourcePosition);
     result = new js.LabeledStatement(loopLabel, result);
     result = wrapIntoLabels(result, info.labels);
     pushStatement(result);
   }
 
   void handleLoopCondition(HLoopBranch node) {
     use(node.inputs[0]);
     js.Expression test = new js.Prefix('!', pop());
     js.Statement then = new js.Break(currentLabel());
     pushStatement(new js.If.noElse(test, then), node);
@@ skipping 81 matching lines @@
   if (leftType.canBeNull() && rightType.canBeNull()) {
     if (left.isConstantNull() || right.isConstantNull() ||
         (leftType.isPrimitive() && leftType == rightType)) {
       return '==';
     }
     return null;
   } else {
     return '===';
   }
 }