archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-17 17:44:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8253278: Refactor/cleanup oopDesc::*_klass_addr

Browse source 
Reviewed-by: coleenp, stefank
This commit is contained in:
Aleksey Shipilev 2020-09-18 08:22:54 +00:00
parent 73c9088b81
commit 11c4ea963c
3 changed files with 12 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/hotspot/share/oops/oop.cpp
View file

@ -145,11 +145,11 @@ bool oopDesc::has_klass_gap() {
void* oopDesc::load_klass_raw(oop obj) { void* oopDesc::load_klass_raw(oop obj) {
if (UseCompressedClassPointers) { if (UseCompressedClassPointers) {
narrowKlass narrow_klass = *(obj->compressed_klass_addr()); narrowKlass narrow_klass = obj->_metadata._compressed_klass;
if (narrow_klass == 0) return NULL; if (narrow_klass == 0) return NULL;
return (void*)CompressedKlassPointers::decode_raw(narrow_klass); return (void*)CompressedKlassPointers::decode_raw(narrow_klass);
} else { } else {
return *(void**)(obj->klass_addr()); return obj->_metadata._klass;
} }
} }

6
src/hotspot/share/oops/oop.hpp
View file

@ -78,13 +78,9 @@ class oopDesc {
inline Klass* klass() const; inline Klass* klass() const;
inline Klass* klass_or_null() const; inline Klass* klass_or_null() const;
inline Klass* klass_or_null_acquire() const; inline Klass* klass_or_null_acquire() const;
static inline Klass** klass_addr(HeapWord* mem);
static inline narrowKlass* compressed_klass_addr(HeapWord* mem);
inline Klass** klass_addr();
inline narrowKlass* compressed_klass_addr();
inline void set_klass(Klass* k); inline void set_klass(Klass* k);
static inline void release_set_klass(HeapWord* mem, Klass* klass); static inline void release_set_klass(HeapWord* mem, Klass* k);
// For klass field compression // For klass field compression
inline int klass_gap() const; inline int klass_gap() const;

47
src/hotspot/share/oops/oop.inline.hpp
View file

@ -113,55 +113,26 @@ Klass* oopDesc::klass_or_null_acquire() const {
} }
} }
Klass** oopDesc::klass_addr(HeapWord* mem) {
// Only used internally and with CMS and will not work with
// UseCompressedOops
assert(!UseCompressedClassPointers, "only supported with uncompressed klass pointers");
ByteSize offset = byte_offset_of(oopDesc, _metadata._klass);
return (Klass**) (((char*)mem) + in_bytes(offset));
}
narrowKlass* oopDesc::compressed_klass_addr(HeapWord* mem) {
assert(UseCompressedClassPointers, "only called by compressed klass pointers");
ByteSize offset = byte_offset_of(oopDesc, _metadata._compressed_klass);
return (narrowKlass*) (((char*)mem) + in_bytes(offset));
}
Klass** oopDesc::klass_addr() {
return klass_addr((HeapWord*)this);
}
narrowKlass* oopDesc::compressed_klass_addr() {
return compressed_klass_addr((HeapWord*)this);
}
#define CHECK_SET_KLASS(k) \
do { \
assert(Universe::is_bootstrapping() || k != NULL, "NULL Klass"); \
assert(Universe::is_bootstrapping() || k->is_klass(), "not a Klass"); \
} while (0)
void oopDesc::set_klass(Klass* k) { void oopDesc::set_klass(Klass* k) {
CHECK_SET_KLASS(k); assert(Universe::is_bootstrapping() || (k != NULL && k->is_klass()), "incorrect Klass");
if (UseCompressedClassPointers) { if (UseCompressedClassPointers) {
*compressed_klass_addr() = CompressedKlassPointers::encode_not_null(k); _metadata._compressed_klass = CompressedKlassPointers::encode_not_null(k);
} else { } else {
*klass_addr() = k; _metadata._klass = k;
} }
} }
void oopDesc::release_set_klass(HeapWord* mem, Klass* klass) { void oopDesc::release_set_klass(HeapWord* mem, Klass* k) {
CHECK_SET_KLASS(klass); assert(Universe::is_bootstrapping() || (k != NULL && k->is_klass()), "incorrect Klass");
char* raw_mem = ((char*)mem + klass_offset_in_bytes());
if (UseCompressedClassPointers) { if (UseCompressedClassPointers) {
Atomic::release_store(compressed_klass_addr(mem), Atomic::release_store((narrowKlass*)raw_mem,
CompressedKlassPointers::encode_not_null(klass)); CompressedKlassPointers::encode_not_null(k));
} else { } else {
Atomic::release_store(klass_addr(mem), klass); Atomic::release_store((Klass**)raw_mem, k);
} }
} }
#undef CHECK_SET_KLASS
int oopDesc::klass_gap() const { int oopDesc::klass_gap() const {
return *(int*)(((intptr_t)this) + klass_gap_offset_in_bytes()); return *(int*)(((intptr_t)this) + klass_gap_offset_in_bytes());
} }