Fix runnning of vm benchmarks on golem.

runtime/vm/raw_object_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/bigint_operations.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/snapshot.h"
 #include "vm/symbols.h"
 #include "vm/visitor.h"
@@ skipping 555 matching lines @@
   SnapshotWriterVisitor visitor(writer);
   visitor.VisitPointers(from(), to());
 }
 
 
 RawPatchClass* PatchClass::ReadFrom(SnapshotReader* reader,
                                     intptr_t object_id,
                                     intptr_t tags,
                                     Snapshot::Kind kind) {
   ASSERT(reader != NULL);
-  ASSERT((kind != Snapshot::kMessage) &&
-         !RawObject::IsCreatedFromSnapshot(tags));
+  ASSERT(kind != Snapshot::kMessage);

[Anders Johnsen, 2013/05/22 05:51:38]

This assertion looks redundant now.

[siva, 2013/05/22 15:45:12]

Good point. Removed that assertion.

On 2013/05/22 05:51:38, Anders Johnsen wrote:

+  ASSERT(((kind == Snapshot::kScript) &&
+          !RawObject::IsCreatedFromSnapshot(tags)) ||
+         (kind == Snapshot::kFull));
 
   // Allocate function object.
   PatchClass& cls = PatchClass::ZoneHandle(reader->isolate(),
                                             NEW_OBJECT(PatchClass));
   reader->AddBackRef(object_id, &cls, kIsDeserialized);
 
   // Set the object tags.
   cls.set_tags(tags);
 
   // Set all the object fields.
   // TODO(5411462): Need to assert No GC can happen here, even though
   // allocations may happen.
   intptr_t num_flds = (cls.raw()->to() - cls.raw()->from());
   for (intptr_t i = 0; i <= num_flds; i++) {
     *(cls.raw()->from() + i) = reader->ReadObjectRef();
   }
 
   return cls.raw();
 }
 
 
 void RawPatchClass::WriteTo(SnapshotWriter* writer,
                             intptr_t object_id,
                             Snapshot::Kind kind) {
   ASSERT(writer != NULL);
-  ASSERT((kind != Snapshot::kMessage) &&
-         !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this)));
+  ASSERT(kind != Snapshot::kMessage);

[Anders Johnsen, 2013/05/22 05:51:38]

Ditto.

[siva, 2013/05/22 15:45:12]

Done.

+  ASSERT(((kind == Snapshot::kScript) &&
+          !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) ||
+         (kind == Snapshot::kFull));
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kPatchClassCid);
   writer->WriteIntptrValue(writer->GetObjectTags(this));
   // Write out all the object pointer fields.
   SnapshotWriterVisitor visitor(writer);
   visitor.VisitPointers(from(), to());
 }
 
 
 RawClosureData* ClosureData::ReadFrom(SnapshotReader* reader,
                                       intptr_t object_id,
                                       intptr_t tags,
                                       Snapshot::Kind kind) {
   ASSERT(reader != NULL);
-  ASSERT((kind != Snapshot::kMessage) &&
-         !RawObject::IsCreatedFromSnapshot(tags));
+  ASSERT(kind != Snapshot::kMessage);

[Anders Johnsen, 2013/05/22 05:51:38]

Ditto.

[siva, 2013/05/22 15:45:12]

Done.

[siva, 2013/05/22 15:45:12]

Done.

+  ASSERT(((kind == Snapshot::kScript) &&
+          !RawObject::IsCreatedFromSnapshot(tags)) ||
+         (kind == Snapshot::kFull));
 
   // Allocate closure data object.
   ClosureData& data = ClosureData::ZoneHandle(
       reader->isolate(), NEW_OBJECT(ClosureData));
   reader->AddBackRef(object_id, &data, kIsDeserialized);
 
   // Set the object tags.
   data.set_tags(tags);
 
   // Set all the object fields.
   // TODO(5411462): Need to assert No GC can happen here, even though
   // allocations may happen.
   intptr_t num_flds = (data.raw()->to() - data.raw()->from());
   for (intptr_t i = 0; i <= num_flds; i++) {
     *(data.raw()->from() + i) = reader->ReadObjectRef();
   }
 
   return data.raw();
 }
 
 
 void RawClosureData::WriteTo(SnapshotWriter* writer,
                              intptr_t object_id,
                              Snapshot::Kind kind) {
   ASSERT(writer != NULL);
-  ASSERT((kind != Snapshot::kMessage) &&
-         !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this)));
+  ASSERT(kind != Snapshot::kMessage);

