Commit c8e15cd
committed
deps: V8: cherry-pick 821fb3883a8e
Original commit message:
[serializer] avoid deferring objects with embedder fields
JS objects with embedder fields cannot be deferred because the
serialize/deserialize callbacks need the back reference immediately
to identify the object.
Refs: nodejs/node-v8#175
Bug: v8:11146
Change-Id: I4292f2ab0041f7b0779620437ed26905c194cd9b
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2531195
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Commit-Queue: Joyee Cheung <joyee@igalia.com>
Cr-Commit-Position: refs/heads/master@{#71134}
Refs: v8/v8@821fb38
PR-URL: #35700
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>1 parent b0d6742 commit c8e15cd
2 files changed
Lines changed: 9 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,7 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | 37 | # Reset this number to 0 on major V8 upgrades. | |
| 38 | 38 | # Increment by one for each non-official patch applied to deps/v8. | |
| 39 | - 'v8_embedder_string': '-node.9', | ||
| 39 | + 'v8_embedder_string': '-node.10', | ||
| 40 | 40 | ||
| 41 | 41 | ##### V8 defaults for Node.js ##### | |
| 42 | 42 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -30,13 +30,18 @@ void SerializerDeserializer::Iterate(Isolate* isolate, RootVisitor* visitor) { | |||
| 30 | 30 | } | |
| 31 | 31 | ||
| 32 | 32 | bool SerializerDeserializer::CanBeDeferred(HeapObject o) { | |
| 33 | - // Maps cannot be deferred as objects are expected to have a valid map | ||
| 34 | - // immediately. Internalized strings cannot be deferred as they might be | ||
| 33 | + // 1. Maps cannot be deferred as objects are expected to have a valid map | ||
| 34 | + // immediately. | ||
| 35 | + // 2. Internalized strings cannot be deferred as they might be | ||
| 35 | 36 | // converted to thin strings during post processing, at which point forward | |
| 36 | 37 | // references to the now-thin string will already have been written. | |
| 38 | + // 3. JS objects with embedder fields cannot be deferred because the | ||
| 39 | + // serialize/deserialize callbacks need the back reference immediately to | ||
| 40 | + // identify the object. | ||
| 37 | 41 | // TODO(leszeks): Could we defer string serialization if forward references | |
| 38 | 42 | // were resolved after object post processing? | |
| 39 | - return !o.IsMap() && !o.IsInternalizedString(); | ||
| 43 | + return !o.IsMap() && !o.IsInternalizedString() && | ||
| 44 | + !(o.IsJSObject() && JSObject::cast(o).GetEmbedderFieldCount() > 0); | ||
| 40 | 45 | } | |
| 41 | 46 | ||
| 42 | 47 | void SerializerDeserializer::RestoreExternalReferenceRedirector( | |
0 commit comments