michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Revert "toolchain: common: Merge build assert macros"

Browse source 
This reverts commit 974aa3add4.

Pull Request #23437 was merged by mistake with an invalid manifest.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2020-03-19 15:59:14 +01:00 • committed by Carles Cufí
commit cd38fb1610
3 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

22
doc/reference/kernel/other/fatal.rst
View file

@ -123,8 +123,8 @@ Build Assertions
Zephyr provides two macros for performing build-time assertion checks. Zephyr provides two macros for performing build-time assertion checks.
These are evaluated completely at compile-time, and are always checked. These are evaluated completely at compile-time, and are always checked.
BUILD_ASSERT() BUILD_ASSERT_MSG()
-------------- ------------------
This has the same semantics as C's ``_Static_assert`` or C++'s This has the same semantics as C's ``_Static_assert`` or C++'s
``static_assert``. If the evaluation fails, a build error will be generated by ``static_assert``. If the evaluation fails, a build error will be generated by
@ -138,7 +138,8 @@ For example, suppose this check fails:
.. code-block:: c .. code-block:: c
BUILD_ASSERT(FOO == 2000, "Invalid value of FOO"); BUILD_ASSERT_MSG(FOO == 2000,
"Invalid value of FOO");
With GCC, the output resembles: With GCC, the output resembles:
@ -146,16 +147,17 @@ With GCC, the output resembles:
tests/kernel/fatal/src/main.c: In function 'test_main': tests/kernel/fatal/src/main.c: In function 'test_main':
include/toolchain/gcc.h:28:37: error: static assertion failed: "Invalid value of FOO" include/toolchain/gcc.h:28:37: error: static assertion failed: "Invalid value of FOO"
#define BUILD_ASSERT(EXPR, MSG) _Static_assert(EXPR, "" MSG) #define BUILD_ASSERT_MSG(EXPR, MSG) _Static_assert(EXPR, MSG)
^~~~~~~~~~~~~~ ^~~~~~~~~~~~~~
tests/kernel/fatal/src/main.c:370:2: note: in expansion of macro 'BUILD_ASSERT' tests/kernel/fatal/src/main.c:370:2: note: in expansion of macro 'BUILD_ASSERT_MSG'
BUILD_ASSERT(FOO == 2000, BUILD_ASSERT_MSG(FOO == 2000,
^~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~
BUILD_ASSERT_MSG() BUILD_ASSERT()
------------------ --------------
This macro is identical to ``BUILD_ASSERT()``. Its use is deprecated. This works just like ``BUILD_ASSERT_MSG()`` except there is no supplemental
message provided, and like ``__ASSERT_NO_MSG()`` its use is discouraged.
Kernel Oops Kernel Oops
=========== ===========

10
include/toolchain/common.h
View file

@ -138,17 +138,15 @@
#define __subsystem #define __subsystem
#ifndef BUILD_ASSERT #ifndef BUILD_ASSERT
/* Compile-time assertion that makes the build to fail. /* compile-time assertion that makes the build fail */
* Common implementation swallows the message. #define BUILD_ASSERT(EXPR) \
*/
#define BUILD_ASSERT(EXPR, MSG) \
enum _CONCAT(__build_assert_enum, __COUNTER__) { \ enum _CONCAT(__build_assert_enum, __COUNTER__) { \
_CONCAT(__build_assert, __COUNTER__) = 1 / !!(EXPR) \ _CONCAT(__build_assert, __COUNTER__) = 1 / !!(EXPR) \
} }
#endif #endif
#ifndef BUILD_ASSERT_MSG #ifndef BUILD_ASSERT_MSG
#define BUILD_ASSERT_MSG(EXPR, MSG) __DEPRECATED_MACRO BUILD_ASSERT(EXPR, MSG) /* build assertion with message -- common implementation swallows message. */
#define BUILD_ASSERT_MSG(EXPR, MSG) BUILD_ASSERT(EXPR)
#endif #endif
/* /*

9
include/toolchain/gcc.h
View file

@ -50,17 +50,16 @@
/* C++11 has static_assert built in */ /* C++11 has static_assert built in */
#ifdef __cplusplus #ifdef __cplusplus
#define BUILD_ASSERT(EXPR, MSG...) static_assert(EXPR, "" MSG) #define BUILD_ASSERT(EXPR) static_assert(EXPR, "")
#define BUILD_ASSERT_MSG(EXPR, MSG) __DEPRECATED_MACRO BUILD_ASSERT(EXPR, MSG) #define BUILD_ASSERT_MSG(EXPR, MSG) static_assert(EXPR, MSG)
/* /*
* GCC 4.6 and higher have the C11 _Static_assert built in, and its * GCC 4.6 and higher have the C11 _Static_assert built in, and its
* output is easier to understand than the common BUILD_ASSERT macros. * output is easier to understand than the common BUILD_ASSERT macros.
*/ */
#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) || \ #elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) || \
(__STDC_VERSION__) >= 201100 (__STDC_VERSION__) >= 201100
#define BUILD_ASSERT(EXPR, MSG...) _Static_assert(EXPR, "" MSG) #define BUILD_ASSERT(EXPR) _Static_assert(EXPR, "")
#define BUILD_ASSERT_MSG(EXPR, MSG) __DEPRECATED_MACRO BUILD_ASSERT(EXPR, MSG) #define BUILD_ASSERT_MSG(EXPR, MSG) _Static_assert(EXPR, MSG)
#endif #endif
#include <toolchain/common.h> #include <toolchain/common.h>