Fix source information positions for deserialized patched elements.

pkg/compiler/lib/src/io/start_end_information.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.
 
 /// Source information system that maps spans of Dart AST nodes to spans of
 /// JavaScript nodes.
 
 library dart2js.source_information.start_end;
 
 import '../common.dart';
@@ skipping 45 matching lines @@
     if (other is! StartEndSourceInformation) return false;
     return startPosition == other.startPosition &&
         endPosition == other.endPosition;
   }
 
   // TODO(johnniwinther): Inline this in
   // [StartEndSourceInformationBuilder.buildDeclaration].
   static StartEndSourceInformation _computeSourceInformation(
       ResolvedAst resolvedAst) {
     String name = computeElementNameForSourceMaps(resolvedAst.element);
-    SourceFile sourceFile;
+    SourceFile sourceFile = computeSourceFile(resolvedAst);
     int begin;
     int end;
     if (resolvedAst.kind != ResolvedAstKind.PARSED) {
       // Synthesized node. Use the enclosing element for the location.
-      sourceFile = resolvedAst.element.compilationUnit.script.file;
       begin = end = resolvedAst.element.sourcePosition.begin;
     } else {
-      AstElement implementation = resolvedAst.element.implementation;
-      sourceFile = implementation.compilationUnit.script.file;
       Node node = resolvedAst.node;
       begin = node.getBeginToken().charOffset;
       end = node.getEndToken().charOffset;
     }
     // TODO(johnniwinther): find the right sourceFile here and remove offset
     // checks below.
     SourceLocation sourcePosition, endSourcePosition;
     if (begin < sourceFile.length) {
       sourcePosition = new OffsetSourceLocation(sourceFile, begin, name);
     }
@@ skipping 23 matching lines @@
   String toString() {
     return _computeText('${startPosition.sourceUri}');
   }
 }
 
 class StartEndSourceInformationStrategy
     extends JavaScriptSourceInformationStrategy {
   const StartEndSourceInformationStrategy();
 
   @override
-  SourceInformationBuilder createBuilderForContext(AstElement element) {
-    return new StartEndSourceInformationBuilder(element);
+  SourceInformationBuilder createBuilderForContext(ResolvedAst resolvedAst) {
+    return new StartEndSourceInformationBuilder(resolvedAst);
   }
 
   @override
   SourceInformationProcessor createProcessor(SourceMapper sourceMapper) {
     return new StartEndSourceInformationProcessor(sourceMapper);
   }
 }
 
 class StartEndSourceInformationProcessor extends SourceInformationProcessor {
   final SourceMapper sourceMapper;
@@ skipping 20 matching lines @@
       }
     }
   }
 }
 
 /// [SourceInformationBuilder] that generates [PositionSourceInformation].
 class StartEndSourceInformationBuilder extends SourceInformationBuilder {
   final SourceFile sourceFile;
   final String name;
 
-  StartEndSourceInformationBuilder(AstElement element)
-      : sourceFile = element.compilationUnit.script.file,
-        name = computeElementNameForSourceMaps(element);
+  StartEndSourceInformationBuilder(ResolvedAst resolvedAst)
+      : sourceFile = computeSourceFile(resolvedAst),
+        name = computeElementNameForSourceMaps(resolvedAst.element);
 
   SourceInformation buildDeclaration(ResolvedAst resolvedAst) {
     return StartEndSourceInformation._computeSourceInformation(resolvedAst);
   }
 
   SourceLocation sourceFileLocationForToken(Token token) {
     SourceLocation location =
         new OffsetSourceLocation(sourceFile, token.charOffset, name);
     checkValidSourceFileLocation(location, sourceFile, token.charOffset);
     return location;
@@ skipping 38 matching lines @@
 
   @override
   SourceInformation buildCall(Node receiver, Node call) {
     return buildGeneric(receiver);
   }
 
   @override
   SourceInformation buildIf(Node node) => buildGeneric(node);
 
   @override
-  SourceInformationBuilder forContext(AstElement element,
+  SourceInformationBuilder forContext(ResolvedAst resolvedAst,
       {SourceInformation sourceInformation}) {
-    return new StartEndSourceInformationBuilder(element);
+    return new StartEndSourceInformationBuilder(resolvedAst);
   }
 }