caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libc] Fix alignment issue for HermeticTestUtils.cpp. (#128426)

Browse Source 
Full build precommit bots were failing due to mis-alignment of atomics
in hermetic tests. This PR enforces the alignment for the bump allocator
of hermetic test framework.

Fixes https://github.com/llvm/llvm-project/issues/128185.
This commit is contained in:
lntue
2025-02-23 13:41:51 -05:00
committed by GitHub
parent 65e44b4301
commit 8ea6b735a6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libc/test/UnitTest/HermeticTestUtils.cpp
View File

@@ -33,6 +33,8 @@ int atexit(void (*func)(void));
} // namespace LIBC_NAMESPACE_DECL
constexpr uint64_t ALIGNMENT = alignof(uintptr_t);
namespace {
// Integration tests cannot use the SCUDO standalone allocator as SCUDO pulls
@@ -42,7 +44,7 @@ namespace {
// which just hands out continuous blocks from a statically allocated chunk of
// memory.
static constexpr uint64_t MEMORY_SIZE = 65336;
static uint8_t memory[MEMORY_SIZE];
alignas(ALIGNMENT) static uint8_t memory[MEMORY_SIZE];
static uint8_t *ptr = memory;
} // anonymous namespace
@@ -74,8 +76,6 @@ void *memset(void *ptr, int value, size_t count) {
// This is needed if the test was compiled with '-fno-use-cxa-atexit'.
int atexit(void (*func)(void)) { return LIBC_NAMESPACE::atexit(func); }
constexpr uint64_t ALIGNMENT = alignof(uintptr_t);
void *malloc(size_t s) {
// Keep the bump pointer aligned on an eight byte boundary.
s = ((s + ALIGNMENT - 1) / ALIGNMENT) * ALIGNMENT;