diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /mfbt/Assertions.h | |
parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mfbt/Assertions.h')
-rw-r--r-- | mfbt/Assertions.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mfbt/Assertions.h b/mfbt/Assertions.h index 53b2930bf7..0b7395177d 100644 --- a/mfbt/Assertions.h +++ b/mfbt/Assertions.h @@ -214,10 +214,10 @@ MOZ_NoReturn(int aLine) { MOZ_ASSUME_UNREACHABLE_MARKER(); } -# define MOZ_REALLY_CRASH(line) \ - do { \ - __debugbreak(); \ - MOZ_NoReturn(line); \ +# define MOZ_REALLY_CRASH(line) \ + do { \ + MOZ_NOMERGE __debugbreak(); \ + MOZ_NoReturn(line); \ } while (false) #elif __wasi__ |