Reviewers: Yang,
Message:
As discussed.
For the Scripts' weak fixed array, it shouldn't matter when we clear them; I
moved clearing those as well for consistency.
Description:
[serializer] Move WeakFixedArray compaction to separate heap walk phase
This avoids discovering and compacting the same array repeatedly. No change
in
resulting snapshots intended.
R=yang...@chromium.org
Please review this at https://codereview.chromium.org/1290393002/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+22, -28 lines):
M src/api.cc
M src/snapshot/serialize.cc
Index: src/api.cc
diff --git a/src/api.cc b/src/api.cc
index
5bb56e6e722af5b415335642e86992229bc90230..73d388b0f6f26045b1bb9a2981b0d728abc7a1b0
100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -393,6 +393,28 @@ StartupData V8::CreateSnapshotDataBlob(const char*
custom_source) {
// If we don't do this then we end up with a stray root pointing at
the
// context even after we have disposed of the context.
internal_isolate->heap()->CollectAllAvailableGarbage("mksnapshot");
+
+ // GC may have cleared weak cells, so compact any WeakFixedArrays
+ // found on the heap.
+ i::HeapIterator iterator(internal_isolate->heap(),
+ i::HeapIterator::kFilterUnreachable);
+ for (i::HeapObject* o = iterator.next(); o != NULL; o =
iterator.next()) {
+ if (o->IsPrototypeInfo()) {
+ i::Object* prototype_users =
+ i::PrototypeInfo::cast(o)->prototype_users();
+ if (prototype_users->IsWeakFixedArray()) {
+ i::WeakFixedArray* array =
i::WeakFixedArray::cast(prototype_users);
+
array->Compact<i::JSObject::PrototypeRegistryCompactionCallback>();
+ }
+ } else if (o->IsScript()) {
+ i::Object* shared_list =
i::Script::cast(o)->shared_function_infos();
+ if (shared_list->IsWeakFixedArray()) {
+ i::WeakFixedArray* array =
i::WeakFixedArray::cast(shared_list);
+ array->Compact<i::WeakFixedArray::NullCallback>();
+ }
+ }
+ }
+
i::Object* raw_context = *v8::Utils::OpenPersistent(context);
context.Reset();
Index: src/snapshot/serialize.cc
diff --git a/src/snapshot/serialize.cc b/src/snapshot/serialize.cc
index
81e071c0fb05809d6b905fe8c5373bbb8e6bc5e6..1e6012f7e75033298631985add97e6c8d10fd3d9
100644
--- a/src/snapshot/serialize.cc
+++ b/src/snapshot/serialize.cc
@@ -1923,38 +1923,10 @@ void Serializer::ObjectSerializer::Serialize() {
// We don't expect fillers.
DCHECK(!object_->IsFiller());
- if (object_->IsPrototypeInfo()) {
- Object* prototype_users =
PrototypeInfo::cast(object_)->prototype_users();
- if (prototype_users->IsWeakFixedArray()) {
- WeakFixedArray* array = WeakFixedArray::cast(prototype_users);
- array->Compact<JSObject::PrototypeRegistryCompactionCallback>();
- }
- }
- // Compaction of a prototype users list can require the registered users
- // to update their remembered slots. That doesn't work if those users
- // have already been serialized themselves. So if this object is a
- // registered user, compact its prototype's user list now.
- if (object_->IsMap()) {
- Map* map = Map::cast(object_);
- if (map->is_prototype_map() &&
map->prototype_info()->IsPrototypeInfo() &&
- PrototypeInfo::cast(map->prototype_info())->registry_slot() !=
- PrototypeInfo::UNREGISTERED) {
- JSObject* proto = JSObject::cast(map->prototype());
- PrototypeInfo* info =
PrototypeInfo::cast(proto->map()->prototype_info());
- WeakFixedArray* array =
WeakFixedArray::cast(info->prototype_users());
- array->Compact<JSObject::PrototypeRegistryCompactionCallback>();
- }
- }
-
if (object_->IsScript()) {
// Clear cached line ends.
Object* undefined = serializer_->isolate()->heap()->undefined_value();
Script::cast(object_)->set_line_ends(undefined);
- Object* shared_list = Script::cast(object_)->shared_function_infos();
- if (shared_list->IsWeakFixedArray()) {
- WeakFixedArray::cast(shared_list)
- ->Compact<WeakFixedArray::NullCallback>();
- }
}
if (object_->IsExternalString()) {
--
--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
