Move selector and arguments descriptor into MegamorphicCache.

runtime/observatory/lib/src/service/object.dart

 // Copyright (c) 2014, 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 service;
 
 /// Helper function for canceling a Future<StreamSubscription>.
 Future cancelFutureSubscription(
     Future<StreamSubscription> subscriptionFuture) async {
   if (subscriptionFuture != null) {
@@ skipping 96 matching lines @@
 
   /// The user-level type of this object.
   @reflectable String get type => _type;
   String _type;
 
   /// The vm type of this object.
   @reflectable String get vmType => _vmType;
   String _vmType;
 
   bool get isICData => vmType == 'ICData';
+  bool get isMegamorphicCache => vmType == 'MegamorphicCache';
   bool get isInstructions => vmType == 'Instructions';
   bool get isObjectPool => vmType == 'ObjectPool';
   bool get isContext => type == 'Context';
   bool get isError => type == 'Error';
   bool get isInstance => type == 'Instance';
   bool get isSentinel => type == 'Sentinel';
   bool get isMessage => type == 'Message';
 
   // Kinds of Instance.
   bool get isAbstractType => false;
@@ skipping 3204 matching lines @@
       return;
     }
     argumentsDescriptor = map['_argumentsDescriptor'];
     entries = map['_entries'];
   }
 }
 
 class MegamorphicCache extends HeapObject {
   @observable int mask;
   @observable Instance buckets;
+  @observable String selector;
+  @observable Instance argumentsDescriptor;
 
   bool get canCache => false;
   bool get immutable => false;
 
   MegamorphicCache._empty(ServiceObjectOwner owner) : super._empty(owner);
 
   void _update(ObservableMap map, bool mapIsRef) {
     _upgradeCollection(map, isolate);
     super._update(map, mapIsRef);
 
+    selector = map['_selector'];
     if (mapIsRef) {
       return;
     }
 
     mask = map['_mask'];
     buckets = map['_buckets'];
+    argumentsDescriptor = map['_argumentsDescriptor'];
   }
 }
 
 class Instructions extends HeapObject {
   bool get canCache => false;
   bool get immutable => true;
 
   @observable Code code;
   @observable ObjectPool objectPool;
 
@@ skipping 622 matching lines @@
     var v = list[i];
     if ((v is ObservableMap) && _isServiceMap(v)) {
       list[i] = owner.getFromMap(v);
     } else if (v is ObservableList) {
       _upgradeObservableList(v, owner);
     } else if (v is ObservableMap) {
       _upgradeObservableMap(v, owner);
     }
   }
 }