summaryrefslogtreecommitdiff
path: root/deps/v8
diff options
context:
space:
mode:
authorMichaël Zasso <targos@protonmail.com>2019-07-20 13:38:32 +0200
committerMichaël Zasso <targos@protonmail.com>2019-08-01 12:56:29 +0200
commit3b7c95220b7f3bb637d3b2d98dad3d590574e26a (patch)
tree7aaaa3662936bb7ea1f0203338aaf546e40c1388 /deps/v8
parent21745b50d54e8944fae9120e8e7911e04c40b65c (diff)
downloadandroid-node-v8-3b7c95220b7f3bb637d3b2d98dad3d590574e26a.tar.gz
android-node-v8-3b7c95220b7f3bb637d3b2d98dad3d590574e26a.tar.bz2
android-node-v8-3b7c95220b7f3bb637d3b2d98dad3d590574e26a.zip
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: https://github.com/v8/v8/commit/d2ccc599c7a31838752350ae927e41bc386df414 PR-URL: https://github.com/nodejs/node/pull/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>
Diffstat (limited to 'deps/v8')
-rw-r--r--deps/v8/src/snapshot/serializer.cc8
-rw-r--r--deps/v8/src/snapshot/serializer.h1
-rw-r--r--deps/v8/src/snapshot/startup-serializer.cc11
3 files changed, 16 insertions, 4 deletions
diff --git a/deps/v8/src/snapshot/serializer.cc b/deps/v8/src/snapshot/serializer.cc
index 9eefbe2c48..b2dd6a33e7 100644
--- a/deps/v8/src/snapshot/serializer.cc
+++ b/deps/v8/src/snapshot/serializer.cc
@@ -115,10 +115,12 @@ void Serializer::SerializeRootObject(Object object) {
}
#ifdef DEBUG
-void Serializer::PrintStack() {
+void Serializer::PrintStack() { PrintStack(std::cout); }
+
+void Serializer::PrintStack(std::ostream& out) {
for (const auto o : stack_) {
- o.Print();
- PrintF("\n");
+ o.Print(out);
+ out << "\n";
}
}
#endif // DEBUG
diff --git a/deps/v8/src/snapshot/serializer.h b/deps/v8/src/snapshot/serializer.h
index c9e7fada80..b70c7fd45a 100644
--- a/deps/v8/src/snapshot/serializer.h
+++ b/deps/v8/src/snapshot/serializer.h
@@ -250,6 +250,7 @@ class Serializer : public SerializerDeserializer {
void PushStack(HeapObject o) { stack_.push_back(o); }
void PopStack() { stack_.pop_back(); }
void PrintStack();
+ void PrintStack(std::ostream&);
#endif // DEBUG
SerializerReferenceMap* reference_map() { return &reference_map_; }
diff --git a/deps/v8/src/snapshot/startup-serializer.cc b/deps/v8/src/snapshot/startup-serializer.cc
index 62a786f984..6ad2efc18b 100644
--- a/deps/v8/src/snapshot/startup-serializer.cc
+++ b/deps/v8/src/snapshot/startup-serializer.cc
@@ -71,7 +71,16 @@ bool IsUnexpectedCodeObject(Isolate* isolate, HeapObject obj) {
#endif // DEBUG
void StartupSerializer::SerializeObject(HeapObject obj) {
- DCHECK(!obj.IsJSFunction());
+#ifdef DEBUG
+ if (obj.IsJSFunction()) {
+ v8::base::OS::PrintError("Reference stack:\n");
+ PrintStack(std::cerr);
+ obj.Print(std::cerr);
+ FATAL(
+ "JSFunction should be added through the context snapshot instead of "
+ "the isolate snapshot");
+ }
+#endif // DEBUG
DCHECK(!IsUnexpectedCodeObject(isolate(), obj));
if (SerializeHotObject(obj)) return;