Skip to content

Commit 366da80

Browse files
hctimAlexisPerry
authored andcommitted
[NFC] [GWP-ASan] Rename Check() to check() (llvm#96605)
Change this function to be LLVM-style in name.
1 parent da17b70 commit 366da80

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

compiler-rt/lib/gwp_asan/guarded_pool_allocator.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ void GuardedPoolAllocator::init(const options::Options &Opts) {
5252
Opts.MaxSimultaneousAllocations == 0)
5353
return;
5454

55-
Check(Opts.SampleRate >= 0, "GWP-ASan Error: SampleRate is < 0.");
56-
Check(Opts.SampleRate < (1 << 30), "GWP-ASan Error: SampleRate is >= 2^30.");
57-
Check(Opts.MaxSimultaneousAllocations >= 0,
55+
check(Opts.SampleRate >= 0, "GWP-ASan Error: SampleRate is < 0.");
56+
check(Opts.SampleRate < (1 << 30), "GWP-ASan Error: SampleRate is >= 2^30.");
57+
check(Opts.MaxSimultaneousAllocations >= 0,
5858
"GWP-ASan Error: MaxSimultaneousAllocations is < 0.");
5959

60-
Check(SingletonPtr == nullptr,
60+
check(SingletonPtr == nullptr,
6161
"There's already a live GuardedPoolAllocator!");
6262
SingletonPtr = this;
6363
Backtrace = Opts.Backtrace;

compiler-rt/lib/gwp_asan/platform_specific/guarded_pool_allocator_fuchsia.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ void *GuardedPoolAllocator::map(size_t Size, const char *Name) const {
2424
assert((Size % State.PageSize) == 0);
2525
zx_handle_t Vmo;
2626
zx_status_t Status = _zx_vmo_create(Size, 0, &Vmo);
27-
Check(Status == ZX_OK, "Failed to create Vmo");
27+
check(Status == ZX_OK, "Failed to create Vmo");
2828
_zx_object_set_property(Vmo, ZX_PROP_NAME, Name, strlen(Name));
2929
zx_vaddr_t Addr;
3030
Status = _zx_vmar_map(_zx_vmar_root_self(),
3131
ZX_VM_PERM_READ | ZX_VM_PERM_WRITE | ZX_VM_ALLOW_FAULTS,
3232
0, Vmo, 0, Size, &Addr);
33-
Check(Status == ZX_OK, "Vmo mapping failed");
33+
check(Status == ZX_OK, "Vmo mapping failed");
3434
_zx_handle_close(Vmo);
3535
return reinterpret_cast<void *>(Addr);
3636
}
@@ -40,7 +40,7 @@ void GuardedPoolAllocator::unmap(void *Ptr, size_t Size) const {
4040
assert((Size % State.PageSize) == 0);
4141
zx_status_t Status = _zx_vmar_unmap(_zx_vmar_root_self(),
4242
reinterpret_cast<zx_vaddr_t>(Ptr), Size);
43-
Check(Status == ZX_OK, "Vmo unmapping failed");
43+
check(Status == ZX_OK, "Vmo unmapping failed");
4444
}
4545

4646
void *GuardedPoolAllocator::reserveGuardedPool(size_t Size) {
@@ -50,7 +50,7 @@ void *GuardedPoolAllocator::reserveGuardedPool(size_t Size) {
5050
_zx_vmar_root_self(),
5151
ZX_VM_CAN_MAP_READ | ZX_VM_CAN_MAP_WRITE | ZX_VM_CAN_MAP_SPECIFIC, 0,
5252
Size, &GuardedPagePoolPlatformData.Vmar, &Addr);
53-
Check(Status == ZX_OK, "Failed to reserve guarded pool allocator memory");
53+
check(Status == ZX_OK, "Failed to reserve guarded pool allocator memory");
5454
_zx_object_set_property(GuardedPagePoolPlatformData.Vmar, ZX_PROP_NAME,
5555
kGwpAsanGuardPageName, strlen(kGwpAsanGuardPageName));
5656
return reinterpret_cast<void *>(Addr);
@@ -59,8 +59,8 @@ void *GuardedPoolAllocator::reserveGuardedPool(size_t Size) {
5959
void GuardedPoolAllocator::unreserveGuardedPool() {
6060
const zx_handle_t Vmar = GuardedPagePoolPlatformData.Vmar;
6161
assert(Vmar != ZX_HANDLE_INVALID && Vmar != _zx_vmar_root_self());
62-
Check(_zx_vmar_destroy(Vmar) == ZX_OK, "Failed to destroy a vmar");
63-
Check(_zx_handle_close(Vmar) == ZX_OK, "Failed to close a vmar");
62+
check(_zx_vmar_destroy(Vmar) == ZX_OK, "Failed to destroy a vmar");
63+
check(_zx_handle_close(Vmar) == ZX_OK, "Failed to close a vmar");
6464
GuardedPagePoolPlatformData.Vmar = ZX_HANDLE_INVALID;
6565
}
6666

@@ -69,7 +69,7 @@ void GuardedPoolAllocator::allocateInGuardedPool(void *Ptr, size_t Size) const {
6969
assert((Size % State.PageSize) == 0);
7070
zx_handle_t Vmo;
7171
zx_status_t Status = _zx_vmo_create(Size, 0, &Vmo);
72-
Check(Status == ZX_OK, "Failed to create vmo");
72+
check(Status == ZX_OK, "Failed to create vmo");
7373
_zx_object_set_property(Vmo, ZX_PROP_NAME, kGwpAsanAliveSlotName,
7474
strlen(kGwpAsanAliveSlotName));
7575
const zx_handle_t Vmar = GuardedPagePoolPlatformData.Vmar;
@@ -81,7 +81,7 @@ void GuardedPoolAllocator::allocateInGuardedPool(void *Ptr, size_t Size) const {
8181
ZX_VM_PERM_READ | ZX_VM_PERM_WRITE |
8282
ZX_VM_ALLOW_FAULTS | ZX_VM_SPECIFIC,
8383
Offset, Vmo, 0, Size, &P);
84-
Check(Status == ZX_OK, "Vmo mapping failed");
84+
check(Status == ZX_OK, "Vmo mapping failed");
8585
_zx_handle_close(Vmo);
8686
}
8787

@@ -93,7 +93,7 @@ void GuardedPoolAllocator::deallocateInGuardedPool(void *Ptr,
9393
assert(Vmar != ZX_HANDLE_INVALID && Vmar != _zx_vmar_root_self());
9494
const zx_status_t Status =
9595
_zx_vmar_unmap(Vmar, reinterpret_cast<zx_vaddr_t>(Ptr), Size);
96-
Check(Status == ZX_OK, "Vmar unmapping failed");
96+
check(Status == ZX_OK, "Vmar unmapping failed");
9797
}
9898

9999
size_t GuardedPoolAllocator::getPlatformPageSize() {

compiler-rt/lib/gwp_asan/platform_specific/guarded_pool_allocator_posix.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,23 @@ void *GuardedPoolAllocator::map(size_t Size, const char *Name) const {
4646
assert((Size % State.PageSize) == 0);
4747
void *Ptr = mmap(nullptr, Size, PROT_READ | PROT_WRITE,
4848
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
49-
Check(Ptr != MAP_FAILED, "Failed to map guarded pool allocator memory");
49+
check(Ptr != MAP_FAILED, "Failed to map guarded pool allocator memory");
5050
MaybeSetMappingName(Ptr, Size, Name);
5151
return Ptr;
5252
}
5353

5454
void GuardedPoolAllocator::unmap(void *Ptr, size_t Size) const {
5555
assert((reinterpret_cast<uintptr_t>(Ptr) % State.PageSize) == 0);
5656
assert((Size % State.PageSize) == 0);
57-
Check(munmap(Ptr, Size) == 0,
57+
check(munmap(Ptr, Size) == 0,
5858
"Failed to unmap guarded pool allocator memory.");
5959
}
6060

6161
void *GuardedPoolAllocator::reserveGuardedPool(size_t Size) {
6262
assert((Size % State.PageSize) == 0);
6363
void *Ptr =
6464
mmap(nullptr, Size, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
65-
Check(Ptr != MAP_FAILED, "Failed to reserve guarded pool allocator memory");
65+
check(Ptr != MAP_FAILED, "Failed to reserve guarded pool allocator memory");
6666
MaybeSetMappingName(Ptr, Size, kGwpAsanGuardPageName);
6767
return Ptr;
6868
}
@@ -75,7 +75,7 @@ void GuardedPoolAllocator::unreserveGuardedPool() {
7575
void GuardedPoolAllocator::allocateInGuardedPool(void *Ptr, size_t Size) const {
7676
assert((reinterpret_cast<uintptr_t>(Ptr) % State.PageSize) == 0);
7777
assert((Size % State.PageSize) == 0);
78-
Check(mprotect(Ptr, Size, PROT_READ | PROT_WRITE) == 0,
78+
check(mprotect(Ptr, Size, PROT_READ | PROT_WRITE) == 0,
7979
"Failed to allocate in guarded pool allocator memory");
8080
MaybeSetMappingName(Ptr, Size, kGwpAsanAliveSlotName);
8181
}
@@ -87,7 +87,7 @@ void GuardedPoolAllocator::deallocateInGuardedPool(void *Ptr,
8787
// mmap() a PROT_NONE page over the address to release it to the system, if
8888
// we used mprotect() here the system would count pages in the quarantine
8989
// against the RSS.
90-
Check(mmap(Ptr, Size, PROT_NONE, MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, -1,
90+
check(mmap(Ptr, Size, PROT_NONE, MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, -1,
9191
0) != MAP_FAILED,
9292
"Failed to deallocate in guarded pool allocator memory");
9393
MaybeSetMappingName(Ptr, Size, kGwpAsanGuardPageName);

compiler-rt/lib/gwp_asan/utilities.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace gwp_asan {
1818
void die(const char *Message);
1919

2020
// Checks that `Condition` is true, otherwise dies with `Message`.
21-
GWP_ASAN_ALWAYS_INLINE void Check(bool Condition, const char *Message) {
21+
GWP_ASAN_ALWAYS_INLINE void check(bool Condition, const char *Message) {
2222
if (Condition)
2323
return;
2424
die(Message);

0 commit comments

Comments
 (0)