Merge pull request godotengine#106139 from akien-mga/crash-handler-backtrace-print

Repiteo · Repiteo · commit 872ca1b3c92b · 2025-05-07T12:48:25.000-05:00
Improve script backtrace print in crash handlers
diff --git a/platform/linuxbsd/crash_handler_linuxbsd.cpp b/platform/linuxbsd/crash_handler_linuxbsd.cpp
@@ -67,9 +67,8 @@ static void handle_crash(int sig) {
 	String _execpath = OS::get_singleton()->get_executable_path();
 
 	String msg;
-	const ProjectSettings *proj_settings = ProjectSettings::get_singleton();
-	if (proj_settings) {
-		msg = proj_settings->get("debug/settings/crash_handler/message");
+	if (ProjectSettings::get_singleton()) {
+		msg = GLOBAL_GET("debug/settings/crash_handler/message");
 	}
 
 	// Tell MainLoop about the crash. This can be handled by users too in Node.
@@ -144,21 +143,18 @@ static void handle_crash(int sig) {
 
 		free(strings);
 	}
-	print_error("-- END OF BACKTRACE --");
+	print_error("-- END OF C++ BACKTRACE --");
 	print_error("================================================================");
 
-	Vector<Ref<ScriptBacktrace>> script_backtraces;
 	if (ScriptServer::are_languages_initialized()) {
-		script_backtraces = ScriptServer::capture_script_backtraces(false);
-	}
-	if (!script_backtraces.is_empty()) {
+		Vector<Ref<ScriptBacktrace>> script_backtraces = ScriptServer::capture_script_backtraces(false);
 		for (const Ref<ScriptBacktrace> &backtrace : script_backtraces) {
 			if (!backtrace->is_empty()) {
 				print_error(backtrace->format());
+				print_error(vformat("-- END OF %s BACKTRACE --", backtrace->get_language_name().to_upper()));
+				print_error("================================================================");
 			}
 		}
-		print_error("-- END OF SCRIPT BACKTRACE --");
-		print_error("================================================================");
 	}
 
 	// Abort to pass the error to the OS
diff --git a/platform/macos/crash_handler_macos.mm b/platform/macos/crash_handler_macos.mm
@@ -90,9 +90,8 @@ static void handle_crash(int sig) {
 	String _execpath = OS::get_singleton()->get_executable_path();
 
 	String msg;
-	const ProjectSettings *proj_settings = ProjectSettings::get_singleton();
-	if (proj_settings) {
-		msg = proj_settings->get("debug/settings/crash_handler/message");
+	if (ProjectSettings::get_singleton()) {
+		msg = GLOBAL_GET("debug/settings/crash_handler/message");
 	}
 
 	// Tell MainLoop about the crash. This can be handled by users too in Node.
@@ -174,21 +173,18 @@ static void handle_crash(int sig) {
 
 		free(strings);
 	}
-	print_error("-- END OF BACKTRACE --");
+	print_error("-- END OF C++ BACKTRACE --");
 	print_error("================================================================");
 
-	Vector<Ref<ScriptBacktrace>> script_backtraces;
 	if (ScriptServer::are_languages_initialized()) {
-		script_backtraces = ScriptServer::capture_script_backtraces(false);
-	}
-	if (!script_backtraces.is_empty()) {
+		Vector<Ref<ScriptBacktrace>> script_backtraces = ScriptServer::capture_script_backtraces(false);
 		for (const Ref<ScriptBacktrace> &backtrace : script_backtraces) {
 			if (!backtrace->is_empty()) {
 				print_error(backtrace->format());
+				print_error(vformat("-- END OF %s BACKTRACE --", backtrace->get_language_name().to_upper()));
+				print_error("================================================================");
 			}
 		}
-		print_error("-- END OF SCRIPT BACKTRACE --");
-		print_error("================================================================");
 	}
 
 	// Abort to pass the error to the OS
diff --git a/platform/windows/crash_handler_windows_seh.cpp b/platform/windows/crash_handler_windows_seh.cpp
@@ -134,9 +134,8 @@ DWORD CrashHandlerException(EXCEPTION_POINTERS *ep) {
 	}
 
 	String msg;
-	const ProjectSettings *proj_settings = ProjectSettings::get_singleton();
-	if (proj_settings) {
-		msg = proj_settings->get("debug/settings/crash_handler/message");
+	if (ProjectSettings::get_singleton()) {
+		msg = GLOBAL_GET("debug/settings/crash_handler/message");
 	}
 
 	// Tell MainLoop about the crash. This can be handled by users too in Node.
@@ -226,23 +225,20 @@ DWORD CrashHandlerException(EXCEPTION_POINTERS *ep) {
 		}
 	} while (frame.AddrReturn.Offset != 0 && n < 256);
 
-	print_error("-- END OF BACKTRACE --");
+	print_error("-- END OF C++ BACKTRACE --");
 	print_error("================================================================");
 
 	SymCleanup(process);
 
-	Vector<Ref<ScriptBacktrace>> script_backtraces;
 	if (ScriptServer::are_languages_initialized()) {
-		script_backtraces = ScriptServer::capture_script_backtraces(false);
-	}
-	if (!script_backtraces.is_empty()) {
+		Vector<Ref<ScriptBacktrace>> script_backtraces = ScriptServer::capture_script_backtraces(false);
 		for (const Ref<ScriptBacktrace> &backtrace : script_backtraces) {
 			if (!backtrace->is_empty()) {
 				print_error(backtrace->format());
+				print_error(vformat("-- END OF %s BACKTRACE --", backtrace->get_language_name().to_upper()));
+				print_error("================================================================");
 			}
 		}
-		print_error("-- END OF SCRIPT BACKTRACE --");
-		print_error("================================================================");
 	}
 
 	// Pass the exception to the OS
diff --git a/platform/windows/crash_handler_windows_signal.cpp b/platform/windows/crash_handler_windows_signal.cpp
@@ -140,9 +140,8 @@ extern void CrashHandlerException(int signal) {
 	}
 
 	String msg;
-	const ProjectSettings *proj_settings = ProjectSettings::get_singleton();
-	if (proj_settings) {
-		msg = proj_settings->get("debug/settings/crash_handler/message");
+	if (ProjectSettings::get_singleton()) {
+		msg = GLOBAL_GET("debug/settings/crash_handler/message");
 	}
 
 	// Tell MainLoop about the crash. This can be handled by users too in Node.
@@ -182,21 +181,18 @@ extern void CrashHandlerException(int signal) {
 		backtrace_simple(data.state, 1, &trace_callback, &error_callback, reinterpret_cast<void *>(&data));
 	}
 
-	print_error("-- END OF BACKTRACE --");
+	print_error("-- END OF C++ BACKTRACE --");
 	print_error("================================================================");
 
-	Vector<Ref<ScriptBacktrace>> script_backtraces;
 	if (ScriptServer::are_languages_initialized()) {
-		script_backtraces = ScriptServer::capture_script_backtraces(false);
-	}
-	if (!script_backtraces.is_empty()) {
+		Vector<Ref<ScriptBacktrace>> script_backtraces = ScriptServer::capture_script_backtraces(false);
 		for (const Ref<ScriptBacktrace> &backtrace : script_backtraces) {
 			if (!backtrace->is_empty()) {
 				print_error(backtrace->format());
+				print_error(vformat("-- END OF %s BACKTRACE --", backtrace->get_language_name().to_upper()));
+				print_error("================================================================");
 			}
 		}
-		print_error("-- END OF SCRIPT BACKTRACE --");
-		print_error("================================================================");
 	}
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -134,9 +134,8 @@ DWORD CrashHandlerException(EXCEPTION_POINTERS *ep) {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`String msg;`
`137`		`- const ProjectSettings *proj_settings = ProjectSettings::get_singleton();`
`138`		`- if (proj_settings) {`
`139`		`- msg = proj_settings->get("debug/settings/crash_handler/message");`
	`137`	`+ if (ProjectSettings::get_singleton()) {`
	`138`	`+ msg = GLOBAL_GET("debug/settings/crash_handler/message");`
`140`	`139`	`}`
`141`	`140`
`142`	`141`	`// Tell MainLoop about the crash. This can be handled by users too in Node.`
`@@ -226,23 +225,20 @@ DWORD CrashHandlerException(EXCEPTION_POINTERS *ep) {`
`226`	`225`	`}`
`227`	`226`	`} while (frame.AddrReturn.Offset != 0 && n < 256);`
`228`	`227`
`229`		`- print_error("-- END OF BACKTRACE --");`
	`228`	`+ print_error("-- END OF C++ BACKTRACE --");`
`230`	`229`	`print_error("================================================================");`
`231`	`230`
`232`	`231`	`SymCleanup(process);`
`233`	`232`
`234`		`- Vector<Ref<ScriptBacktrace>> script_backtraces;`
`235`	`233`	`if (ScriptServer::are_languages_initialized()) {`
`236`		`- script_backtraces = ScriptServer::capture_script_backtraces(false);`
`237`		`- }`
`238`		`- if (!script_backtraces.is_empty()) {`
	`234`	`+ Vector<Ref<ScriptBacktrace>> script_backtraces = ScriptServer::capture_script_backtraces(false);`
`239`	`235`	`for (const Ref<ScriptBacktrace> &backtrace : script_backtraces) {`
`240`	`236`	`if (!backtrace->is_empty()) {`
`241`	`237`	`print_error(backtrace->format());`
	`238`	`+ print_error(vformat("-- END OF %s BACKTRACE --", backtrace->get_language_name().to_upper()));`
	`239`	`+ print_error("================================================================");`
`242`	`240`	`}`
`243`	`241`	`}`
`244`		`- print_error("-- END OF SCRIPT BACKTRACE --");`
`245`		`- print_error("================================================================");`
`246`	`242`	`}`
`247`	`243`
`248`	`244`	`// Pass the exception to the OS`
Original file line number	Diff line number	Diff line change
`@@ -140,9 +140,8 @@ extern void CrashHandlerException(int signal) {`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`String msg;`
`143`		`- const ProjectSettings *proj_settings = ProjectSettings::get_singleton();`
`144`		`- if (proj_settings) {`
`145`		`- msg = proj_settings->get("debug/settings/crash_handler/message");`
	`143`	`+ if (ProjectSettings::get_singleton()) {`
	`144`	`+ msg = GLOBAL_GET("debug/settings/crash_handler/message");`
`146`	`145`	`}`
`147`	`146`
`148`	`147`	`// Tell MainLoop about the crash. This can be handled by users too in Node.`
`@@ -182,21 +181,18 @@ extern void CrashHandlerException(int signal) {`
`182`	`181`	`backtrace_simple(data.state, 1, &trace_callback, &error_callback, reinterpret_cast<void *>(&data));`
`183`	`182`	`}`
`184`	`183`
`185`		`- print_error("-- END OF BACKTRACE --");`
	`184`	`+ print_error("-- END OF C++ BACKTRACE --");`
`186`	`185`	`print_error("================================================================");`
`187`	`186`
`188`		`- Vector<Ref<ScriptBacktrace>> script_backtraces;`
`189`	`187`	`if (ScriptServer::are_languages_initialized()) {`
`190`		`- script_backtraces = ScriptServer::capture_script_backtraces(false);`
`191`		`- }`
`192`		`- if (!script_backtraces.is_empty()) {`
	`188`	`+ Vector<Ref<ScriptBacktrace>> script_backtraces = ScriptServer::capture_script_backtraces(false);`
`193`	`189`	`for (const Ref<ScriptBacktrace> &backtrace : script_backtraces) {`
`194`	`190`	`if (!backtrace->is_empty()) {`
`195`	`191`	`print_error(backtrace->format());`
	`192`	`+ print_error(vformat("-- END OF %s BACKTRACE --", backtrace->get_language_name().to_upper()));`
	`193`	`+ print_error("================================================================");`
`196`	`194`	`}`
`197`	`195`	`}`
`198`		`- print_error("-- END OF SCRIPT BACKTRACE --");`
`199`		`- print_error("================================================================");`
`200`	`196`	`}`
`201`	`197`	`}`
`202`	`198`	`#endif`