Generalize the use of type information for setters and initializers

lib/compiler/implementation/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.
 
 
 /**
  * If true, print a warning for each method that was resolved, but not
  * compiled.
  */
 final bool REPORT_EXCESS_RESOLUTION = false;
@@ skipping 103 matching lines @@
     Map<Element, HType> fields =
         fieldInitializers.putIfAbsent(
           field.enclosingElement, () => new Map<Element, HType>());
     if (!fields.containsKey(field)) {
       fields[field] = propagatedType;
     } else {
       fields[field] = fields[field].union(propagatedType);
     }
   }
 
-  bool couldHaveFieldSingleTypeInitializers(Element field,
-                                            HType requestedType) {
+  HType typeFromInitializersSoFar(Element field) {
     assert(field.isField());
     assert(field.enclosingElement.isClass());
-    // If there is no information on the initializer it might still be
-    // initialized to integers only.
-    if (!fieldInitializers.containsKey(field.enclosingElement)) return true;
+    if (!fieldInitializers.containsKey(field.enclosingElement)) {
+      return HType.UNKNOWN;
+    }
     Map<Element, HType> fields = fieldInitializers[field.enclosingElement];
-    HType propagatedType = fields[field];
-    if (propagatedType == null) return true;
-    return propagatedType == requestedType;
-  }
-
-  bool hasFieldSingleTypeInitializers(Element field, HType requestedType) {
-    assert(field.isField());
-    assert(field.enclosingElement.isClass());
-    if (!fieldInitializers.containsKey(field.enclosingElement)) return false;
-    Map<Element, HType> fields = fieldInitializers[field.enclosingElement];
-    HType propagatedType = fields[field];
-    if (propagatedType == null) return false;
-    return propagatedType == requestedType;
+    return fields[field];
   }
 
   void updateFieldConstructorSetters(Element field, HType type) {
     assert(field.isField());
     assert(field.enclosingElement.isClass());
     Map<Element, HType> fields =
         fieldConstructorSetters.putIfAbsent(
           field.enclosingElement, () => new Map<Element, HType>());
     if (!fields.containsKey(field)) {
       fields[field] = type;
@@ skipping 41 matching lines @@
     Map<Element, HType> fields =
         fieldSettersType.putIfAbsent(
           field.enclosingElement, () => new Map<Element, HType>());
     if (!fields.containsKey(field)) {
       fields[field] = type;
     } else {
       fields[field] = fields[field].union(type);
     }
   }
 
-  // Returns whether nothing but setters setting the field to an integer have
-  // been seen during compilation so far.
+  // Returns the type that field setters are setting the field to based on what
+  // have been seen during compilation so far.
   HType fieldSettersTypeSoFar(Element field) {
     assert(field.isField());
     assert(field.enclosingElement.isClass());
     if (!fieldSettersType.containsKey(field.enclosingElement)) {
       return HType.UNKNOWN;
     }
     Map<Element, HType> fields = fieldSettersType[field.enclosingElement];
     if (!fields.containsKey(field)) return HType.UNKNOWN;
     return fields[field];
   }
@@ skipping 776 matching lines @@
                      f(int beginOffset, int endOffset)) {
     final beginOffset = begin.charOffset;
     final endOffset = end.charOffset + end.slowCharCount;
 
     // [begin] and [end] might be the same for the same empty token. This
     // happens for instance when scanning '$$'.
     assert(endOffset >= beginOffset);
     return f(beginOffset, endOffset);
   }
 }