Refactor handling of source map information.

pkg/compiler/lib/src/compiler.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 dart2js;
 
 /**
  * If true, print a warning for each method that was resolved, but not
  * compiled.
  */
@@ skipping 1888 matching lines @@
     Token position = element.position;
     Uri uri = element.compilationUnit.script.readableUri;
     return (position == null)
         ? new SourceSpan(uri, 0, 0)
         : spanFromTokens(position, position, uri);
   }
 
   SourceSpan spanFromHInstruction(HInstruction instruction) {
     Element element = _elementFromHInstruction(instruction);
     if (element == null) element = currentElement;
-    var position = instruction.sourcePosition;
+    SourceInformation position = instruction.sourceInformation;
     if (position == null) return spanFromElement(element);
-    Token token = position.token;
-    if (token == null) return spanFromElement(element);
-    Uri uri = element.compilationUnit.script.readableUri;
-    return spanFromTokens(token, token, uri);
+    return position.sourceSpan;
   }
 
   /**
    * Translates the [resolvedUri] into a readable URI.
    *
    * The [importingLibrary] holds the library importing [resolvedUri] or
    * [:null:] if [resolvedUri] is loaded as the main library. The
    * [importingLibrary] is used to grant access to internal libraries from
    * platform libraries and patch libraries.
    *
@@ skipping 482 matching lines @@
     return futureClass.computeType(compiler).createInstantiation([elementType]);
   }
 
   @override
   InterfaceType streamType([DartType elementType = const DynamicType()]) {
     return streamClass.computeType(compiler).createInstantiation([elementType]);
   }
 }
 
 typedef void InternalErrorFunction(Spannable location, String message);