beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibC: Allow multiple includes of <assert.h>

Browse source 
ISO C requires in section 7.2:
The assert macro is redefined according to the current state of NDEBUG
each time that <assert.h> is included.

Also add tests for `assert` multiple inclusion accordingly.
This commit is contained in:
Michel Hermier 2021-12-14 17:44:43 +01:00 committed by Brian Gianforcaro
parent 7b8398ea0d
commit 682f89d5bc
Notes: sideshowbarker 2024-07-17 22:18:14 +09:00 
Author: https://github.com/mhermier
Commit: https://github.com/SerenityOS/serenity/commit/682f89d5bc1
Pull-request: https://github.com/SerenityOS/serenity/pull/11328
3 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Meta/check-style.py
View file

@ -31,6 +31,7 @@ LICENSE_HEADER_CHECK_EXCLUDES = {
# We check that "#pragma once" is present # We check that "#pragma once" is present
PRAGMA_ONCE_STRING = '#pragma once' PRAGMA_ONCE_STRING = '#pragma once'
PRAGMA_ONCE_CHECK_EXCLUDES = { PRAGMA_ONCE_CHECK_EXCLUDES = {
'Userland/Libraries/LibC/assert.h',
} }
# We make sure that there's a blank line before and after pragma once # We make sure that there's a blank line before and after pragma once

23
Tests/LibC/TestAssert.cpp
View file

@ -6,6 +6,7 @@
#include <LibTest/TestCase.h> #include <LibTest/TestCase.h>
#undef NDEBUG
#include <assert.h> #include <assert.h>
#include <signal.h> #include <signal.h>
@ -20,3 +21,25 @@ TEST_CASE(assert)
return Test::Crash::Failure::DidNotCrash; return Test::Crash::Failure::DidNotCrash;
}); });
} }
#define NDEBUG
#include <assert.h>
TEST_CASE(assert_reinclude)
{
EXPECT_NO_CRASH("This should not assert", [] {
assert(!"This should not assert");
return Test::Crash::Failure::DidNotCrash;
});
}
#undef NDEBUG
#include <assert.h>
TEST_CASE(assert_rereinclude)
{
EXPECT_CRASH("This should assert", [] {
assert(!"This should assert");
return Test::Crash::Failure::DidNotCrash;
});
}

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

@ -4,16 +4,25 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#pragma once #ifndef _ASSERT_H
# define _ASSERT_H
# define __stringify_helper(x) # x
# define __stringify(x) __stringify_helper(x)
# ifndef __cplusplus
# define static_assert _Static_assert
# endif
#endif
#include <sys/cdefs.h> #include <sys/cdefs.h>
#undef assert
__BEGIN_DECLS __BEGIN_DECLS
#ifndef NDEBUG #ifndef NDEBUG
__attribute__((noreturn)) void __assertion_failed(const char* msg); __attribute__((noreturn)) void __assertion_failed(const char* msg);
# define __stringify_helper(x) # x
# define __stringify(x) __stringify_helper(x)
# define assert(expr) \ # define assert(expr) \
(__builtin_expect(!(expr), 0) \ (__builtin_expect(!(expr), 0) \
? __assertion_failed(#expr "\n" __FILE__ ":" __stringify(__LINE__)) \ ? __assertion_failed(#expr "\n" __FILE__ ":" __stringify(__LINE__)) \
@ -23,8 +32,4 @@ __attribute__((noreturn)) void __assertion_failed(const char* msg);
# define assert(expr) ((void)(0)) # define assert(expr) ((void)(0))
#endif #endif
#ifndef __cplusplus
# define static_assert _Static_assert
#endif
__END_DECLS __END_DECLS