Check macro arguments match format specifier.

Prevents typos that can cause undefined behavior. Bug: b/127433389 Change-Id: I6308831d9ae8ff3d6147c5a766de81fdc239fab5 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/29931Tested-by: Ben Clayton <bclayton@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Check macro arguments match format specifier.
46e28cb3 · Ben Clayton · 4bade2e3 · 46e28cb3 · 46e28cb3
Commit 46e28cb3 authored Apr 25, 2019 by Ben Clayton
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 6 deletions

Debug.hpp src/Reactor/Debug.hpp +9 -3

VkDebug.hpp src/Vulkan/VkDebug.hpp +9 -3

No files found.
--- a/src/Reactor/Debug.hpp
+++ b/src/Reactor/Debug.hpp
@@ -25,18 +25,24 @@
 #define TRACE_OUTPUT_FILE "debug.txt"
 #endif

+#if defined(__GNUC__) || defined(__clang__)
+#define CHECK_PRINTF_ARGS __attribute__((format(printf, 1, 2)))
+#else
+#define CHECK_PRINTF_ARGS
+#endif
+
 namespace rr
 {
 	// Outputs text to the debugging log
-	void trace(const char *format, ...);
+	void trace(const char *format, ...) CHECK_PRINTF_ARGS;
 	inline void trace() {}

 	// Outputs text to the debugging log and prints to stderr.
-	void warn(const char *format, ...);
+	void warn(const char *format, ...) CHECK_PRINTF_ARGS;
 	inline void warn() {}

 	// Outputs the message to the debugging log and stderr, and calls abort().
-	void abort(const char *format, ...);
+	void abort(const char *format, ...) CHECK_PRINTF_ARGS;
 }

 // A macro to output a trace of a function call and its arguments to the

--- a/src/Vulkan/VkDebug.hpp
+++ b/src/Vulkan/VkDebug.hpp
@@ -25,18 +25,24 @@
 #define TRACE_OUTPUT_FILE "debug.txt"
 #endif

+#if defined(__GNUC__) || defined(__clang__)
+#define CHECK_PRINTF_ARGS __attribute__((format(printf, 1, 2)))
+#else
+#define CHECK_PRINTF_ARGS
+#endif
+
 namespace vk
 {
 	// Outputs text to the debugging log
-	void trace(const char *format, ...);
+	void trace(const char *format, ...) CHECK_PRINTF_ARGS;
 	inline void trace() {}

 	// Outputs text to the debugging log and prints to stderr.
-	void warn(const char *format, ...);
+	void warn(const char *format, ...) CHECK_PRINTF_ARGS;
 	inline void warn() {}

 	// Outputs the message to the debugging log and stderr, and calls abort().
-	void abort(const char *format, ...);
+	void abort(const char *format, ...) CHECK_PRINTF_ARGS;
 }

 // A macro to output a trace of a function call and its arguments to the