[llvm][Support] Fix missing-field-initializer warnings for crashreporter_annotations_t

[Michael137]

Use CRASHREPORTER_ANNOTATIONS_INITIALIZER when possible, which will handle the field initialization for us. That's what we already do in compiler-rt:

llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp

Lines 799 to 817 in 0c480dd

	#if HAVE_CRASHREPORTERCLIENT_H
	// Available in CRASHREPORTER_ANNOTATIONS_VERSION 5+
	# ifdef CRASHREPORTER_ANNOTATIONS_INITIALIZER
	CRASHREPORTER_ANNOTATIONS_INITIALIZER()
	# else
	// Support for older CrashRerporter annotiations
	CRASH_REPORTER_CLIENT_HIDDEN
	struct crashreporter_annotations_t gCRAnnotations
	__attribute__((section("__DATA," CRASHREPORTER_ANNOTATIONS_SECTION))) = {
	CRASHREPORTER_ANNOTATIONS_VERSION,
	0,
	0,
	0,
	0,
	0,
	0,
	# if CRASHREPORTER_ANNOTATIONS_VERSION > 4
	0,
	# endif

This way we won't get these warnings when the layout of crashreporter_annotations_t changes:

llvm/lib/Support/PrettyStackTrace.cpp:92:65: warning: missing field 'blah' initializer [-Wmissing-field-initializers]
        = { CRASHREPORTER_ANNOTATIONS_VERSION, 0, 0, 0, 0, 0, 0, 0 };
                                                                  ^
1 warning generated

[llvmbot]

@llvm/pr-subscribers-llvm-support

Author: Michael Buch (Michael137)

Changes

Use CRASHREPORTER_ANNOTATIONS_INITIALIZER when possible, which will handle the field initialization for us. That's what we already do in compiler-rt:

llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp

Lines 799 to 817 in 0c480dd

	#if HAVE_CRASHREPORTERCLIENT_H
	// Available in CRASHREPORTER_ANNOTATIONS_VERSION 5+
	# ifdef CRASHREPORTER_ANNOTATIONS_INITIALIZER
	CRASHREPORTER_ANNOTATIONS_INITIALIZER()
	# else
	// Support for older CrashRerporter annotiations
	CRASH_REPORTER_CLIENT_HIDDEN
	struct crashreporter_annotations_t gCRAnnotations
	__attribute__((section("__DATA," CRASHREPORTER_ANNOTATIONS_SECTION))) = {
	CRASHREPORTER_ANNOTATIONS_VERSION,
	0,
	0,
	0,
	0,
	0,
	0,
	# if CRASHREPORTER_ANNOTATIONS_VERSION > 4
	0,
	# endif

This way we won't get these warnings when the layout of crashreporter_annotations_t changes:

llvm/lib/Support/PrettyStackTrace.cpp:92:65: warning: missing field 'blah' initializer [-Wmissing-field-initializers]
        = { CRASHREPORTER_ANNOTATIONS_VERSION, 0, 0, 0, 0, 0, 0, 0 };
                                                                  ^
1 warning generated

---

Full diff: https://github.com/llvm/llvm-project/pull/154716.diff

1 Files Affected:

• (modified) llvm/lib/Support/PrettyStackTrace.cpp (+19-7)

diff --git a/llvm/lib/Support/PrettyStackTrace.cpp b/llvm/lib/Support/PrettyStackTrace.cpp
index 3f03368c5d22e..8182468d28303 100644
--- a/llvm/lib/Support/PrettyStackTrace.cpp
+++ b/llvm/lib/Support/PrettyStackTrace.cpp
@@ -114,15 +114,27 @@ static void PrintCurStackTrace(raw_ostream &OS) {
 //  If any clients of llvm try to link to libCrashReporterClient.a themselves,
 //  only one crash info struct will be used.
 extern "C" {
+#ifdef CRASHREPORTER_ANNOTATIONS_INITIALIZER
+// Available in CRASHREPORTER_ANNOTATIONS_VERSION 5+
+CRASHREPORTER_ANNOTATIONS_INITIALIZER()
+#else
+// Older CrashReporter annotations layouts
 CRASH_REPORTER_CLIENT_HIDDEN
 struct crashreporter_annotations_t gCRAnnotations
-        __attribute__((section("__DATA," CRASHREPORTER_ANNOTATIONS_SECTION)))
-#if CRASHREPORTER_ANNOTATIONS_VERSION < 5
-        = { CRASHREPORTER_ANNOTATIONS_VERSION, 0, 0, 0, 0, 0, 0 };
-#else
-        = { CRASHREPORTER_ANNOTATIONS_VERSION, 0, 0, 0, 0, 0, 0, 0 };
-#endif
-}
+    __attribute__((section("__DATA," CRASHREPORTER_ANNOTATIONS_SECTION))) = {
+        CRASHREPORTER_ANNOTATIONS_VERSION,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+#if CRASHREPORTER_ANNOTATIONS_VERSION > 4
+        0
+#endif // CRASHREPORTER_ANNOTATIONS_VERSION > 4
+};
+#endif // CRASHREPORTER_ANNOTATIONS_INITIALIZER
+} // extern "C"
 #elif defined(__APPLE__) && HAVE_CRASHREPORTER_INFO
 extern "C" const char *__crashreporter_info__
     __attribute__((visibility("hidden"))) = 0;

[fhahn]

LGTM, thanks