feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'contrib/github_pr_13256' into 'master'

Browse Source 
Use __builtin_unreachable in HAL_ASSERT no-assert mode (GitHub PR)

Closes IDFGH-12202

See merge request espressif/esp-idf!29237
This commit is contained in:
morris
2024-03-06 18:45:29 +08:00
parent 3359694717 be8033701c
commit 3f76aca0a3
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/hal/platform_port/include/hal/assert.h
View File

@@ -38,7 +38,7 @@ extern void abort(void);
#elif CONFIG_HAL_DEFAULT_ASSERTION_LEVEL == 2 // full assertion #elif CONFIG_HAL_DEFAULT_ASSERTION_LEVEL == 2 // full assertion
#define HAL_ASSERT(__e) (__builtin_expect(!!(__e), 1) ? (void)0 : __assert_func(__FILE__, __LINE__, __ASSERT_FUNC, #__e)) #define HAL_ASSERT(__e) (__builtin_expect(!!(__e), 1) ? (void)0 : __assert_func(__FILE__, __LINE__, __ASSERT_FUNC, #__e))
#else // no assert #else // no assert
#define HAL_ASSERT(__e) ((void)(__e)) #define HAL_ASSERT(__e) (__builtin_expect(!!(__e), 1) ? (void)0 : __builtin_unreachable())
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

3
tools/test_apps/system/cxx_pthread_bluetooth/sdkconfig.defaults
View File

@@ -1,3 +1,6 @@
CONFIG_PARTITION_TABLE_OFFSET=0x9000 CONFIG_PARTITION_TABLE_OFFSET=0x9000
CONFIG_BT_ENABLED=y CONFIG_BT_ENABLED=y
CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=n CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=n
# want to test clang build with HAL assertion disabled
CONFIG_HAL_ASSERTION_DISABLE=y