SDK fixes

tool/input_sdk/private/constant_map.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 _js_helper;
 
 abstract class ConstantMap<K, V> implements Map<K, V> {
   const ConstantMap._();
 
   bool get isEmpty => length == 0;
 
   bool get isNotEmpty => !isEmpty;
 
   String toString() => Maps.mapToString(this);
 
   _throwUnmodifiable() {
     throw new UnsupportedError("Cannot modify unmodifiable Map");
   }
   void operator []=(K key, V val) => _throwUnmodifiable();
   V putIfAbsent(K key, V ifAbsent()) => _throwUnmodifiable();
-  V remove(K key) => _throwUnmodifiable();
+  V remove(Object key) => _throwUnmodifiable();
   void clear() => _throwUnmodifiable();
   void addAll(Map<K, V> other) => _throwUnmodifiable();
 }
 
 class ConstantStringMap<K, V> extends ConstantMap<K, V>
                               implements _symbol_dev.EfficientLength {
 
   // This constructor is not used.  The instantiation is shortcut by the
   // compiler. It is here to make the uninitialized final fields legal.
   const ConstantStringMap._(this.length, this._jsObject, this._keys)
       : super._();
 
   final int length;
   // A constant map is backed by a JavaScript object.
   final _jsObject;
   final List<K> _keys;
 
-  bool containsValue(V needle) {
+  bool containsValue(Object needle) {
     return values.any((V value) => value == needle);
   }
 
   bool containsKey(Object key) {
     if (key is! String) return false;
     if ('__proto__' == key) return false;
     return jsHasOwnProperty(_jsObject, key);
   }
 
   V operator [](Object key) {
@@ skipping 59 matching lines @@
   // [_jsData] holds a key-value pair list.
   final _jsData;
 
   // We cannot create the backing map on creation since hashCode interceptors
   // have not been defined when constants are created.
   Map<K, V> _getMap() {
     if (JS('bool', r'!this.$map')) {
       Map backingMap = new LinkedHashMap<K, V>();
       JS('', r'this.$map = #', fillLiteralMap(_jsData, backingMap));
     }
-    return JS('Map', r'this.$map');
+    return JS('Map<K, V>', r'this.$map');
   }
 
-  bool containsValue(V needle) {
+  bool containsValue(Object needle) {
     return _getMap().containsValue(needle);
   }
 
   bool containsKey(Object key) {
     return _getMap().containsKey(key);
   }
 
   V operator [](Object key) {
     return _getMap()[key];
   }
 
   void forEach(void f(K key, V value)) {
     _getMap().forEach(f);
   }
 
   Iterable<K> get keys {
     return _getMap().keys;
   }
 
   Iterable<V> get values {
     return _getMap().values;
   }
 
   int get length => _getMap().length;
 }