[Anders Johnsen, 2013/05/22 05:51:38]

Ditto (and throughout the file).

[siva, 2013/05/22 15:45:12]

Done.

+  ASSERT(((kind == Snapshot::kScript) &&
+          !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) ||
+         (kind == Snapshot::kFull));
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kClosureDataCid);
   writer->WriteIntptrValue(writer->GetObjectTags(this));
 
   // Context scope.
   // We don't write the context scope in the snapshot.
   writer->WriteObjectImpl(Object::null());
 
   // Parent function.
   writer->WriteObjectImpl(ptr()->parent_function_);
 
   // Signature class.
   writer->WriteObjectImpl(ptr()->signature_class_);
 
   // Static closure/Closure allocation stub.
   // We don't write the closure or allocation stub in the snapshot.
   writer->WriteObjectImpl(Object::null());
 }
 
 
 RawRedirectionData* RedirectionData::ReadFrom(SnapshotReader* reader,
                                               intptr_t object_id,
                                               intptr_t tags,
                                               Snapshot::Kind kind) {
   ASSERT(reader != NULL);
-  ASSERT((kind != Snapshot::kMessage) &&
-         !RawObject::IsCreatedFromSnapshot(tags));
+  ASSERT(kind != Snapshot::kMessage);
+  ASSERT(((kind == Snapshot::kScript) &&
+          !RawObject::IsCreatedFromSnapshot(tags)) ||
+         (kind == Snapshot::kFull));
 
   // Allocate redirection data object.
   RedirectionData& data = RedirectionData::ZoneHandle(
       reader->isolate(), NEW_OBJECT(RedirectionData));
   reader->AddBackRef(object_id, &data, kIsDeserialized);
 
   // Set the object tags.
   data.set_tags(tags);
 
   // Set all the object fields.
   // TODO(5411462): Need to assert No GC can happen here, even though
   // allocations may happen.
   intptr_t num_flds = (data.raw()->to() - data.raw()->from());
   for (intptr_t i = 0; i <= num_flds; i++) {
     *(data.raw()->from() + i) = reader->ReadObjectRef();
   }
 
   return data.raw();
 }
 
 
 void RawRedirectionData::WriteTo(SnapshotWriter* writer,
                                  intptr_t object_id,
                                  Snapshot::Kind kind) {
   ASSERT(writer != NULL);
-  ASSERT((kind != Snapshot::kMessage) &&
-         !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this)));
+  ASSERT(kind != Snapshot::kMessage);
+  ASSERT(((kind == Snapshot::kScript) &&
+          !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) ||
+         (kind == Snapshot::kFull));
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kRedirectionDataCid);
   writer->WriteIntptrValue(writer->GetObjectTags(this));
 
   // Write out all the object pointer fields.
   SnapshotWriterVisitor visitor(writer);
   visitor.VisitPointers(from(), to());
 }
 
 
 RawFunction* Function::ReadFrom(SnapshotReader* reader,
                                 intptr_t object_id,
                                 intptr_t tags,
                                 Snapshot::Kind kind) {
   ASSERT(reader != NULL);
-  ASSERT((kind != Snapshot::kMessage) &&
-         !RawObject::IsCreatedFromSnapshot(tags));
+  ASSERT(kind != Snapshot::kMessage);
+  ASSERT(((kind == Snapshot::kScript) &&
+          !RawObject::IsCreatedFromSnapshot(tags)) ||
+         (kind == Snapshot::kFull));
 
   // Allocate function object.
   Function& func = Function::ZoneHandle(
       reader->isolate(), NEW_OBJECT(Function));
   reader->AddBackRef(object_id, &func, kIsDeserialized);
 
   // Set the object tags.
   func.set_tags(tags);
 
   // Set all the non object fields.
@@ skipping 16 matching lines @@
   }
 
   return func.raw();
 }
 
 
 void RawFunction::WriteTo(SnapshotWriter* writer,
                           intptr_t object_id,
                           Snapshot::Kind kind) {
   ASSERT(writer != NULL);
-  ASSERT((kind != Snapshot::kMessage) &&
-         !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this)));
+  ASSERT(kind != Snapshot::kMessage);
+  ASSERT(((kind == Snapshot::kScript) &&
+          !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) ||
+         (kind == Snapshot::kFull));
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kFunctionCid);
   writer->WriteIntptrValue(writer->GetObjectTags(this));
 
   // Write out all the non object fields.
   writer->WriteIntptrValue(ptr()->token_pos_);
