Merge libv1.

runtime/vm/snapshot.cc

 // 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.
 
 #include "vm/snapshot.h"
 
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
 #include "vm/exceptions.h"
@@ skipping 12 matching lines @@
 static bool IsSingletonClassId(intptr_t class_id) {
   // Check if this is a singleton object class which is shared by all isolates.
   return ((class_id >= kClassCid && class_id <= kUnwindErrorCid) ||
           (class_id >= kNullCid && class_id <= kVoidCid));
 }
 
 
 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));
 }
 
 
 static bool IsObjectStoreTypeId(intptr_t index) {
   // Check if this is a type which is stored in the object store.
   return (index >= kObjectType && index <= kListInterface);
 }
 
 
 static intptr_t ClassIdFromObjectId(intptr_t object_id) {
@@ skipping 380 matching lines @@
       AllocateUninitialized(cls_, Context::InstanceSize(num_variables)));
   obj->ptr()->num_variables_ = num_variables;
   return obj;
 }
 
 
 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 <= kExternalTwoByteStringCid));
     return isolate()->class_table()->At(class_id);
   }
   cls_ = Object::class_class();
   RawClass* obj = reinterpret_cast<RawClass*>(
       AllocateUninitialized(cls_, Class::InstanceSize()));
   Instance fake;
   obj->ptr()->handle_vtable_ = fake.vtable();
   cls_ = obj;
   cls_.set_id(kIllegalCid);
   isolate()->class_table()->Register(cls_);
@@ skipping 725 matching lines @@
 
 
 void MessageWriter::WriteMessage(const Object& obj) {
   ASSERT(kind() == Snapshot::kMessage);
   WriteObject(obj.raw());
   UnmarkAll();
 }
 
 
 }  // namespace dart