stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8076173: VirtualSpaceNode container_count() and container_count_slow() have different return types

Browse Source 
Reviewed-by: pliden, stefank
This commit is contained in:
David Lindholm 2015-03-31 11:34:35 +02:00
parent 68ad80c022
commit 5449ba9220
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hotspot/src/share/vm/memory/metaspace.cpp
View File

@ -344,7 +344,7 @@ class VirtualSpaceNode : public CHeapObj<mtClass> {
void inc_container_count(); void inc_container_count();
void dec_container_count(); void dec_container_count();
#ifdef ASSERT #ifdef ASSERT
uint container_count_slow(); uintx container_count_slow();
void verify_container_count(); void verify_container_count();
#endif #endif
@ -461,8 +461,8 @@ void VirtualSpaceNode::purge(ChunkManager* chunk_manager) {
} }
#ifdef ASSERT #ifdef ASSERT
uint VirtualSpaceNode::container_count_slow() { uintx VirtualSpaceNode::container_count_slow() {
uint count = 0; uintx count = 0;
Metachunk* chunk = first_chunk(); Metachunk* chunk = first_chunk();
Metachunk* invalid_chunk = (Metachunk*) top(); Metachunk* invalid_chunk = (Metachunk*) top();
while (chunk < invalid_chunk ) { while (chunk < invalid_chunk ) {
@ -796,10 +796,7 @@ Mutex* const SpaceManager::_expand_lock =
void VirtualSpaceNode::inc_container_count() { void VirtualSpaceNode::inc_container_count() {
assert_lock_strong(SpaceManager::expand_lock()); assert_lock_strong(SpaceManager::expand_lock());
_container_count++; _container_count++;
assert(_container_count == container_count_slow(), DEBUG_ONLY(verify_container_count();)
err_msg("Inconsistency in container_count _container_count " SIZE_FORMAT
" container_count_slow() %u",
_container_count, container_count_slow()));
} }
void VirtualSpaceNode::dec_container_count() { void VirtualSpaceNode::dec_container_count() {
@ -810,8 +807,8 @@ void VirtualSpaceNode::dec_container_count() {
#ifdef ASSERT #ifdef ASSERT
void VirtualSpaceNode::verify_container_count() { void VirtualSpaceNode::verify_container_count() {
assert(_container_count == container_count_slow(), assert(_container_count == container_count_slow(),
err_msg("Inconsistency in container_count _container_count " SIZE_FORMAT err_msg("Inconsistency in container_count _container_count " UINTX_FORMAT
" container_count_slow() %u", _container_count, container_count_slow())); " container_count_slow() " UINTX_FORMAT, _container_count, container_count_slow()));
} }
#endif #endif