@@ skipping 10 matching lines @@
   SnapshotWriterVisitor visitor(writer);
   visitor.VisitPointers(from(), to());
 }
 
 
 RawField* Field::ReadFrom(SnapshotReader* reader,
                           intptr_t object_id,
                           intptr_t tags,
                           Snapshot::Kind kind) {
   ASSERT(reader != NULL);
-  ASSERT((kind != Snapshot::kMessage) &&
-         !RawObject::IsCreatedFromSnapshot(tags));
+  ASSERT(kind != Snapshot::kMessage);
+  ASSERT(((kind == Snapshot::kScript) &&
+          !RawObject::IsCreatedFromSnapshot(tags)) ||
+         (kind == Snapshot::kFull));
 
   // Allocate field object.
   Field& field = Field::ZoneHandle(reader->isolate(), NEW_OBJECT(Field));
   reader->AddBackRef(object_id, &field, kIsDeserialized);
 
   // Set the object tags.
   field.set_tags(tags);
 
   // Set all non object fields.
   field.set_token_pos(reader->ReadIntptrValue());
@@ skipping 10 matching lines @@
   }
 
   return field.raw();
 }
 
 
 void RawField::WriteTo(SnapshotWriter* writer,
                        intptr_t object_id,
                        Snapshot::Kind kind) {
   ASSERT(writer != NULL);
-  ASSERT((kind != Snapshot::kMessage) &&
-         !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this)));
+  ASSERT(kind != Snapshot::kMessage);
+  ASSERT(((kind == Snapshot::kScript) &&
+          !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) ||
+         (kind == Snapshot::kFull));
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kFieldCid);
   writer->WriteIntptrValue(writer->GetObjectTags(this));
 
   // Write out all the non object fields.
   writer->WriteIntptrValue(ptr()->token_pos_);
