From 840d05f8ffb5e7026e5af73e9214e17acbb3c1a7 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Sun, 7 Sep 2025 05:34:36 -0700
Subject: [PATCH] tools: improve error handling in node_mksnapshot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/59437
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
---
 tools/snapshot/node_mksnapshot.cc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/snapshot/node_mksnapshot.cc b/tools/snapshot/node_mksnapshot.cc
index e446dd1668d..0842cba257d 100644
--- a/tools/snapshot/node_mksnapshot.cc
+++ b/tools/snapshot/node_mksnapshot.cc
@@ -66,8 +66,16 @@ int BuildSnapshot(int argc, char* argv[]) {
           std::vector<std::string>(argv, argv + argc),
           node::ProcessInitializationFlags::kGeneratePredictableSnapshot);
 
+  if (result->exit_code() != 0) {
+    for (const std::string& error : result->errors()) {
+      std::cerr << error << "\n";
+    }
+    std::cerr << "node_mksnapshot failed with exit code " << result->exit_code()
+              << "\n";
+    return static_cast<int>(result->exit_code());
+  }
+
   CHECK(!result->early_return());
-  CHECK_EQ(result->exit_code(), 0);
 
   std::string out_path;
   std::optional<std::string_view> builder_script_path = std::nullopt;