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

8249137: Remove CollectedHeap::obj_size

Browse Source 
Reviewed-by: rkennke, tschatzl, cjplummer
This commit is contained in:
Aleksey Shipilev 2020-07-13 07:39:39 +02:00
parent faf4d7ccb7
commit 2d3c928f0b
5 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotspot/share/gc/shared/collectedHeap.cpp
View File

@ -576,10 +576,6 @@ void CollectedHeap::deduplicate_string(oop str) {
// Do nothing, unless overridden in subclass. // Do nothing, unless overridden in subclass.
} }
size_t CollectedHeap::obj_size(oop obj) const {
return obj->size();
}
uint32_t CollectedHeap::hash_oop(oop obj) const { uint32_t CollectedHeap::hash_oop(oop obj) const {
const uintptr_t addr = cast_from_oop<uintptr_t>(obj); const uintptr_t addr = cast_from_oop<uintptr_t>(obj);
return static_cast<uint32_t>(addr >> LogMinObjAlignment); return static_cast<uint32_t>(addr >> LogMinObjAlignment);

2
src/hotspot/share/gc/shared/collectedHeap.hpp
View File

@ -493,8 +493,6 @@ class CollectedHeap : public CHeapObj<mtInternal> {
virtual bool is_oop(oop object) const; virtual bool is_oop(oop object) const;
virtual size_t obj_size(oop obj) const;
// Non product verification and debugging. // Non product verification and debugging.
#ifndef PRODUCT #ifndef PRODUCT
// Support for PromotionFailureALot. Return true if it's time to cause a // Support for PromotionFailureALot. Return true if it's time to cause a

2
src/hotspot/share/prims/jvmtiEnv.cpp
View File

@ -486,7 +486,7 @@ jvmtiError
JvmtiEnv::GetObjectSize(jobject object, jlong* size_ptr) { JvmtiEnv::GetObjectSize(jobject object, jlong* size_ptr) {
oop mirror = JNIHandles::resolve_external_guard(object); oop mirror = JNIHandles::resolve_external_guard(object);
NULL_CHECK(mirror, JVMTI_ERROR_INVALID_OBJECT); NULL_CHECK(mirror, JVMTI_ERROR_INVALID_OBJECT);
*size_ptr = (jlong)Universe::heap()->obj_size(mirror) * wordSize; *size_ptr = (jlong)mirror->size() * wordSize;
return JVMTI_ERROR_NONE; return JVMTI_ERROR_NONE;
} /* end GetObjectSize */ } /* end GetObjectSize */

2
src/hotspot/share/prims/jvmtiExport.cpp
View File

@ -1065,7 +1065,7 @@ class JvmtiObjectAllocEventMark : public JvmtiClassEventMark {
public: public:
JvmtiObjectAllocEventMark(JavaThread *thread, oop obj) : JvmtiClassEventMark(thread, oop_to_klass(obj)) { JvmtiObjectAllocEventMark(JavaThread *thread, oop obj) : JvmtiClassEventMark(thread, oop_to_klass(obj)) {
_jobj = (jobject)to_jobject(obj); _jobj = (jobject)to_jobject(obj);
_size = Universe::heap()->obj_size(obj) * wordSize; _size = obj->size() * wordSize;
}; };
jobject jni_jobject() { return _jobj; } jobject jni_jobject() { return _jobj; }
jlong size() { return _size; } jlong size() { return _size; }

2
src/hotspot/share/prims/whitebox.cpp
View File

@ -387,7 +387,7 @@ WB_END
WB_ENTRY(jlong, WB_GetObjectSize(JNIEnv* env, jobject o, jobject obj)) WB_ENTRY(jlong, WB_GetObjectSize(JNIEnv* env, jobject o, jobject obj))
oop p = JNIHandles::resolve(obj); oop p = JNIHandles::resolve(obj);
return Universe::heap()->obj_size(p) * HeapWordSize; return p->size() * HeapWordSize;
WB_END WB_END
WB_ENTRY(jlong, WB_GetHeapSpaceAlignment(JNIEnv* env, jobject o)) WB_ENTRY(jlong, WB_GetHeapSpaceAlignment(JNIEnv* env, jobject o))