Changes to prepare for allowing script snapshots to be taken after running the main application

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/bootstrap.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart.h"
@@ skipping 1126 matching lines @@
   }
   if (object_id == kVoidType) {
     return Object::void_type();
   }
   if (object_id == kTrueValue) {
     return Bool::True().raw();
   }
   if (object_id == kFalseValue) {
     return Bool::False().raw();
   }
+  if (object_id == kExtractorParameterTypes) {
+    return Object::extractor_parameter_types().raw();
+  }
+  if (object_id == kExtractorParameterNames) {
+    return Object::extractor_parameter_names().raw();
+  }
+  if (object_id == kEmptyContextScopeObject) {
+    return Object::empty_context_scope().raw();
+  }
   if (object_id == kDoubleObject) {
     ASSERT(kind_ == Snapshot::kMessage);
     return Double::New(ReadDouble());
   }
   intptr_t class_id = ClassIdFromObjectId(object_id);
   if (IsSingletonClassId(class_id)) {
     return isolate()->class_table()->At(class_id);  // get singleton class.
   } else {
     ASSERT(Symbols::IsVMSymbolId(object_id));
     return Symbols::GetVMSymbol(object_id);  // return VM symbol.
@@ skipping 253 matching lines @@
 void SnapshotWriter::WriteObject(RawObject* rawobj) {
   WriteObjectImpl(rawobj, kAsInlinedObject);
   WriteForwardedObjects();
 }
 
 #define VM_OBJECT_CLASS_LIST(V)                                                \
   V(OneByteString)                                                             \
   V(Mint)                                                                      \
   V(Bigint)                                                                    \
   V(Double)                                                                    \
+  V(ImmutableArray)                                                            \
 
 #define VM_OBJECT_WRITE(clazz)                                                 \
   case clazz::kClassId: {                                                      \
     object_id = forward_list_->AddObject(rawobj, kIsSerialized);               \
     Raw##clazz* raw_obj = reinterpret_cast<Raw##clazz*>(rawobj);               \
     raw_obj->WriteTo(this, object_id, kind());                                 \
     return;                                                                    \
   }                                                                            \
 
 void SnapshotWriter::HandleVMIsolateObject(RawObject* rawobj) {
@@ skipping 44 matching lines @@
     WriteVMIsolateObject(kTrueValue);
     return;
   }
 
   // Check if it is a singleton boolean false object.
   if (rawobj == Bool::False().raw()) {
     WriteVMIsolateObject(kFalseValue);
     return;
   }
 
+  // Check if it is a singleton extractor parameter types array.
+  if (rawobj == Object::extractor_parameter_types().raw()) {
+    WriteVMIsolateObject(kExtractorParameterTypes);
+    return;
+  }
+
+  // Check if it is a singleton extractor parameter names array.
+  if (rawobj == Object::extractor_parameter_names().raw()) {
+    WriteVMIsolateObject(kExtractorParameterNames);
+    return;
+  }
+
+  // Check if it is a singleton empty context scope object.
+  if (rawobj == Object::empty_context_scope().raw()) {
+    WriteVMIsolateObject(kEmptyContextScopeObject);
+    return;
+  }
+
   // Check if it is a singleton class object which is shared by
   // all isolates.
   intptr_t id = rawobj->GetClassId();
   if (id == kClassCid) {
     RawClass* raw_class = reinterpret_cast<RawClass*>(rawobj);
     intptr_t class_id = raw_class->ptr()->id_;
     if (IsSingletonClassId(class_id)) {
       intptr_t object_id = ObjectIdFromClassId(class_id);
       WriteVMIsolateObject(object_id);
       return;
@@ skipping 970 matching lines @@
     NoSafepointScope no_safepoint;
     WriteObject(obj.raw());
     UnmarkAll();
   } else {
     ThrowException(exception_type(), exception_msg());
   }
 }
 
 
 }  // namespace dart