Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(492)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/vm/raw_object_snapshot.cc

Issue 15640002: Fix runnning of vm benchmarks on golem. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/benchmark_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/raw_object_snapshot.cc
===================================================================
--- runtime/vm/raw_object_snapshot.cc (revision 22913)
+++ runtime/vm/raw_object_snapshot.cc (working copy)
@@ -573,8 +573,10 @@
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
+ ASSERT(((kind == Snapshot::kScript) &&
+ !RawObject::IsCreatedFromSnapshot(tags)) ||
+ (kind == Snapshot::kFull));
// Allocate function object.
PatchClass& cls = PatchClass::ZoneHandle(reader->isolate(),
@@ -600,8 +602,10 @@
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);
@@ -620,8 +624,10 @@
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(
@@ -647,8 +653,10 @@
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);
@@ -678,8 +686,10 @@
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(
@@ -705,8 +715,10 @@
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);
@@ -726,8 +738,10 @@
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(
@@ -764,8 +778,10 @@
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);
@@ -796,8 +812,10 @@
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));
@@ -828,8 +846,10 @@
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);
@@ -904,8 +924,10 @@
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();
@@ -941,8 +963,10 @@
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);
@@ -969,8 +993,10 @@
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));
@@ -1003,8 +1029,10 @@
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);
@@ -1088,7 +1116,8 @@
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_);
@@ -1119,8 +1148,10 @@
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(
@@ -1149,8 +1180,10 @@
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);
@@ -1173,8 +1206,10 @@
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(
@@ -1200,8 +1235,10 @@
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);
« no previous file with comments | « runtime/vm/benchmark_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698