nodejs
diff --git a/‎src/api/embed_helpers.cc‎
Lines changed: 1 addition & 0 deletions b/‎src/api/embed_helpers.cc‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/env.cc‎
Lines changed: 19 additions & 0 deletions b/‎src/env.cc‎
Lines changed: 19 additions & 0 deletions
diff --git a/‎src/env.h‎
Lines changed: 2 additions & 0 deletions b/‎src/env.h‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/node_binding.cc‎
Lines changed: 1 addition & 0 deletions b/‎src/node_binding.cc‎
Lines changed: 1 addition & 0 deletions
@@ -53,6 +53,7 @@ Maybe<int> SpinEventLoop(Environment* env) {
   if (env->is_stopping()) return Nothing<int>();
 
   env->set_trace_sync_io(false);
+  env->PrintInfoForSnapshotIfDebug();
   env->VerifyNoStrongBaseObjects();
   return EmitProcessExit(env);
 }
 
@@ -1232,6 +1232,25 @@ void Environment::RemoveUnmanagedFd(int fd) {
   }
 }
 
+void Environment::PrintInfoForSnapshotIfDebug() {
+  if (enabled_debug_list()->enabled(DebugCategory::MKSNAPSHOT)) {
+    fprintf(stderr, "BaseObjects at the exit of the Environment:\n");
+    PrintAllBaseObjects();
+    fprintf(stderr, "\nNative modules without cache:\n");
+    for (const auto& s : native_modules_without_cache) {
+      fprintf(stderr, "%s\n", s.c_str());
+    }
+    fprintf(stderr, "\nNative modules with cache:\n");
+    for (const auto& s : native_modules_with_cache) {
+      fprintf(stderr, "%s\n", s.c_str());
+    }
+    fprintf(stderr, "\nStatic bindings (need to be registered):\n");
+    for (const auto mod : internal_bindings) {
+      fprintf(stderr, "%s:%s\n", mod->nm_filename, mod->nm_modname);
+    }
+  }
+}
+
 void Environment::PrintAllBaseObjects() {
   size_t i = 0;
   std::cout << "BaseObjects\n";
 
@@ -960,6 +960,7 @@ class Environment : public MemoryRetainer {
   void CreateProperties();
   void DeserializeProperties(const EnvSerializeInfo* info);
 
+  void PrintInfoForSnapshotIfDebug();
   void PrintAllBaseObjects();
   void VerifyNoStrongBaseObjects();
   void EnqueueDeserializeRequest(DeserializeRequestCallback cb,
@@ -1123,6 +1124,7 @@ class Environment : public MemoryRetainer {
   // List of id's that have been destroyed and need the destroy() cb called.
   inline std::vector<double>* destroy_async_id_list();
 
+  std::set<struct node_module*> internal_bindings;
   std::set<std::string> native_modules_with_cache;
   std::set<std::string> native_modules_without_cache;
   // This is only filled during deserialization. We use a vector since
 
@@ -582,6 +582,7 @@ void GetInternalBinding(const FunctionCallbackInfo<Value>& args) {
   node_module* mod = FindModule(modlist_internal, *module_v, NM_F_INTERNAL);
   if (mod != nullptr) {
     exports = InitModule(env, mod, module);
+    env->internal_bindings.insert(mod);
   } else if (!strcmp(*module_v, "constants")) {
     exports = Object::New(env->isolate());
     CHECK(
Original file line number	Diff line number	Diff line change
@@ -53,6 +53,7 @@ Maybe<int> SpinEventLoop(Environment* env) {
53	53	if (env->is_stopping()) return Nothing<int>();
54	54
55	55	env->set_trace_sync_io(false);
	56	+ env->PrintInfoForSnapshotIfDebug();
56	57	env->VerifyNoStrongBaseObjects();
57	58	return EmitProcessExit(env);
58	59	}