Skip to content

Commit f74c4df

Browse files
committed
8349580: Do not use address in MemTracker top level functions
Reviewed-by: gziemski, stefank
1 parent c9cadbd commit f74c4df

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/hotspot/os/posix/perfMemory_posix.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1088,7 +1088,7 @@ static void unmap_shared(char* addr, size_t bytes) {
10881088
MemTracker::NmtVirtualMemoryLocker nvml;
10891089
res = ::munmap(addr, bytes);
10901090
if (res == 0) {
1091-
MemTracker::record_virtual_memory_release((address)addr, bytes);
1091+
MemTracker::record_virtual_memory_release(addr, bytes);
10921092
}
10931093
} else {
10941094
res = ::munmap(addr, bytes);

src/hotspot/os/windows/perfMemory_windows.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1804,7 +1804,7 @@ void PerfMemory::detach(char* addr, size_t bytes) {
18041804
// it does not go through os api, the operation has to record from here
18051805
MemTracker::NmtVirtualMemoryLocker nvml;
18061806
remove_file_mapping(addr);
1807-
MemTracker::record_virtual_memory_release((address)addr, bytes);
1807+
MemTracker::record_virtual_memory_release(addr, bytes);
18081808
} else {
18091809
remove_file_mapping(addr);
18101810
}

src/hotspot/share/nmt/memTracker.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,15 +135,15 @@ class MemTracker : AllStatic {
135135
}
136136
}
137137

138-
static inline void record_virtual_memory_release(address addr, size_t size) {
138+
static inline void record_virtual_memory_release(void* addr, size_t size) {
139139
assert_post_init();
140140
if (!enabled()) return;
141141
if (addr != nullptr) {
142142
VirtualMemoryTracker::remove_released_region((address)addr, size);
143143
}
144144
}
145145

146-
static inline void record_virtual_memory_uncommit(address addr, size_t size) {
146+
static inline void record_virtual_memory_uncommit(void* addr, size_t size) {
147147
assert_post_init();
148148
if (!enabled()) return;
149149
if (addr != nullptr) {

src/hotspot/share/runtime/os.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2204,7 +2204,7 @@ bool os::uncommit_memory(char* addr, size_t bytes, bool executable) {
22042204
MemTracker::NmtVirtualMemoryLocker nvml;
22052205
res = pd_uncommit_memory(addr, bytes, executable);
22062206
if (res) {
2207-
MemTracker::record_virtual_memory_uncommit((address)addr, bytes);
2207+
MemTracker::record_virtual_memory_uncommit(addr, bytes);
22082208
}
22092209
} else {
22102210
res = pd_uncommit_memory(addr, bytes, executable);
@@ -2226,7 +2226,7 @@ bool os::release_memory(char* addr, size_t bytes) {
22262226
MemTracker::NmtVirtualMemoryLocker nvml;
22272227
res = pd_release_memory(addr, bytes);
22282228
if (res) {
2229-
MemTracker::record_virtual_memory_release((address)addr, bytes);
2229+
MemTracker::record_virtual_memory_release(addr, bytes);
22302230
}
22312231
} else {
22322232
res = pd_release_memory(addr, bytes);
@@ -2311,7 +2311,7 @@ bool os::unmap_memory(char *addr, size_t bytes) {
23112311
MemTracker::NmtVirtualMemoryLocker nvml;
23122312
result = pd_unmap_memory(addr, bytes);
23132313
if (result) {
2314-
MemTracker::record_virtual_memory_release((address)addr, bytes);
2314+
MemTracker::record_virtual_memory_release(addr, bytes);
23152315
}
23162316
} else {
23172317
result = pd_unmap_memory(addr, bytes);
@@ -2350,7 +2350,7 @@ bool os::release_memory_special(char* addr, size_t bytes) {
23502350
MemTracker::NmtVirtualMemoryLocker nvml;
23512351
res = pd_release_memory_special(addr, bytes);
23522352
if (res) {
2353-
MemTracker::record_virtual_memory_release((address)addr, bytes);
2353+
MemTracker::record_virtual_memory_release(addr, bytes);
23542354
}
23552355
} else {
23562356
res = pd_release_memory_special(addr, bytes);

0 commit comments

Comments
 (0)