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

8049426: Minor cleanups after G1 class unloading

Browse Source 
Reviewed-by: stefank, brutisso
This commit is contained in:
Erik Helin 2014-07-09 16:44:30 +02:00
parent 1b001a2afd
commit b77bc85799
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hotspot/src/share/vm/gc_implementation/g1/g1CodeCacheRemSet.cpp
View File

@ -169,7 +169,7 @@ G1CodeRootSet::~G1CodeRootSet() {
void G1CodeRootSet::add(nmethod* method) { void G1CodeRootSet::add(nmethod* method) {
if (!contains(method)) { if (!contains(method)) {
// Find the first chunk thatisn't full. // Find the first chunk that isn't full.
G1CodeRootChunk* cur = _list.head(); G1CodeRootChunk* cur = _list.head();
while (cur != NULL) { while (cur != NULL) {
if (!cur->is_full()) { if (!cur->is_full()) {

2
hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
View File

@ -5310,7 +5310,7 @@ public:
// Do first pass of code cache cleaning. // Do first pass of code cache cleaning.
_code_cache_task.work_first_pass(worker_id); _code_cache_task.work_first_pass(worker_id);
// Let the threads, mark that the first pass is done. // Let the threads mark that the first pass is done.
_code_cache_task.barrier_mark(worker_id); _code_cache_task.barrier_mark(worker_id);
// Clean the Strings and Symbols. // Clean the Strings and Symbols.

3
hotspot/src/share/vm/oops/instanceKlass.cpp
View File

@ -1951,8 +1951,7 @@ bool InstanceKlass::is_dependent_nmethod(nmethod* nm) {
if (nm == b->get_nmethod()) { if (nm == b->get_nmethod()) {
#ifdef ASSERT #ifdef ASSERT
int count = b->count(); int count = b->count();
assert(count >= 0, "Just check if we ever get here 1"); assert(count >= 0, err_msg("count shouldn't be negative: %d", count));
assert(count > 0, "Just check if we ever get here 2");
#endif #endif
return true; return true;
} }

2
hotspot/src/share/vm/utilities/array.hpp
View File

@ -328,6 +328,8 @@ protected:
static size_t byte_sizeof(int length) { return sizeof(Array<T>) + MAX2(length - 1, 0) * sizeof(T); } static size_t byte_sizeof(int length) { return sizeof(Array<T>) + MAX2(length - 1, 0) * sizeof(T); }
// WhiteBox API helper. // WhiteBox API helper.
// Can't distinguish between array of length 0 and length 1,
// will always return 0 in those cases.
static int bytes_to_length(size_t bytes) { static int bytes_to_length(size_t bytes) {
assert(is_size_aligned(bytes, BytesPerWord), "Must be, for now"); assert(is_size_aligned(bytes, BytesPerWord), "Must be, for now");