preprocessor tweak - use new Standard Conforming Preprocessor when bu…

…ilding with MSVC, addresses #7042
microsoft · Dec 19, 2024 · 068610b · 068610b
1 parent 6c2b9f3
commit 068610b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -112,6 +112,12 @@ if(NOT CMAKE_VERSION VERSION_LESS "3.13" AND MSVC AND NOT CMAKE_C_COMPILER_ARCHI
   add_link_options(/DEBUGTYPE:CV,FIXUP,PDATA /INCREMENTAL:NO)
 endif()
 
+if(MSVC)
+  # use new Standard Conforming Preprocessor
+  # https://learn.microsoft.com/en-us/cpp/preprocessor/preprocessor-experimental-overview?view=msvc-170
+  add_compile_options(/Zc:preprocessor)
+endif()
+
 # enable control flow guard
 if(WIN32)
   if(MSVC)

diff --git a/include/dxc/Support/Global.h b/include/dxc/Support/Global.h
@@ -295,6 +295,8 @@ inline void OutputDebugFormatA(const char *pszFormat, ...) {
 // This prints 'Hello World (i > 10)' and breaks in the debugger if the
 // assertion doesn't hold.
 //
+
+#if !defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL
 #define DXASSERT_ARGS(exp, fmt, ...)                                           \
   do {                                                                         \
     if (!(exp)) {                                                              \
@@ -304,6 +306,19 @@ inline void OutputDebugFormatA(const char *pszFormat, ...) {
       __debugbreak();                                                          \
     }                                                                          \
   } while (0)
+#else
+#define DXASSERT_ARGS(exp, fmt, ...)                                           \
+  do {                                                                         \
+    if (!(exp)) {                                                              \
+      OutputDebugFormatA("Error: \t%s\nFile:\n%s(%d)\nFunc:\t%s.\n\t" fmt      \
+                         "\n",                                                 \
+                         "!(" #exp ")", __FILE__, __LINE__,                    \
+                         __FUNCTION__ __VA_OPT__(, ) __VA_ARGS__);             \
+      __debugbreak();                                                          \
+    }                                                                          \
+  } while (0)
+#endif
+
 #define DXASSERT(exp, msg) DXASSERT_ARGS(exp, msg)
 
 #define DXASSERT_LOCALVAR(local, exp, msg) DXASSERT(exp, msg)
@@ -325,13 +340,23 @@ inline void OutputDebugFormatA(const char *pszFormat, ...) {
 
 #define DXVERIFY_NOMSG assert
 
+#if !defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL
 #define DXASSERT_ARGS(expr, fmt, ...)                                          \
   do {                                                                         \
     if (!(expr)) {                                                             \
       fprintf(stderr, fmt, __VA_ARGS__);                                       \
       assert(false);                                                           \
     }                                                                          \
   } while (0)
+#else
+#define DXASSERT_ARGS(expr, fmt, ...)                                          \
+  do {                                                                         \
+    if (!(expr)) {                                                             \
+      fprintf(stderr, fmt __VA_OPT__(, ) __VA_ARGS__);                        \
+      assert(false);                                                           \
+    }                                                                          \
+  } while (0)
+#endif
 
 #define DXASSERT(expr, msg)                                                    \
   do {                                                                         \