Fix source locations for inlined and patched functions.

tests/compiler/dart2js/source_mapping_test.dart

Index: tests/compiler/dart2js/source_mapping_test.dart
diff --git a/tests/compiler/dart2js/source_mapping_test.dart b/tests/compiler/dart2js/source_mapping_test.dart
index e51d55a9746aedaa2dd0d716c7b851729bc961aa..af417c1777f192f64dca970e0cb564931a661f59 100644
--- a/tests/compiler/dart2js/source_mapping_test.dart
+++ b/tests/compiler/dart2js/source_mapping_test.dart
@@ -30,10 +30,9 @@ void testSourceMapLocations(String codeWithMarkers) {
   CodeBuffer buffer = compileAll(sourceFile);
 
   Set<int> locations = new Set<int>();
-  buffer.forEachSourceLocation((var element, var token, int offset) {
-    if (element != null &&
-        element.getCompilationUnit().script.file == sourceFile) {
-      locations.add(token.charOffset);
+  buffer.forEachSourceLocation((int offset, var sourcePosition) {
+    if (sourcePosition != null && sourcePosition.sourceFile == sourceFile) {
+      locations.add(sourcePosition.token.charOffset);
     }
   });