Cast InternalMap to Map.

pkg/dev_compiler/lib/js/es6/dart_sdk.js

Index: pkg/dev_compiler/lib/js/es6/dart_sdk.js
diff --git a/pkg/dev_compiler/lib/js/es6/dart_sdk.js b/pkg/dev_compiler/lib/js/es6/dart_sdk.js
index e9fe13eb8f2d2b36027374d42c6dbeb4c0085bb8..e70a73022bd4a513458750b3074747e600dcf51c 100644
--- a/pkg/dev_compiler/lib/js/es6/dart_sdk.js
+++ b/pkg/dev_compiler/lib/js/es6/dart_sdk.js
@@ -117,6 +117,7 @@ let VoidTovoid = () => (VoidTovoid = dart.constFn(dart.functionType(dart.void, [
 let TimerTovoid = () => (TimerTovoid = dart.constFn(dart.functionType(dart.void, [async.Timer])))();
 let MapOfdynamic$int = () => (MapOfdynamic$int = dart.constFn(core.Map$(dart.dynamic, core.int)))();
 let dynamicTodynamic = () => (dynamicTodynamic = dart.constFn(dart.functionType(dart.dynamic, [dart.dynamic])))();
+let InternalMap = () => (InternalMap = dart.constFn(_js_helper.InternalMap$()))();
 let JSArrayOfint = () => (JSArrayOfint = dart.constFn(_interceptors.JSArray$(core.int)))();
 let ListOfint = () => (ListOfint = dart.constFn(core.List$(core.int)))();
 let SyncIterator = () => (SyncIterator = dart.constFn(_js_helper.SyncIterator$()))();
@@ -10617,7 +10618,7 @@ _isolate_helper._Serializer = class _Serializer extends core.Object {
   }
   serializeMap(x) {
     let serializeTearOff = dart.bind(this, 'serialize');
-    return JSArrayOfObject().of(['map', x[dartx.keys][dartx.map](dart.dynamic)(dynamicTodynamic()._check(serializeTearOff))[dartx.toList](), x[dartx.values][dartx.map](dart.dynamic)(dynamicTodynamic()._check(serializeTearOff))[dartx.toList]()]);
+    return JSArrayOfObject().of(['map', x.keys[dartx.map](dart.dynamic)(dynamicTodynamic()._check(serializeTearOff))[dartx.toList](), x.values[dartx.map](dart.dynamic)(dynamicTodynamic()._check(serializeTearOff))[dartx.toList]()]);
   }
   serializeJSObject(x) {
     if (!!x.constructor && x.constructor !== Object) {
@@ -10679,7 +10680,7 @@ dart.setSignature(_isolate_helper._Serializer, {
     serializeJSIndexable: dart.definiteFunctionType(dart.dynamic, [_interceptors.JSIndexable]),
     serializeArray: dart.definiteFunctionType(dart.dynamic, [_interceptors.JSArray]),
     serializeArrayInPlace: dart.definiteFunctionType(dart.dynamic, [_interceptors.JSArray]),
-    serializeMap: dart.definiteFunctionType(dart.dynamic, [core.Map]),
+    serializeMap: dart.definiteFunctionType(dart.dynamic, [_js_helper.InternalMap]),
     serializeJSObject: dart.definiteFunctionType(dart.dynamic, [_interceptors.JSObject]),
     serializeWorkerSendPort: dart.definiteFunctionType(dart.dynamic, [_isolate_helper._WorkerSendPort]),
     serializeJsSendPort: dart.definiteFunctionType(dart.dynamic, [_isolate_helper._NativeJsSendPort]),
@@ -10729,7 +10730,7 @@ _isolate_helper._Deserializer = class _Deserializer extends core.Object {
       }
       case "map":
       {
-        return this.deserializeMap(x);
+        return this.deserializeMap(_js_helper.InternalMap._check(x));
       }
       case "sendport":
       {
@@ -10811,9 +10812,9 @@ _isolate_helper._Deserializer = class _Deserializer extends core.Object {
     return _interceptors.JSArray.markFixed(this.deserializeArrayInPlace(_interceptors.JSArray._check(result)));
   }
   deserializeMap(x) {
-    dart.assert(dart.equals(dart.dindex(x, 0), 'map'));
-    let keys = core.List._check(dart.dindex(x, 1));
-    let values = core.List._check(dart.dindex(x, 2));
+    dart.assert(dart.equals(x.get(0), 'map'));
+    let keys = core.List._check(x.get(1));
+    let values = core.List._check(x.get(2));
     let result = dart.map();
     this.deserializedObjects[dartx.add](result);
     keys = keys[dartx.map](dart.dynamic)(dart.bind(this, 'deserialize'))[dartx.toList]();
@@ -10894,7 +10895,7 @@ dart.setSignature(_isolate_helper._Deserializer, {
     deserializeExtendable: dart.definiteFunctionType(core.List, [dart.dynamic]),
     deserializeMutable: dart.definiteFunctionType(core.List, [dart.dynamic]),
     deserializeConst: dart.definiteFunctionType(core.List, [dart.dynamic]),
-    deserializeMap: dart.definiteFunctionType(core.Map, [dart.dynamic]),
+    deserializeMap: dart.definiteFunctionType(core.Map, [_js_helper.InternalMap]),
     deserializeSendPort: dart.definiteFunctionType(isolate.SendPort, [dart.dynamic]),
     deserializeRawSendPort: dart.definiteFunctionType(isolate.SendPort, [dart.dynamic]),
     deserializeJSObject: dart.definiteFunctionType(dart.dynamic, [dart.dynamic]),
@@ -10941,7 +10942,14 @@ dart.setSignature(_js_helper._Patch, {
   constructors: () => ({new: dart.definiteFunctionType(_js_helper._Patch, [])})
 });
 _js_helper.patch = dart.const(new _js_helper._Patch());
-_js_helper.InternalMap = class InternalMap extends core.Object {};
+_js_helper.InternalMap$ = dart.generic((K, V) => {
+  let MapOfK$V = () => (MapOfK$V = dart.constFn(core.Map$(K, V)))();
+  class InternalMap extends core.Object {}
+  dart.addTypeTests(InternalMap);
+  InternalMap[dart.implements] = () => [MapOfK$V()];
+  return InternalMap;
+});
+_js_helper.InternalMap = InternalMap();
 _js_helper.Primitives = class Primitives extends core.Object {
   static initializeStatics(id) {
     _js_helper.Primitives.mirrorFunctionCacheName = dart.notNull(_js_helper.Primitives.mirrorFunctionCacheName) + dart.str`_${id}`;
@@ -11863,6 +11871,7 @@ _js_helper.JsLinkedHashMap$ = dart.generic((K, V) => {
   let KAndVTovoid = () => (KAndVTovoid = dart.constFn(dart.functionType(dart.void, [K, V])))();
   let LinkedHashMapCellOfK$V = () => (LinkedHashMapCellOfK$V = dart.constFn(_js_helper.LinkedHashMapCell$(K, V)))();
   let LinkedHashMapOfK$V = () => (LinkedHashMapOfK$V = dart.constFn(collection.LinkedHashMap$(K, V)))();
+  let InternalMapOfK$V = () => (InternalMapOfK$V = dart.constFn(_js_helper.InternalMap$(K, V)))();
   let VoidToV = () => (VoidToV = dart.constFn(dart.functionType(V, [])))();
   let KToV = () => (KToV = dart.constFn(dart.definiteFunctionType(V, [K])))();
   let KTobool = () => (KTobool = dart.constFn(dart.definiteFunctionType(core.bool, [K])))();
@@ -12135,7 +12144,7 @@ _js_helper.JsLinkedHashMap$ = dart.generic((K, V) => {
     }
   }
   dart.addTypeTests(JsLinkedHashMap);
-  JsLinkedHashMap[dart.implements] = () => [LinkedHashMapOfK$V(), _js_helper.InternalMap];
+  JsLinkedHashMap[dart.implements] = () => [LinkedHashMapOfK$V(), InternalMapOfK$V()];
   dart.setSignature(JsLinkedHashMap, {
     constructors: () => ({
       new: dart.definiteFunctionType(_js_helper.JsLinkedHashMap$(K, V), []),
@@ -23461,6 +23470,7 @@ collection._Es6LinkedIdentityHashMap$ = dart.generic((K, V) => {
   let _Es6MapIterableOfK = () => (_Es6MapIterableOfK = dart.constFn(collection._Es6MapIterable$(K)))();
   let MapOfK$V = () => (MapOfK$V = dart.constFn(core.Map$(K, V)))();
   let KAndVTovoid = () => (KAndVTovoid = dart.constFn(dart.functionType(dart.void, [K, V])))();
+  let InternalMapOfK$V = () => (InternalMapOfK$V = dart.constFn(_js_helper.InternalMap$(K, V)))();
   let _Es6MapIterableOfV = () => (_Es6MapIterableOfV = dart.constFn(collection._Es6MapIterable$(V)))();
   let VoidToV = () => (VoidToV = dart.constFn(dart.functionType(V, [])))();
   let KAndVTovoid$ = () => (KAndVTovoid$ = dart.constFn(dart.definiteFunctionType(dart.void, [K, V])))();
@@ -23549,7 +23559,7 @@ collection._Es6LinkedIdentityHashMap$ = dart.generic((K, V) => {
       return collection.Maps.mapToString(this);
     }
   }
-  _Es6LinkedIdentityHashMap[dart.implements] = () => [_js_helper.InternalMap];
+  _Es6LinkedIdentityHashMap[dart.implements] = () => [InternalMapOfK$V()];
   dart.setSignature(_Es6LinkedIdentityHashMap, {
     constructors: () => ({new: dart.definiteFunctionType(collection._Es6LinkedIdentityHashMap$(K, V), [])}),
     fields: () => ({