aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2012-11-23 10:57:30 +0100
committerBjörn-Egil Dahlberg <[email protected]>2012-11-23 10:57:30 +0100
commit19bc00736ee2621f4016d53d3270334dd998cb34 (patch)
treec0440d612962f46b50c8a0f99cf6c98f12d36c30 /erts/emulator
parent3945f3daaf9fb0038e9aacae1b11275a1e05b649 (diff)
parent4c4c78734e5376264e6fca95318ae0e45ce34b37 (diff)
downloadotp-19bc00736ee2621f4016d53d3270334dd998cb34.tar.gz
otp-19bc00736ee2621f4016d53d3270334dd998cb34.tar.bz2
otp-19bc00736ee2621f4016d53d3270334dd998cb34.zip
Merge branch 'maint'
Diffstat (limited to 'erts/emulator')
-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