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

Unified Diff: runtime/vm/raw_object_snapshot.cc

Issue 1686773002: Precompilation: drop unused types and type arguments and empty classes and libraries. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 10 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/raw_object.h ('k') | runtime/vm/snapshot.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/raw_object_snapshot.cc
diff --git a/runtime/vm/raw_object_snapshot.cc b/runtime/vm/raw_object_snapshot.cc
index 3ffab4f708deb914d26dcd2e6be8040fab1fbda4..6b9d72802f83b310841db8ea4880572b4eee9b4b 100644
--- a/runtime/vm/raw_object_snapshot.cc
+++ b/runtime/vm/raw_object_snapshot.cc
@@ -115,6 +115,7 @@ void RawClass::WriteTo(SnapshotWriter* writer,
// Write out all the non object pointer fields.
// NOTE: cpp_vtable_ is not written.
classid_t class_id = ptr()->id_;
+ ASSERT(class_id != kIllegalCid);
writer->Write<classid_t>(class_id);
if (!RawObject::IsInternalVMdefinedClassId(class_id)) {
// We don't write the instance size of VM defined classes as they
@@ -1294,6 +1295,7 @@ void RawLibrary::WriteTo(SnapshotWriter* writer,
} else {
ASSERT((kind == Snapshot::kFull) || !ptr()->is_in_fullsnapshot_);
// Write out all non object fields.
+ ASSERT(ptr()->index_ != static_cast<classid_t>(-1));
writer->WriteClassIDValue(ptr()->index_);
writer->Write<uint16_t>(ptr()->num_imports_);
writer->Write<int8_t>(ptr()->load_state_);
@@ -1334,9 +1336,18 @@ RawLibraryPrefix* LibraryPrefix::ReadFrom(SnapshotReader* reader,
prefix.StoreNonPointer(&prefix.raw_ptr()->is_loaded_, reader->Read<bool>());
// Set all the object fields.
+ RawObject** toobj = reader->snapshot_code()
+ ? prefix.raw()->to_precompiled_snapshot()
+ : prefix.raw()->to();
READ_OBJECT_FIELDS(prefix,
- prefix.raw()->from(), prefix.raw()->to(),
+ prefix.raw()->from(), toobj,
kAsReference);
+ if (reader->snapshot_code()) {
+ prefix.StorePointer(&prefix.raw_ptr()->imports_,
+ Array::null());
+ prefix.StorePointer(&prefix.raw_ptr()->dependent_code_,
+ Array::null());
+ }
return prefix.raw();
}
@@ -1363,7 +1374,9 @@ void RawLibraryPrefix::WriteTo(SnapshotWriter* writer,
// Write out all the object pointer fields.
SnapshotWriterVisitor visitor(writer, kAsReference);
- visitor.VisitPointers(from(), to());
+ RawObject** toobj = writer->snapshot_code() ? to_precompiled_snapshot()
+ : to();
+ visitor.VisitPointers(from(), toobj);
}
@@ -2007,6 +2020,9 @@ RawICData* ICData::ReadFrom(SnapshotReader* reader,
READ_OBJECT_FIELDS(result,
result.raw()->from(), toobj,
kAsReference);
+ if (reader->snapshot_code()) {
+ result.set_owner(Function::Handle(reader->zone()));
+ }
return result.raw();
}
« no previous file with comments | « runtime/vm/raw_object.h ('k') | runtime/vm/snapshot.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698