[snapshot] print reference stack for JSFunctions in the isolate snapshot

joyeecheung · Commit Bot · commit d2ccc599c7a3 · 2019-06-11T13:52:15.000Z
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}
diff --git a/src/snapshot/serializer.cc b/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/src/snapshot/serializer.h b/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/src/snapshot/startup-serializer.cc b/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;

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`