@@ skipping 54 matching lines @@
   writer->WriteObjectImpl(ptr()->literal_);
   writer->WriteObjectImpl(ptr()->value_);
 }
 
 
 RawTokenStream* TokenStream::ReadFrom(SnapshotReader* reader,
                                       intptr_t object_id,
                                       intptr_t tags,
                                       Snapshot::Kind kind) {
   ASSERT(reader != NULL);
-  ASSERT((kind != Snapshot::kMessage)
-          && !RawObject::IsCreatedFromSnapshot(tags));
+  ASSERT(kind != Snapshot::kMessage);
+  ASSERT(((kind == Snapshot::kScript) &&
+          !RawObject::IsCreatedFromSnapshot(tags)) ||
+         (kind == Snapshot::kFull));
 
   // Read the length so that we can determine number of tokens to read.
   intptr_t len = reader->ReadSmiValue();
 
   // Create the token stream object.
   TokenStream& token_stream = TokenStream::ZoneHandle(
       reader->isolate(), NEW_OBJECT_WITH_LEN(TokenStream, len));
   reader->AddBackRef(object_id, &token_stream, kIsDeserialized);
 
   // Set the object tags.
@@ skipping 15 matching lines @@
   token_stream.SetPrivateKey(*(reader->StringHandle()));
 
   return token_stream.raw();
 }
 
 
 void RawTokenStream::WriteTo(SnapshotWriter* writer,
                              intptr_t object_id,
                              Snapshot::Kind kind) {
   ASSERT(writer != NULL);
-  ASSERT((kind != Snapshot::kMessage) &&
-         !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this)));
+  ASSERT(kind != Snapshot::kMessage);
+  ASSERT(((kind == Snapshot::kScript) &&
+          !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) ||
+         (kind == Snapshot::kFull));
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kTokenStreamCid);
   writer->WriteIntptrValue(writer->GetObjectTags(this));
 
   // Write out the length field and the token stream.
   RawExternalTypedData* stream = ptr()->stream_;
   intptr_t len = Smi::Value(stream->ptr()->length_);
   writer->Write<RawObject*>(stream->ptr()->length_);
   writer->WriteBytes(stream->ptr()->data_, len);
 
   // Write out the literal/identifier token array.
   writer->WriteObjectImpl(ptr()->token_objects_);
   // Write out the private key in use by the token stream.
   writer->WriteObjectImpl(ptr()->private_key_);
 }
 
 
 RawScript* Script::ReadFrom(SnapshotReader* reader,
                             intptr_t object_id,
                             intptr_t tags,
                             Snapshot::Kind kind) {
   ASSERT(reader != NULL);
-  ASSERT((kind != Snapshot::kMessage) &&
-         !RawObject::IsCreatedFromSnapshot(tags));
+  ASSERT(kind != Snapshot::kMessage);
+  ASSERT(((kind == Snapshot::kScript) &&
+          !RawObject::IsCreatedFromSnapshot(tags)) ||
+         (kind == Snapshot::kFull));
 
   // Allocate script object.
   Script& script = Script::ZoneHandle(reader->isolate(), NEW_OBJECT(Script));
   reader->AddBackRef(object_id, &script, kIsDeserialized);
 
   // Set the object tags.
   script.set_tags(tags);
 
   // Set all the object fields.
   // TODO(5411462): Need to assert No GC can happen here, even though
@@ skipping 12 matching lines @@
 
   return script.raw();
 }
 
 
 void RawScript::WriteTo(SnapshotWriter* writer,
                         intptr_t object_id,
                         Snapshot::Kind kind) {
   ASSERT(writer != NULL);
   ASSERT(tokens_ != TokenStream::null());
-  ASSERT((kind != Snapshot::kMessage) &&
-         !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this)));
+  ASSERT(kind != Snapshot::kMessage);
+  ASSERT(((kind == Snapshot::kScript) &&
+          !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) ||
+         (kind == Snapshot::kFull));
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kScriptCid);
   writer->WriteIntptrValue(writer->GetObjectTags(this));
 
   // Write out all the object pointer fields.
   writer->WriteObjectImpl(ptr()->url_);
@@ skipping 63 matching lines @@
   ASSERT(writer != NULL);
   ASSERT(kind != Snapshot::kMessage);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kLibraryCid);
   writer->WriteIntptrValue(writer->GetObjectTags(this));
 
