Associate partial source map with each code block in Universe.generatedCode.

lib/compiler/implementation/universe.dart

Index: lib/compiler/implementation/universe.dart
diff --git a/lib/compiler/implementation/universe.dart b/lib/compiler/implementation/universe.dart
index 635cd737cf1c19b9d2425842d930e1644221f751..2908eadbbe49f380aa647f397888986b863964ec 100644
--- a/lib/compiler/implementation/universe.dart
+++ b/lib/compiler/implementation/universe.dart
@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 class Universe {
-  Map<Element, String> generatedCode;
-  Map<Element, String> generatedBailoutCode;
+  Map<Element, CodeBlock> generatedCode;
+  Map<Element, CodeBlock> generatedBailoutCode;
   final Set<ClassElement> instantiatedClasses;
   final Set<SourceString> instantiatedClassInstanceFields;
   final Set<FunctionElement> staticFunctionsNeedingGetter;
@@ -17,8 +17,8 @@ class Universe {
   final Set<Element> isChecks;
   final RuntimeTypeInformation rti;
 
-  Universe() : generatedCode = new Map<Element, String>(),
-               generatedBailoutCode = new Map<Element, String>(),
+  Universe() : generatedCode = new Map<Element, CodeBlock>(),
+               generatedBailoutCode = new Map<Element, CodeBlock>(),
                instantiatedClasses = new Set<ClassElement>(),
                instantiatedClassInstanceFields = new Set<SourceString>(),
                staticFunctionsNeedingGetter = new Set<FunctionElement>(),
@@ -30,12 +30,12 @@ class Universe {
                isChecks = new Set<Element>(),
                rti = new RuntimeTypeInformation();
 
-  void addGeneratedCode(WorkItem work, String code) {
-    generatedCode[work.element] = code;
+  void addGeneratedCode(WorkItem work, CodeBlock codeBlock) {
+    generatedCode[work.element] = codeBlock;
   }
 
-  void addBailoutCode(WorkItem work, String code) {
-    generatedBailoutCode[work.element] = code;
+  void addBailoutCode(WorkItem work, CodeBlock codeBlock) {
+    generatedBailoutCode[work.element] = codeBlock;
   }
 
   bool hasMatchingSelector(Set<Selector> selectors,