diff options
| author | Sverker Eriksson <sverker@erlang.org> | 2021-02-18 19:02:07 +0100 |
|---|---|---|
| committer | Sverker Eriksson <sverker@erlang.org> | 2021-02-18 19:02:07 +0100 |
| commit | 82f855a488df40498837db9492bb576add152296 (patch) | |
| tree | d50f433a3b78aa00060e55bdc2c5178997284567 /erts/lib_src | |
| parent | 188ce0ba2c948826c636a145f249a995c9983717 (diff) | |
| parent | ce5d18a2c4275c8be72936667c91036697ec77e5 (diff) | |
| download | erlang-82f855a488df40498837db9492bb576add152296.tar.gz | |
Merge branch 'lukas/erts/clang-sanatizer'
Diffstat (limited to 'erts/lib_src')
| -rw-r--r-- | erts/lib_src/common/ethr_aux.c | 4 | ||||
| -rw-r--r-- | erts/lib_src/common/ethr_mutex.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/erts/lib_src/common/ethr_aux.c b/erts/lib_src/common/ethr_aux.c index c24f262e9c..ea860fa568 100644 --- a/erts/lib_src/common/ethr_aux.c +++ b/erts/lib_src/common/ethr_aux.c @@ -751,9 +751,9 @@ ETHR_IMPL_NORETURN__ ethr_fatal_error__(const char *file, ethr_abort__(); } -int ethr_assert_failed(const char *file, int line, const char *func, char *a) +ETHR_IMPL_NORETURN__ +ethr_assert_failed(const char *file, int line, const char *func, char *a) { fprintf(stderr, "%s:%d: %s(): Assertion failed: %s\n", file, line, func, a); ethr_abort__(); - return 0; } diff --git a/erts/lib_src/common/ethr_mutex.c b/erts/lib_src/common/ethr_mutex.c index 7be83b9117..acc7cb2da2 100644 --- a/erts/lib_src/common/ethr_mutex.c +++ b/erts/lib_src/common/ethr_mutex.c @@ -1058,7 +1058,7 @@ ethr_cond_signal(ethr_cond *cnd) ethr_ts_event *tse; ETHR_ASSERT(!ethr_not_inited__); - ETHR_ASSERT(cnd); + ETHR_ASSERT(cnd != NULL); ETHR_ASSERT(cnd->initialized == ETHR_COND_INITIALIZED); ETHR_MTX_HARD_DEBUG_FENCE_CHK(cnd); |