-  if (RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) {
+  if ((kind == Snapshot::kScript) &&
+      RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) {
     ASSERT(kind != Snapshot::kFull);
     // Write out library URL so that it can be looked up when reading.
     writer->WriteObjectImpl(ptr()->url_);
   } else {
     // Write out all non object fields.
     writer->WriteIntptrValue(ptr()->index_);
     writer->WriteIntptrValue(ptr()->num_imports_);
     writer->WriteIntptrValue(ptr()->num_anonymous_);
     writer->Write<bool>(ptr()->corelib_imported_);
     writer->Write<bool>(ptr()->debuggable_);
@@ skipping 10 matching lines @@
     visitor.VisitPointers(from(), to());
   }
 }
 
 
 RawLibraryPrefix* LibraryPrefix::ReadFrom(SnapshotReader* reader,
                                           intptr_t object_id,
                                           intptr_t tags,
                                           Snapshot::Kind kind) {
   ASSERT(reader != NULL);
-  ASSERT((kind != Snapshot::kMessage) &&
-         !RawObject::IsCreatedFromSnapshot(tags));
+  ASSERT(kind != Snapshot::kMessage);
+  ASSERT(((kind == Snapshot::kScript) &&
+          !RawObject::IsCreatedFromSnapshot(tags)) ||
+         (kind == Snapshot::kFull));
 
   // Allocate library prefix object.
   LibraryPrefix& prefix = LibraryPrefix::ZoneHandle(
       reader->isolate(), NEW_OBJECT(LibraryPrefix));
   reader->AddBackRef(object_id, &prefix, kIsDeserialized);
 
   // Set the object tags.
   prefix.set_tags(tags);
 
   // Set all non object fields.
   prefix.raw_ptr()->num_imports_ = reader->ReadIntptrValue();
 
   // Set all the object fields.
   // TODO(5411462): Need to assert No GC can happen here, even though
   // allocations may happen.
   intptr_t num_flds = (prefix.raw()->to() - prefix.raw()->from());
   for (intptr_t i = 0; i <= num_flds; i++) {
     *(prefix.raw()->from() + i) = reader->ReadObjectRef();
   }
 
   return prefix.raw();
 }
 
 
 void RawLibraryPrefix::WriteTo(SnapshotWriter* writer,
                                intptr_t object_id,
                                Snapshot::Kind kind) {
   ASSERT(writer != NULL);
-  ASSERT((kind != Snapshot::kMessage) &&
-         !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this)));
+  ASSERT(kind != Snapshot::kMessage);
+  ASSERT(((kind == Snapshot::kScript) &&
+          !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) ||
+         (kind == Snapshot::kFull));
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kLibraryPrefixCid);
   writer->WriteIntptrValue(writer->GetObjectTags(this));
 
   // Write out all non object fields.
   writer->WriteIntptrValue(ptr()->num_imports_);
 
   // Write out all the object pointer fields.
   SnapshotWriterVisitor visitor(writer);
   visitor.VisitPointers(from(), to());
 }
 
 
 RawNamespace* Namespace::ReadFrom(SnapshotReader* reader,
                                   intptr_t object_id,
                                   intptr_t tags,
                                   Snapshot::Kind kind) {
   ASSERT(reader != NULL);
-  ASSERT((kind != Snapshot::kMessage) &&
-         !RawObject::IsCreatedFromSnapshot(tags));
+  ASSERT(kind != Snapshot::kMessage);
+  ASSERT(((kind == Snapshot::kScript) &&
+          !RawObject::IsCreatedFromSnapshot(tags)) ||
+         (kind == Snapshot::kFull));
 
   // Allocate Namespace object.
   Namespace& ns = Namespace::ZoneHandle(
       reader->isolate(), NEW_OBJECT(Namespace));
   reader->AddBackRef(object_id, &ns, kIsDeserialized);
 
   // Set the object tags.
   ns.set_tags(tags);
 
   // Set all the object fields.
   // TODO(5411462): Need to assert No GC can happen here, even though
   // allocations may happen.
   intptr_t num_flds = (ns.raw()->to() - ns.raw()->from());
   for (intptr_t i = 0; i <= num_flds; i++) {
     *(ns.raw()->from() + i) = reader->ReadObjectRef();
   }
 
   return ns.raw();
 }
 
 
 void RawNamespace::WriteTo(SnapshotWriter* writer,
                            intptr_t object_id,
                            Snapshot::Kind kind) {
   ASSERT(writer != NULL);
-  ASSERT((kind != Snapshot::kMessage) &&
-         !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this)));
+  ASSERT(kind != Snapshot::kMessage);
+  ASSERT(((kind == Snapshot::kScript) &&
+          !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) ||
+         (kind == Snapshot::kFull));
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kNamespaceCid);
   writer->WriteIntptrValue(writer->GetObjectTags(this));
 
   // Write out all the object pointer fields.
   SnapshotWriterVisitor visitor(writer);
@@ skipping 1406 matching lines @@
   // Write out the class and tags information.
   writer->WriteIndexedObject(kWeakPropertyCid);
   writer->WriteIntptrValue(writer->GetObjectTags(this));
 
   // Write out all the other fields.
   writer->Write<RawObject*>(ptr()->key_);
   writer->Write<RawObject*>(ptr()->value_);
 }
 
 }  // namespace dart