RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 04:07:46 +00:00
Code Issues Activity Actions

Kernel+LibC: Clean up how assertions work in the kernel and LibC

Browse source 
This also brings LibC's abort() function closer to the spec.
This commit is contained in:
Gunnar Beutner 2021-04-18 08:43:10 +02:00 • committed by Andreas Kling
parent 33a9b2a3c3
commit f033416893
13 changed files with 36 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Libraries/LibC/assert.cpp
View file

@ -48,13 +48,12 @@ void __assertion_failed(const char* msg)
{ msg, strlen(msg) },
};
syscall(SC_set_coredump_metadata, &params);
syscall(SC_abort);
for (;;) { }
abort();
}
#endif
}
void __crash()
void _abort()
{
asm volatile("ud2");
__builtin_unreachable();

7
Userland/Libraries/LibC/assert.h
View file

@ -31,7 +31,7 @@
__BEGIN_DECLS
#ifdef DEBUG
__attribute__((noreturn)) void __assertion_failed(const char* msg);
[[noreturn]] void __assertion_failed(const char* msg);
# define __stringify_helper(x) # x
# define __stringify(x) __stringify_helper(x)
# define assert(expr) \
@ -42,12 +42,11 @@ __attribute__((noreturn)) void __assertion_failed(const char* msg);
# define VERIFY_NOT_REACHED() assert(false)
#else
# define assert(expr) ((void)(0))
# define VERIFY_NOT_REACHED() CRASH()
# define VERIFY_NOT_REACHED() _abort()
#endif
__attribute__((noreturn)) void __crash();
[[noreturn]] void _abort();
#define CRASH() __crash()
#define VERIFY assert
#define TODO VERIFY_NOT_REACHED

8
Userland/Libraries/LibC/stdlib.cpp
View file

@ -249,8 +249,12 @@ void abort()
// For starters, send ourselves a SIGABRT.
raise(SIGABRT);
// If that didn't kill us, try harder.
raise(SIGKILL);
_exit(127);
sigset_t set;
sigemptyset(&set);
sigaddset(&set, SIGABRT);
sigprocmask(SIG_UNBLOCK, &set, nullptr);
raise(SIGABRT);
_abort();
}
static HashTable<const char*> s_malloced_environment_variables;