commit 16901fbcdfe3b58e568cf0315846c192fd31135a
author Antonio Maiorano <amaiorano@google.com> Fri Mar 08 18:15:17 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Mar 08 18:15:17 2024 +0000
tree 3fe0ea50b0d6ec5036a11ac8fb94bb09dd68b117
parent 9556a4a680881d0932706cf4887909772e6e07bf

tint: fix mac build wrt 'reserved-id-macro' warning

AppleClang uses a different warning name for 'reserved-macro-identifier' named
'reserved-id-macro'. Clang source shows this to be an alias for the former:
https://github.com/llvm/llvm-project/blob/main/clang/include/clang/Basic/DiagnosticGroups.td#L723-L724

Ignore this warning when including protobuf as well.

Change-Id: I2c5b02c2ce499343ace01772bda7ba94b70f53f4
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/178265
Auto-Submit: Antonio Maiorano <amaiorano@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>

src/tint/utils/macros/compiler.h

diff --git a/src/tint/utils/macros/compiler.h b/src/tint/utils/macros/compiler.h
index dd56cde..a3de76f 100644
--- a/src/tint/utils/macros/compiler.h
+++ b/src/tint/utils/macros/compiler.h
@@ -88,8 +88,9 @@
 #define TINT_DISABLE_WARNING_DEPRECATED /* currently no-op */
 #define TINT_DISABLE_WARNING_RESERVED_IDENTIFIER \
     _Pragma("clang diagnostic ignored \"-Wreserved-identifier\"")
-#define TINT_DISABLE_WARNING_RESERVED_MACRO_IDENTIFIER \
-    _Pragma("clang diagnostic ignored \"-Wreserved-macro-identifier\"")
+#define TINT_DISABLE_WARNING_RESERVED_MACRO_IDENTIFIER                  \
+    _Pragma("clang diagnostic ignored \"-Wreserved-macro-identifier\"") \
+        _Pragma("clang diagnostic ignored \"-Wreserved-id-macro\"")
 #define TINT_DISABLE_WARNING_UNUSED_VALUE _Pragma("clang diagnostic ignored \"-Wunused-value\"")
 #define TINT_DISABLE_WARNING_UNUSED_PARAMETER \
     _Pragma("clang diagnostic ignored \"-Wunused-parameter\"")