8219817: Remove unused CollectedHeap::block_size()
Reviewed-by: shade, stefank
diff --git a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp
index 44c88fa..4ebe490 100644
--- a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp
@@ -128,7 +128,6 @@
// No support for block parsing.
virtual HeapWord* block_start(const void* addr) const { return NULL; }
- virtual size_t block_size(const HeapWord* addr) const { return 0; }
virtual bool block_is_obj(const HeapWord* addr) const { return false; }
// No GC threads
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 19601c6..8ea268d 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -2254,11 +2254,6 @@
return hr->block_start(addr);
}
-size_t G1CollectedHeap::block_size(const HeapWord* addr) const {
- HeapRegion* hr = heap_region_containing(addr);
- return hr->block_size(addr);
-}
-
bool G1CollectedHeap::block_is_obj(const HeapWord* addr) const {
HeapRegion* hr = heap_region_containing(addr);
return hr->block_is_obj(addr);
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index 0a89542..4836ed8 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -1191,11 +1191,6 @@
// non-object.
virtual HeapWord* block_start(const void* addr) const;
- // Requires "addr" to be the start of a chunk, and returns its size.
- // "addr + size" is required to be the start of a new chunk, or the end
- // of the active area of the heap.
- virtual size_t block_size(const HeapWord* addr) const;
-
// Requires "addr" to be the start of a block, and returns "TRUE" iff
// the block is an object.
virtual bool block_is_obj(const HeapWord* addr) const;
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index c68a14d..7015b03 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -532,10 +532,6 @@
return 0;
}
-size_t ParallelScavengeHeap::block_size(const HeapWord* addr) const {
- return oop(addr)->size();
-}
-
bool ParallelScavengeHeap::block_is_obj(const HeapWord* addr) const {
return block_start(addr) == addr;
}
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
index ed03539..273f04a 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
@@ -220,7 +220,6 @@
void safe_object_iterate(ObjectClosure* cl) { object_iterate(cl); }
HeapWord* block_start(const void* addr) const;
- size_t block_size(const HeapWord* addr) const;
bool block_is_obj(const HeapWord* addr) const;
jlong millis_since_last_gc();
diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp
index cb4edf3..d366132 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp
@@ -450,11 +450,6 @@
// non-object.
virtual HeapWord* block_start(const void* addr) const = 0;
- // Requires "addr" to be the start of a chunk, and returns its size.
- // "addr + size" is required to be the start of a new chunk, or the end
- // of the active area of the heap.
- virtual size_t block_size(const HeapWord* addr) const = 0;
-
// Requires "addr" to be the start of a block, and returns "TRUE" iff
// the block is an object.
virtual bool block_is_obj(const HeapWord* addr) const = 0;
diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.cpp b/src/hotspot/share/gc/shared/genCollectedHeap.cpp
index d85dbb6..7731d5c 100644
--- a/src/hotspot/share/gc/shared/genCollectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/genCollectedHeap.cpp
@@ -1064,18 +1064,6 @@
return _old_gen->block_start(addr);
}
-size_t GenCollectedHeap::block_size(const HeapWord* addr) const {
- assert(is_in_reserved(addr), "block_size of address outside of heap");
- if (_young_gen->is_in_reserved(addr)) {
- assert(_young_gen->is_in(addr), "addr should be in allocated part of generation");
- return _young_gen->block_size(addr);
- }
-
- assert(_old_gen->is_in_reserved(addr), "Some generation should contain the address");
- assert(_old_gen->is_in(addr), "addr should be in allocated part of generation");
- return _old_gen->block_size(addr);
-}
-
bool GenCollectedHeap::block_is_obj(const HeapWord* addr) const {
assert(is_in_reserved(addr), "block_is_obj of address outside of heap");
assert(block_start(addr) == addr, "addr must be a block start");
diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.hpp b/src/hotspot/share/gc/shared/genCollectedHeap.hpp
index 2ce5f74..b033219 100644
--- a/src/hotspot/share/gc/shared/genCollectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/genCollectedHeap.hpp
@@ -278,13 +278,6 @@
// non-object.
virtual HeapWord* block_start(const void* addr) const;
- // Requires "addr" to be the start of a chunk, and returns its size.
- // "addr + size" is required to be the start of a new chunk, or the end
- // of the active area of the heap. Assumes (and verifies in non-product
- // builds) that addr is in the allocated part of the heap and is
- // the start of a chunk.
- virtual size_t block_size(const HeapWord* addr) const;
-
// Requires "addr" to be the start of a block, and returns "TRUE" iff
// the block is an object. Assumes (and verifies in non-product
// builds) that addr is in the allocated part of the heap and is
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index 8747a43..8066999 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -1192,12 +1192,6 @@
return NULL;
}
-size_t ShenandoahHeap::block_size(const HeapWord* addr) const {
- Space* sp = heap_region_containing(addr);
- assert(sp != NULL, "block_size of address outside of heap");
- return sp->block_size(addr);
-}
-
bool ShenandoahHeap::block_is_obj(const HeapWord* addr) const {
Space* sp = heap_region_containing(addr);
return sp->block_is_obj(addr);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
index 9333323..639b1a4 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
@@ -567,7 +567,6 @@
// Used for parsing heap during error printing
HeapWord* block_start(const void* addr) const;
- size_t block_size(const HeapWord* addr) const;
bool block_is_obj(const HeapWord* addr) const;
// Used for native heap walkers: heap dumpers, mostly
diff --git a/src/hotspot/share/gc/z/zCollectedHeap.cpp b/src/hotspot/share/gc/z/zCollectedHeap.cpp
index 79820a3..3fcc41b 100644
--- a/src/hotspot/share/gc/z/zCollectedHeap.cpp
+++ b/src/hotspot/share/gc/z/zCollectedHeap.cpp
@@ -245,11 +245,6 @@
return (HeapWord*)_heap.block_start((uintptr_t)addr);
}
-size_t ZCollectedHeap::block_size(const HeapWord* addr) const {
- size_t size_in_bytes = _heap.block_size((uintptr_t)addr);
- return ZUtils::bytes_to_words(size_in_bytes);
-}
-
bool ZCollectedHeap::block_is_obj(const HeapWord* addr) const {
return _heap.block_is_obj((uintptr_t)addr);
}
diff --git a/src/hotspot/share/gc/z/zCollectedHeap.hpp b/src/hotspot/share/gc/z/zCollectedHeap.hpp
index c1f6467..fe09f5c 100644
--- a/src/hotspot/share/gc/z/zCollectedHeap.hpp
+++ b/src/hotspot/share/gc/z/zCollectedHeap.hpp
@@ -100,7 +100,6 @@
virtual void safe_object_iterate(ObjectClosure* cl);
virtual HeapWord* block_start(const void* addr) const;
- virtual size_t block_size(const HeapWord* addr) const;
virtual bool block_is_obj(const HeapWord* addr) const;
virtual void register_nmethod(nmethod* nm);
diff --git a/src/hotspot/share/gc/z/zHeap.cpp b/src/hotspot/share/gc/z/zHeap.cpp
index 29c684e..5dcb5b8 100644
--- a/src/hotspot/share/gc/z/zHeap.cpp
+++ b/src/hotspot/share/gc/z/zHeap.cpp
@@ -185,11 +185,6 @@
return page->block_start(addr);
}
-size_t ZHeap::block_size(uintptr_t addr) const {
- const ZPage* const page = _pagetable.get(addr);
- return page->block_size(addr);
-}
-
bool ZHeap::block_is_obj(uintptr_t addr) const {
const ZPage* const page = _pagetable.get(addr);
return page->block_is_obj(addr);
diff --git a/src/hotspot/share/gc/z/zHeap.hpp b/src/hotspot/share/gc/z/zHeap.hpp
index 2bec18c..89c0c41 100644
--- a/src/hotspot/share/gc/z/zHeap.hpp
+++ b/src/hotspot/share/gc/z/zHeap.hpp
@@ -99,7 +99,6 @@
// Block
uintptr_t block_start(uintptr_t addr) const;
- size_t block_size(uintptr_t addr) const;
bool block_is_obj(uintptr_t addr) const;
// Workers
diff --git a/src/hotspot/share/gc/z/zPage.hpp b/src/hotspot/share/gc/z/zPage.hpp
index 0b812b2..5a83f31 100644
--- a/src/hotspot/share/gc/z/zPage.hpp
+++ b/src/hotspot/share/gc/z/zPage.hpp
@@ -85,7 +85,6 @@
bool is_in(uintptr_t addr) const;
uintptr_t block_start(uintptr_t addr) const;
- size_t block_size(uintptr_t addr) const;
bool block_is_obj(uintptr_t addr) const;
bool is_active() const;
diff --git a/src/hotspot/share/gc/z/zPage.inline.hpp b/src/hotspot/share/gc/z/zPage.inline.hpp
index 51cc5c6..b08b433 100644
--- a/src/hotspot/share/gc/z/zPage.inline.hpp
+++ b/src/hotspot/share/gc/z/zPage.inline.hpp
@@ -32,7 +32,6 @@
#include "gc/z/zNUMA.hpp"
#include "gc/z/zPage.hpp"
#include "gc/z/zPhysicalMemory.inline.hpp"
-#include "gc/z/zUtils.inline.hpp"
#include "gc/z/zVirtualMemory.inline.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/atomic.hpp"
@@ -160,14 +159,6 @@
}
}
-inline size_t ZPage::block_size(uintptr_t addr) const {
- if (block_is_obj(addr)) {
- return ZUtils::object_size(addr);
- } else {
- return end() - top();
- }
-}
-
inline bool ZPage::block_is_obj(uintptr_t addr) const {
return ZAddress::offset(addr) < top();
}
