aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2012-11-23 10:57:09 +0100
committerBjörn-Egil Dahlberg <[email protected]>2012-11-23 10:57:09 +0100
commit4c4c78734e5376264e6fca95318ae0e45ce34b37 (patch)
tree8fb6a428ffea01dcd4a536074228499408c1ba9a
parent55a16a08699afb776fc6cb7b19e19459b93a291e (diff)
parent49be2dd5ba5d125cac24922c6fd1f6f8557ddbd6 (diff)
downloadotp-4c4c78734e5376264e6fca95318ae0e45ce34b37.tar.gz
otp-4c4c78734e5376264e6fca95318ae0e45ce34b37.tar.bz2
otp-4c4c78734e5376264e6fca95318ae0e45ce34b37.zip
Merge branch 'egil/fix-crash_dump-lc-assert' into maint
* egil/fix-crash_dump-lc-assert: erts: Suppress lock assertion when dumping a crash
-rw-r--r--erts/emulator/beam/erl_lock_check.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_lock_check.h b/erts/emulator/beam/erl_lock_check.h
index b67f36fa06..b1eab315db 100644
--- a/erts/emulator/beam/erl_lock_check.h
+++ b/erts/emulator/beam/erl_lock_check.h
@@ -104,7 +104,7 @@ void erts_lc_unrequire_lock(erts_lc_lock_t *lck);
#define ERTS_LC_ASSERT(A) \
- ((void) ((A) ? 1 : erts_lc_assert_failed(__FILE__, __LINE__, #A)))
+ ((void) (((A) || ERTS_SOMEONE_IS_CRASH_DUMPING) ? 1 : erts_lc_assert_failed(__FILE__, __LINE__, #A)))
#ifdef ERTS_SMP
#define ERTS_SMP_LC_ASSERT(A) ERTS_LC_ASSERT(A)
#else