Use /Zc:preprocessor instead of MSVC workarounds

Signed-off-by: Gregory Shimansky <[email protected]>

Author: gshimansky

CMakeLists.txt

@@ -41,8 +41,8 @@ if(NOT MSVC)
   set(CMAKE_CXX_FLAGS_TRITONBUILDWITHO1 "-O1")
 else()
   set(CMAKE_CXX_STANDARD 20)
-  set(CMAKE_C_FLAGS_TRITONRELBUILDWITHASSERTS "/Zi /Ob0 /Od /RTC1 /bigobj")
-  set(CMAKE_CXX_FLAGS_TRITONRELBUILDWITHASSERTS "/Zi /Ob0 /Od /RTC1 /bigobj ")
+  set(CMAKE_C_FLAGS_TRITONRELBUILDWITHASSERTS "/Zi /Ob0 /Od /RTC1 /bigobj /Zc:preprocessor")
+  set(CMAKE_CXX_FLAGS_TRITONRELBUILDWITHASSERTS "/Zi /Ob0 /Od /RTC1 /bigobj /Zc:preprocessor")
   set(CMAKE_EXE_LINKER_FLAGS_TRITONRELBUILDWITHASSERTS "/debug:fastlink /INCREMENTAL")
   set(CMAKE_MODULE_LINKER_FLAGS_TRITONRELBUILDWITHASSERTS "/debug:fastlink /INCREMENTAL")
   set(CMAKE_SHARED_LINKER_FLAGS_TRITONRELBUILDWITHASSERTS "/debug:fastlink /INCREMENTAL")

python/src/main.cc

@@ -4,26 +4,21 @@
 
 namespace py = pybind11;
 
-#define EXPAND(x) x
 #define FOR_EACH_1(MACRO, X) MACRO(X)
-#define FOR_EACH_2(MACRO, X, ...)                                              \
-  MACRO(X) EXPAND(FOR_EACH_1(MACRO, __VA_ARGS__))
-#define FOR_EACH_3(MACRO, X, ...)                                              \
-  MACRO(X) EXPAND(FOR_EACH_2(MACRO, __VA_ARGS__))
-#define FOR_EACH_4(MACRO, X, ...)                                              \
-  MACRO(X) EXPAND(FOR_EACH_3(MACRO, __VA_ARGS__))
+#define FOR_EACH_2(MACRO, X, ...) MACRO(X) FOR_EACH_1(MACRO, __VA_ARGS__)
+#define FOR_EACH_3(MACRO, X, ...) MACRO(X) FOR_EACH_2(MACRO, __VA_ARGS__)
+#define FOR_EACH_4(MACRO, X, ...) MACRO(X) FOR_EACH_3(MACRO, __VA_ARGS__)
 
 #define FOR_EACH_NARG(...) FOR_EACH_NARG_(__VA_ARGS__, FOR_EACH_RSEQ_N())
-#define FOR_EACH_NARG_(...) EXPAND(FOR_EACH_ARG_N(__VA_ARGS__))
+#define FOR_EACH_NARG_(...) FOR_EACH_ARG_N(__VA_ARGS__)
 #define FOR_EACH_ARG_N(_1, _2, _3, _4, N, ...) N
 #define FOR_EACH_RSEQ_N() 4, 3, 2, 1, 0
 
 #define CONCATENATE(x, y) CONCATENATE1(x, y)
 #define CONCATENATE1(x, y) x##y
 
 #define FOR_EACH(MACRO, ...)                                                   \
-  EXPAND(CONCATENATE(FOR_EACH_,                                                \
-                     FOR_EACH_NARG_HELPER(__VA_ARGS__))(MACRO, __VA_ARGS__))
+  CONCATENATE(FOR_EACH_, FOR_EACH_NARG_HELPER(__VA_ARGS__))(MACRO, __VA_ARGS__)
 #define FOR_EACH_NARG_HELPER(...) FOR_EACH_NARG(__VA_ARGS__)
 
 // New macro to remove parentheses