Merged String subclasses into String.

runtime/vm/snapshot.cc

Index: runtime/vm/snapshot.cc
diff --git a/runtime/vm/snapshot.cc b/runtime/vm/snapshot.cc
index 77204f33ba6e0ad7813ab918dee4fca8242e2a04..425238679f29018ca825e1daaf0368afb13eff34 100644
--- a/runtime/vm/snapshot.cc
+++ b/runtime/vm/snapshot.cc
@@ -30,7 +30,8 @@ static bool IsSingletonClassId(intptr_t class_id) {
 static bool IsObjectStoreClassId(intptr_t class_id) {
   // Check if this is a class which is stored in the object store.
   return (class_id == kObjectCid ||
-          (class_id >= kInstanceCid && class_id <= kWeakPropertyCid));
+          (class_id >= kInstanceCid && class_id <= kWeakPropertyCid) ||
+          RawObject::IsStringClassId(class_id));
 }
 
 
@@ -431,7 +432,8 @@ RawClass* SnapshotReader::NewClass(intptr_t class_id) {
   ASSERT(kind_ == Snapshot::kFull);
   ASSERT(isolate()->no_gc_scope_depth() != 0);
   if (class_id < kNumPredefinedCids) {
-    ASSERT((class_id >= kInstanceCid) && (class_id <= kDartFunctionCid));
+    ASSERT(((class_id >= kInstanceCid) && (class_id <= kDartFunctionCid)) ||
+           RawObject::IsStringClassId(class_id));

[siva, 2012/11/05 19:23:38]

would this be equivalent to
(class_id >- kInstanceCid && class_id <= kExternalTwoByteStringCid)

[Tom Ball, 2012/11/05 21:22:41]

Done.

     return isolate()->class_table()->At(class_id);
   }
   cls_ = Object::class_class();