diff options
author | Mitch Phillips <31459023+hctim@users.noreply.github.com> | 2024-06-25 09:22:29 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-25 10:22:29 +0200 |
commit | 11e12bd82b0358de053cfd0dc762e9b30948c8a1 (patch) | |
tree | 9c0849ead4a238420b65f9d383aff5a1a3bcf2a8 | |
parent | 7f1a74429dfd62a410d4b51d2e75d3677429a51a (diff) | |
download | llvm-11e12bd82b0358de053cfd0dc762e9b30948c8a1.zip llvm-11e12bd82b0358de053cfd0dc762e9b30948c8a1.tar.gz llvm-11e12bd82b0358de053cfd0dc762e9b30948c8a1.tar.bz2 |
[NFC] [GWP-ASan] Rename Check() to check() (#96605)
Change this function to be LLVM-style in name.
4 files changed, 19 insertions, 19 deletions
diff --git a/compiler-rt/lib/gwp_asan/guarded_pool_allocator.cpp b/compiler-rt/lib/gwp_asan/guarded_pool_allocator.cpp index 5f41e1e..a5f1ecd 100644 --- a/compiler-rt/lib/gwp_asan/guarded_pool_allocator.cpp +++ b/compiler-rt/lib/gwp_asan/guarded_pool_allocator.cpp @@ -52,12 +52,12 @@ void GuardedPoolAllocator::init(const options::Options &Opts) { Opts.MaxSimultaneousAllocations == 0) return; - Check(Opts.SampleRate >= 0, "GWP-ASan Error: SampleRate is < 0."); - Check(Opts.SampleRate < (1 << 30), "GWP-ASan Error: SampleRate is >= 2^30."); - Check(Opts.MaxSimultaneousAllocations >= 0, + check(Opts.SampleRate >= 0, "GWP-ASan Error: SampleRate is < 0."); + check(Opts.SampleRate < (1 << 30), "GWP-ASan Error: SampleRate is >= 2^30."); + check(Opts.MaxSimultaneousAllocations >= 0, "GWP-ASan Error: MaxSimultaneousAllocations is < 0."); - Check(SingletonPtr == nullptr, + check(SingletonPtr == nullptr, "There's already a live GuardedPoolAllocator!"); SingletonPtr = this; Backtrace = Opts.Backtrace; diff --git a/compiler-rt/lib/gwp_asan/platform_specific/guarded_pool_allocator_fuchsia.cpp b/compiler-rt/lib/gwp_asan/platform_specific/guarded_pool_allocator_fuchsia.cpp index ca5231a..3f39402 100644 --- a/compiler-rt/lib/gwp_asan/platform_specific/guarded_pool_allocator_fuchsia.cpp +++ b/compiler-rt/lib/gwp_asan/platform_specific/guarded_pool_allocator_fuchsia.cpp @@ -24,13 +24,13 @@ void *GuardedPoolAllocator::map(size_t Size, const char *Name) const { assert((Size % State.PageSize) == 0); zx_handle_t Vmo; zx_status_t Status = _zx_vmo_create(Size, 0, &Vmo); - Check(Status == ZX_OK, "Failed to create Vmo"); + check(Status == ZX_OK, "Failed to create Vmo"); _zx_object_set_property(Vmo, ZX_PROP_NAME, Name, strlen(Name)); zx_vaddr_t Addr; Status = _zx_vmar_map(_zx_vmar_root_self(), ZX_VM_PERM_READ | ZX_VM_PERM_WRITE | ZX_VM_ALLOW_FAULTS, 0, Vmo, 0, Size, &Addr); - Check(Status == ZX_OK, "Vmo mapping failed"); + check(Status == ZX_OK, "Vmo mapping failed"); _zx_handle_close(Vmo); return reinterpret_cast<void *>(Addr); } @@ -40,7 +40,7 @@ void GuardedPoolAllocator::unmap(void *Ptr, size_t Size) const { assert((Size % State.PageSize) == 0); zx_status_t Status = _zx_vmar_unmap(_zx_vmar_root_self(), reinterpret_cast<zx_vaddr_t>(Ptr), Size); - Check(Status == ZX_OK, "Vmo unmapping failed"); + check(Status == ZX_OK, "Vmo unmapping failed"); } void *GuardedPoolAllocator::reserveGuardedPool(size_t Size) { @@ -50,7 +50,7 @@ void *GuardedPoolAllocator::reserveGuardedPool(size_t Size) { _zx_vmar_root_self(), ZX_VM_CAN_MAP_READ | ZX_VM_CAN_MAP_WRITE | ZX_VM_CAN_MAP_SPECIFIC, 0, Size, &GuardedPagePoolPlatformData.Vmar, &Addr); - Check(Status == ZX_OK, "Failed to reserve guarded pool allocator memory"); + check(Status == ZX_OK, "Failed to reserve guarded pool allocator memory"); _zx_object_set_property(GuardedPagePoolPlatformData.Vmar, ZX_PROP_NAME, kGwpAsanGuardPageName, strlen(kGwpAsanGuardPageName)); return reinterpret_cast<void *>(Addr); @@ -59,8 +59,8 @@ void *GuardedPoolAllocator::reserveGuardedPool(size_t Size) { void GuardedPoolAllocator::unreserveGuardedPool() { const zx_handle_t Vmar = GuardedPagePoolPlatformData.Vmar; assert(Vmar != ZX_HANDLE_INVALID && Vmar != _zx_vmar_root_self()); - Check(_zx_vmar_destroy(Vmar) == ZX_OK, "Failed to destroy a vmar"); - Check(_zx_handle_close(Vmar) == ZX_OK, "Failed to close a vmar"); + check(_zx_vmar_destroy(Vmar) == ZX_OK, "Failed to destroy a vmar"); + check(_zx_handle_close(Vmar) == ZX_OK, "Failed to close a vmar"); GuardedPagePoolPlatformData.Vmar = ZX_HANDLE_INVALID; } @@ -69,7 +69,7 @@ void GuardedPoolAllocator::allocateInGuardedPool(void *Ptr, size_t Size) const { assert((Size % State.PageSize) == 0); zx_handle_t Vmo; zx_status_t Status = _zx_vmo_create(Size, 0, &Vmo); - Check(Status == ZX_OK, "Failed to create vmo"); + check(Status == ZX_OK, "Failed to create vmo"); _zx_object_set_property(Vmo, ZX_PROP_NAME, kGwpAsanAliveSlotName, strlen(kGwpAsanAliveSlotName)); const zx_handle_t Vmar = GuardedPagePoolPlatformData.Vmar; @@ -81,7 +81,7 @@ void GuardedPoolAllocator::allocateInGuardedPool(void *Ptr, size_t Size) const { ZX_VM_PERM_READ | ZX_VM_PERM_WRITE | ZX_VM_ALLOW_FAULTS | ZX_VM_SPECIFIC, Offset, Vmo, 0, Size, &P); - Check(Status == ZX_OK, "Vmo mapping failed"); + check(Status == ZX_OK, "Vmo mapping failed"); _zx_handle_close(Vmo); } @@ -93,7 +93,7 @@ void GuardedPoolAllocator::deallocateInGuardedPool(void *Ptr, assert(Vmar != ZX_HANDLE_INVALID && Vmar != _zx_vmar_root_self()); const zx_status_t Status = _zx_vmar_unmap(Vmar, reinterpret_cast<zx_vaddr_t>(Ptr), Size); - Check(Status == ZX_OK, "Vmar unmapping failed"); + check(Status == ZX_OK, "Vmar unmapping failed"); } size_t GuardedPoolAllocator::getPlatformPageSize() { diff --git a/compiler-rt/lib/gwp_asan/platform_specific/guarded_pool_allocator_posix.cpp b/compiler-rt/lib/gwp_asan/platform_specific/guarded_pool_allocator_posix.cpp index c036ebe..549e31a 100644 --- a/compiler-rt/lib/gwp_asan/platform_specific/guarded_pool_allocator_posix.cpp +++ b/compiler-rt/lib/gwp_asan/platform_specific/guarded_pool_allocator_posix.cpp @@ -46,7 +46,7 @@ void *GuardedPoolAllocator::map(size_t Size, const char *Name) const { assert((Size % State.PageSize) == 0); void *Ptr = mmap(nullptr, Size, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); - Check(Ptr != MAP_FAILED, "Failed to map guarded pool allocator memory"); + check(Ptr != MAP_FAILED, "Failed to map guarded pool allocator memory"); MaybeSetMappingName(Ptr, Size, Name); return Ptr; } @@ -54,7 +54,7 @@ void *GuardedPoolAllocator::map(size_t Size, const char *Name) const { void GuardedPoolAllocator::unmap(void *Ptr, size_t Size) const { assert((reinterpret_cast<uintptr_t>(Ptr) % State.PageSize) == 0); assert((Size % State.PageSize) == 0); - Check(munmap(Ptr, Size) == 0, + check(munmap(Ptr, Size) == 0, "Failed to unmap guarded pool allocator memory."); } @@ -62,7 +62,7 @@ void *GuardedPoolAllocator::reserveGuardedPool(size_t Size) { assert((Size % State.PageSize) == 0); void *Ptr = mmap(nullptr, Size, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); - Check(Ptr != MAP_FAILED, "Failed to reserve guarded pool allocator memory"); + check(Ptr != MAP_FAILED, "Failed to reserve guarded pool allocator memory"); MaybeSetMappingName(Ptr, Size, kGwpAsanGuardPageName); return Ptr; } @@ -75,7 +75,7 @@ void GuardedPoolAllocator::unreserveGuardedPool() { void GuardedPoolAllocator::allocateInGuardedPool(void *Ptr, size_t Size) const { assert((reinterpret_cast<uintptr_t>(Ptr) % State.PageSize) == 0); assert((Size % State.PageSize) == 0); - Check(mprotect(Ptr, Size, PROT_READ | PROT_WRITE) == 0, + check(mprotect(Ptr, Size, PROT_READ | PROT_WRITE) == 0, "Failed to allocate in guarded pool allocator memory"); MaybeSetMappingName(Ptr, Size, kGwpAsanAliveSlotName); } @@ -87,7 +87,7 @@ void GuardedPoolAllocator::deallocateInGuardedPool(void *Ptr, // mmap() a PROT_NONE page over the address to release it to the system, if // we used mprotect() here the system would count pages in the quarantine // against the RSS. - Check(mmap(Ptr, Size, PROT_NONE, MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, -1, + check(mmap(Ptr, Size, PROT_NONE, MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0) != MAP_FAILED, "Failed to deallocate in guarded pool allocator memory"); MaybeSetMappingName(Ptr, Size, kGwpAsanGuardPageName); diff --git a/compiler-rt/lib/gwp_asan/utilities.h b/compiler-rt/lib/gwp_asan/utilities.h index d8bc0e4..76e5df2 100644 --- a/compiler-rt/lib/gwp_asan/utilities.h +++ b/compiler-rt/lib/gwp_asan/utilities.h @@ -18,7 +18,7 @@ namespace gwp_asan { void die(const char *Message); // Checks that `Condition` is true, otherwise dies with `Message`. -GWP_ASAN_ALWAYS_INLINE void Check(bool Condition, const char *Message) { +GWP_ASAN_ALWAYS_INLINE void check(bool Condition, const char *Message) { if (Condition) return; die(Message); |