[libc-commits] [libc] d386a55 - [libc] Make static_assert available even if NDEBUG is set (#99742)

[via libc-commits]

Author: Petr Hosek
Date: 2024-07-20T00:56:52-07:00
New Revision: d386a5582b286bbd8a52f2fd3dbc5c8f70a8f60d

URL: https://github.com/llvm/llvm-project/commit/d386a5582b286bbd8a52f2fd3dbc5c8f70a8f60d
DIFF: https://github.com/llvm/llvm-project/commit/d386a5582b286bbd8a52f2fd3dbc5c8f70a8f60d.diff

LOG: [libc] Make static_assert available even if NDEBUG is set (#99742)

This addresses an issue introduced in #98826 where static_assert was
made defined only when NDEBUG is not set which is different from all
other C libraries and breaks any code that uses static_assert and
doesn't guard it with NDEBUG.

Added: 
    

Modified: 
    libc/include/assert.h.def

Removed: 
    


################################################################################
diff  --git a/libc/include/assert.h.def b/libc/include/assert.h.def
index 9c924c7f58545..d5ae14a1cd810 100644
--- a/libc/include/assert.h.def
+++ b/libc/include/assert.h.def
@@ -12,22 +12,19 @@
 // This file may be usefully included multiple times to change assert()'s
 // definition based on NDEBUG.
 
-
-#undef assert
-#ifdef NDEBUG
-#define assert(e) (void)0
-#else
-
 #ifndef __cplusplus
 #undef static_assert
 #define static_assert _Static_assert
 #endif
 
+#undef assert
+#ifdef NDEBUG
+#define assert(e) (void)0
+#else
 #ifdef __cplusplus
 extern "C"
 #endif
 _Noreturn void __assert_fail(const char *, const char *, unsigned, const char *) __NOEXCEPT;
-
 #define assert(e)  \
   ((e) ? (void)0 : __assert_fail(#e, __FILE__, __LINE__, __PRETTY_FUNCTION__))
 #endif