nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Backed out changeset dda9d04389e1 (bug 1882518) for causing build bustages in Assertions.h. CLOSED TREE

Browse source
This commit is contained in:
Stanca Serban 2024-03-22 17:28:29 +02:00
parent ddeb6da7d8
commit 67ed3b15f0
1 changed files with 9 additions and 25 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

34
mfbt/Assertions.h
View file

@ -17,18 +17,6 @@
# define MOZ_BUFFER_STDERR # define MOZ_BUFFER_STDERR
#endif #endif
// It appears that this is sometimes compiled without XP_WIN
#if defined(WIN32)
# include <process.h>
# define MOZ_GET_PID() _getpid()
#elif !defined(__wasi__)
# include <unistd.h>
# define MOZ_GET_PID() getpid()
#else
// Prevent compiler warning
# define MOZ_GET_PID() -1
#endif
#include "mozilla/Attributes.h" #include "mozilla/Attributes.h"
#include "mozilla/Compiler.h" #include "mozilla/Compiler.h"
#include "mozilla/Fuzzing.h" #include "mozilla/Fuzzing.h"
@ -107,15 +95,14 @@ MOZ_MAYBE_UNUSED static void MOZ_ReportAssertionFailurePrintFrame(
* method is primarily for internal use in this header, and only secondarily * method is primarily for internal use in this header, and only secondarily
* for use in implementing release-build assertions. * for use in implementing release-build assertions.
*/ */
MOZ_MAYBE_UNUSED static MOZ_COLD MOZ_NEVER_INLINE void MOZ_MAYBE_UNUSED static MOZ_COLD MOZ_NEVER_INLINE void
MOZ_ReportAssertionFailure(const char* aStr, const char* aFilename, MOZ_ReportAssertionFailure(const char* aStr, const char* aFilename,
int aLine) MOZ_PRETEND_NORETURN_FOR_STATIC_ANALYSIS { int aLine) MOZ_PRETEND_NORETURN_FOR_STATIC_ANALYSIS {
MOZ_FUZZING_HANDLE_CRASH_EVENT4("MOZ_ASSERT", aFilename, aLine, aStr); MOZ_FUZZING_HANDLE_CRASH_EVENT4("MOZ_ASSERT", aFilename, aLine, aStr);
#ifdef ANDROID #ifdef ANDROID
__android_log_print(ANDROID_LOG_FATAL, "MOZ_Assert", __android_log_print(ANDROID_LOG_FATAL, "MOZ_Assert",
"[%d] Assertion failure: %s, at %s:%d\n", MOZ_GET_PID(), "Assertion failure: %s, at %s:%d\n", aStr, aFilename,
aStr, aFilename, aLine); aLine);
# if defined(MOZ_DUMP_ASSERTION_STACK) # if defined(MOZ_DUMP_ASSERTION_STACK)
MozWalkTheStackWithWriter(MOZ_ReportAssertionFailurePrintFrame, CallerPC(), MozWalkTheStackWithWriter(MOZ_ReportAssertionFailurePrintFrame, CallerPC(),
/* aMaxFrames */ 0); /* aMaxFrames */ 0);
@ -123,12 +110,11 @@ MOZ_ReportAssertionFailure(const char* aStr, const char* aFilename,
#else #else
# if defined(MOZ_BUFFER_STDERR) # if defined(MOZ_BUFFER_STDERR)
char msg[1024] = ""; char msg[1024] = "";
snprintf(msg, sizeof(msg) - 1, "[%d] Assertion failure: %s, at %s:%d\n", snprintf(msg, sizeof(msg) - 1, "Assertion failure: %s, at %s:%d\n", aStr,
MOZ_GET_PID(), aStr, aFilename, aLine); aFilename, aLine);
fputs(msg, stderr); fputs(msg, stderr);
# else # else
fprintf(stderr, "[%d] Assertion failure: %s, at %s:%d\n", MOZ_GET_PID(), aStr, fprintf(stderr, "Assertion failure: %s, at %s:%d\n", aStr, aFilename, aLine);
aFilename, aLine);
# endif # endif
# if defined(MOZ_DUMP_ASSERTION_STACK) # if defined(MOZ_DUMP_ASSERTION_STACK)
MozWalkTheStack(stderr, CallerPC(), /* aMaxFrames */ 0); MozWalkTheStack(stderr, CallerPC(), /* aMaxFrames */ 0);
@ -142,17 +128,15 @@ MOZ_MAYBE_UNUSED static MOZ_COLD MOZ_NEVER_INLINE void MOZ_ReportCrash(
int aLine) MOZ_PRETEND_NORETURN_FOR_STATIC_ANALYSIS { int aLine) MOZ_PRETEND_NORETURN_FOR_STATIC_ANALYSIS {
#ifdef ANDROID #ifdef ANDROID
__android_log_print(ANDROID_LOG_FATAL, "MOZ_CRASH", __android_log_print(ANDROID_LOG_FATAL, "MOZ_CRASH",
"[%d] Hit MOZ_CRASH(%s) at %s:%d\n", MOZ_GET_PID(), aStr, "Hit MOZ_CRASH(%s) at %s:%d\n", aStr, aFilename, aLine);
aFilename, aLine);
#else #else
# if defined(MOZ_BUFFER_STDERR) # if defined(MOZ_BUFFER_STDERR)
char msg[1024] = ""; char msg[1024] = "";
snprintf(msg, sizeof(msg) - 1, "[%d] Hit MOZ_CRASH(%s) at %s:%d\n", snprintf(msg, sizeof(msg) - 1, "Hit MOZ_CRASH(%s) at %s:%d\n", aStr,
MOZ_GET_PID(), aStr, aFilename, aLine); aFilename, aLine);
fputs(msg, stderr); fputs(msg, stderr);
# else # else
fprintf(stderr, "[%d] Hit MOZ_CRASH(%s) at %s:%d\n", MOZ_GET_PID(), aStr, fprintf(stderr, "Hit MOZ_CRASH(%s) at %s:%d\n", aStr, aFilename, aLine);
aFilename, aLine);
# endif # endif
# if defined(MOZ_DUMP_ASSERTION_STACK) # if defined(MOZ_DUMP_ASSERTION_STACK)
MozWalkTheStack(stderr, CallerPC(), /* aMaxFrames */ 0); MozWalkTheStack(stderr, CallerPC(), /* aMaxFrames */ 0);