Author: Schrodinger ZHU Yifan Date: 2025-08-05T21:58:53-04:00 New Revision: 1ced5ca71a26c912e855fc6fce66ddefa099d698
URL: https://github.com/llvm/llvm-project/commit/1ced5ca71a26c912e855fc6fce66ddefa099d698 DIFF: https://github.com/llvm/llvm-project/commit/1ced5ca71a26c912e855fc6fce66ddefa099d698.diff LOG: use jhuber6's patch Added: Modified: libc/test/IntegrationTest/test.cpp Removed: ################################################################################ diff --git a/libc/test/IntegrationTest/test.cpp b/libc/test/IntegrationTest/test.cpp index 627e068f9e30b..0e4825202a9e2 100644 --- a/libc/test/IntegrationTest/test.cpp +++ b/libc/test/IntegrationTest/test.cpp @@ -63,34 +63,22 @@ int atexit(void (*func)(void)) { return LIBC_NAMESPACE::atexit(func); } // which just hands out continuous blocks from a statically allocated chunk of // memory. -static constexpr uint64_t MEMORY_SIZE = 16384; -static uint8_t memory[MEMORY_SIZE]; - -#ifdef LIBC_TARGET_ARCH_IS_GPU -static size_t used = 0; -#else -static LIBC_NAMESPACE::cpp::Atomic<size_t> used = 0; -#endif +static constexpr uint64_t ALIGNMENT = alignof(long double); +static constexpr uint64_t MEMORY_SIZE = 65336; +alignas(ALIGNMENT) static uint8_t memory[MEMORY_SIZE]; +static size_t ptr = 0; extern "C" { -#ifdef LIBC_TARGET_ARCH_IS_GPU -void *malloc(size_t s) { - void *mem = ptr; - ptr += s; - return static_cast<uint64_t>(ptr - memory) >= MEMORY_SIZE ? nullptr : mem; +void *malloc(size_t size) { + LIBC_NAMESPACE::cpp::AtomicRef<size_t> ref(ptr); + size = (size + ALIGNMENT - 1) & ~(ALIGNMENT - 1); + size_t old_ptr = + ref.fetch_add(size, LIBC_NAMESPACE::cpp::MemoryOrder::RELAXED); + if (static_cast<size_t>(old_ptr + size) > MEMORY_SIZE) + return nullptr; + return &memory[old_ptr]; } -#else -void *malloc(size_t s) { - // Emulate the alignment of std::max_align_t. - constexpr size_t DEFAULT_ALIGNMENT = alignof(long double); - s += (-s) & (DEFAULT_ALIGNMENT - 1); // Align to default alignment. - auto res = used.fetch_add(s, LIBC_NAMESPACE::cpp::MemoryOrder::RELAXED); - if (res + s > MEMORY_SIZE) - return nullptr; // Out of memory. - return &memory[res]; -} -#endif void free(void *) {} _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
