Merge pull request #20894 from JuliaLang/yyc/static-assert

Move `static_assert` to `julia_internal.h`

Author: yuyichao

src/codegen.cpp

@@ -137,10 +137,6 @@ PassManager *jl_globalPM;
 #define AddrSpaceCastInst BitCastInst
 #endif
 
-#if !defined(_COMPILER_MICROSOFT_) && __cplusplus < 201103L && !defined(static_assert)
-#  define static_assert(...)
-#endif
-
 extern "C" {
 
 #include "builtin_proto.h"

src/jl_uv.c

@@ -28,20 +28,6 @@
 #define write _write
 #endif
 
-#ifndef static_assert
-#  ifndef __cplusplus
-#    define static_assert(...)
-// Remove the following gcc special handling when we officially requires
-// gcc 4.7 (for c++11) and -std=gnu11
-#    ifdef __GNUC__
-#      if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
-#        undef static_assert
-#        define static_assert _Static_assert
-#      endif
-#    endif
-#  endif
-#endif
-
 #ifdef __cplusplus
 #include <cstring>
 extern "C" {

src/julia_internal.h

@@ -26,6 +26,20 @@
 #endif
 #endif
 
+// Remove when C11 is required for C code.
+#ifndef static_assert
+#  ifndef __cplusplus
+// C11 should already have `static_assert` from `<assert.h>` so there's no need
+// to check C version.
+#    ifdef __GNUC__
+#      define static_assert _Static_assert
+#    else
+#      define static_assert(...)
+#    endif
+#  endif
+// For C++, C++11 or MSVC is required. Both provide `static_assert`.
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif