Commit 492b7cb
committed
deps: V8: cherry-pick d2ccc59
Original commit message:
[snapshot] print reference stack for JSFunctions in the isolate snapshot
This helps debugging incorrect usage of the SnapshotCreator API in
debug mode.
Change-Id: Ibd9db76a5f460cdf7ea6d14e865592ebaf69aeef
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1648240
Reviewed-by: Yang Guo <yangguo@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#62095}
Refs: v8/v8@d2ccc59
Backport-PR-URL: #28955
PR-URL: #28016
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Refael Ackermann (רפאל פלחי) <refack@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>1 parent 945955f commit 492b7cb
4 files changed
Lines changed: 17 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -38,7 +38,7 @@ | |||
| 38 | 38 | ||
| 39 | 39 | # Reset this number to 0 on major V8 upgrades. | |
| 40 | 40 | # Increment by one for each non-official patch applied to deps/v8. | |
| 41 | - 'v8_embedder_string': '-node.12', | ||
| 41 | + 'v8_embedder_string': '-node.13', | ||
| 42 | 42 | ||
| 43 | 43 | ##### V8 defaults for Node.js ##### | |
| 44 | 44 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -115,10 +115,12 @@ void Serializer::SerializeRootObject(Object object) { | |||
| 115 | 115 | } | |
| 116 | 116 | ||
| 117 | 117 | #ifdef DEBUG | |
| 118 | - void Serializer::PrintStack() { | ||
| 118 | + void Serializer::PrintStack() { PrintStack(std::cout); } | ||
| 119 | + | ||
| 120 | + void Serializer::PrintStack(std::ostream& out) { | ||
| 119 | 121 | for (const auto o : stack_) { | |
| 120 | - o.Print(); | ||
| 121 | - PrintF("\n"); | ||
| 122 | + o.Print(out); | ||
| 123 | + out << "\n"; | ||
| 122 | 124 | } | |
| 123 | 125 | } | |
| 124 | 126 | #endif // DEBUG | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -250,6 +250,7 @@ class Serializer : public SerializerDeserializer { | |||
| 250 | 250 | void PushStack(HeapObject o) { stack_.push_back(o); } | |
| 251 | 251 | void PopStack() { stack_.pop_back(); } | |
| 252 | 252 | void PrintStack(); | |
| 253 | + void PrintStack(std::ostream&); | ||
| 253 | 254 | #endif // DEBUG | |
| 254 | 255 | ||
| 255 | 256 | SerializerReferenceMap* reference_map() { return &reference_map_; } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -71,7 +71,16 @@ bool IsUnexpectedCodeObject(Isolate* isolate, HeapObject obj) { | |||
| 71 | 71 | #endif // DEBUG | |
| 72 | 72 | ||
| 73 | 73 | void StartupSerializer::SerializeObject(HeapObject obj) { | |
| 74 | - DCHECK(!obj.IsJSFunction()); | ||
| 74 | + #ifdef DEBUG | ||
| 75 | + if (obj.IsJSFunction()) { | ||
| 76 | + v8::base::OS::PrintError("Reference stack:\n"); | ||
| 77 | + PrintStack(std::cerr); | ||
| 78 | + obj.Print(std::cerr); | ||
| 79 | + FATAL( | ||
| 80 | + "JSFunction should be added through the context snapshot instead of " | ||
| 81 | + "the isolate snapshot"); | ||
| 82 | + } | ||
| 83 | + #endif // DEBUG | ||
| 75 | 84 | DCHECK(!IsUnexpectedCodeObject(isolate(), obj)); | |
| 76 | 85 | ||
| 77 | 86 | if (SerializeHotObject(obj)) return; | |
0 commit comments