dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[vm] Account for the conditional nature of WeakSerializtionReference and WeakProperty references in clustered snapshots.

Browse Source 
Fixes missing ref for WeakSerializationReference::target; fixes incorrect treatment of WeakProperties as strong references. Note isolate message snapshots still incorrectly treat WeakProperties as strong references.

TEST=ci
Bug: https://github.com/dart-lang/sdk/issues/45609
Change-Id: I6dba93bc6f2e94886efde021fdf5c90a0dcb09b4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/194300
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Alexander Markov <alexmarkov@google.com>
This commit is contained in:
Ryan Macnak
2021-04-08 00:54:08 +00:00
committed by commit-bot@chromium.org
parent 05a0e79a76
commit 37616dae79
1 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/vm/clustered_snapshot.cc
+44 -3
View File
@@ -2415,6 +2415,15 @@ class WeakSerializationReferenceSerializationCluster
objects_.Add(weak);
}
void RetraceEphemerons(Serializer* s) {
for (intptr_t i = 0; i < objects_.length(); i++) {
WeakSerializationReferencePtr weak = objects_[i];
if (!s->HasRef(weak->untag()->target())) {
s->Push(weak->untag()->replacement());
}
}
}
intptr_t FinalizeWeak(Serializer* s) { return objects_.length(); }
void WriteAlloc(Serializer* s) {
@@ -5029,7 +5038,15 @@ class WeakPropertySerializationCluster : public SerializationCluster {
void Trace(Serializer* s, ObjectPtr object) {
WeakPropertyPtr property = WeakProperty::RawCast(object);
objects_.Add(property);
PushFromTo(property);
}
void RetraceEphemerons(Serializer* s) {
for (intptr_t i = 0; i < objects_.length(); i++) {
WeakPropertyPtr property = objects_[i];
if (s->HasRef(property->untag()->key())) {
s->Push(property->untag()->value());
}
}
}
void WriteAlloc(Serializer* s) {
@@ -5047,7 +5064,14 @@ class WeakPropertySerializationCluster : public SerializationCluster {
for (intptr_t i = 0; i < count; i++) {
WeakPropertyPtr property = objects_[i];
AutoTraceObject(property);
WriteFromTo(property);
if (s->HasRef(property->untag()->key())) {
s->WriteOffsetRef(property->untag()->key(), WeakProperty::key_offset());
s->WriteOffsetRef(property->untag()->value(),
WeakProperty::value_offset());
} else {
s->WriteOffsetRef(Object::null(), WeakProperty::key_offset());
s->WriteOffsetRef(Object::null(), WeakProperty::value_offset());
}
}
}
@@ -6759,7 +6783,24 @@ ZoneGrowableArray<Object*>* Serializer::Serialize(SerializationRoots* roots) {
roots->PushRoots(this);
while (stack_.length() > 0) {
Trace(stack_.RemoveLast());
// Strong references.
while (stack_.length() > 0) {
Trace(stack_.RemoveLast());
}
// Ephemeron references.
#if defined(DART_PRECOMPILER)
if (auto const cluster =
reinterpret_cast<WeakSerializationReferenceSerializationCluster*>(
clusters_by_cid_[kWeakSerializationReferenceCid])) {
cluster->RetraceEphemerons(this);
}
#endif
if (auto const cluster =
reinterpret_cast<WeakPropertySerializationCluster*>(
clusters_by_cid_[kWeakPropertyCid])) {
cluster->RetraceEphemerons(this);
}
}
GrowableArray<SerializationCluster*> canonical_clusters;