8273902: Memory leak in OopStorage due to bug in OopHandle::release()

simonis · simonis · commit bc48a0ac297b · 2021-09-16T19:56:12.000Z
Reviewed-by: sspitsyn, coleenp
diff --git a/src/hotspot/share/oops/oopHandle.inline.hpp b/src/hotspot/share/oops/oopHandle.inline.hpp
@@ -48,7 +48,7 @@ inline OopHandle::OopHandle(OopStorage* storage, oop obj) :
 }
 
 inline void OopHandle::release(OopStorage* storage) {
-  if (peek() != NULL) {
+  if (_obj != NULL) {
     // Clear the OopHandle first
     NativeAccess<>::oop_store(_obj, (oop)NULL);
     storage->release(_obj);
diff --git a/src/hotspot/share/prims/jvmtiImpl.cpp b/src/hotspot/share/prims/jvmtiImpl.cpp
@@ -206,9 +206,7 @@ JvmtiBreakpoint::JvmtiBreakpoint(Method* m_method, jlocation location)
 }
 
 JvmtiBreakpoint::~JvmtiBreakpoint() {
-  if (_class_holder.peek() != NULL) {
-    _class_holder.release(JvmtiExport::jvmti_oop_storage());
-  }
+  _class_holder.release(JvmtiExport::jvmti_oop_storage());
 }
 
 void JvmtiBreakpoint::copy(JvmtiBreakpoint& bp) {

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ inline OopHandle::OopHandle(OopStorage* storage, oop obj) :`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`inline void OopHandle::release(OopStorage* storage) {`
`51`		`- if (peek() != NULL) {`
	`51`	`+ if (_obj != NULL) {`
`52`	`52`	`// Clear the OopHandle first`
`53`	`53`	`NativeAccess<>::oop_store(_obj, (oop)NULL);`
`54`	`54`	`storage->release(_obj);`
Original file line number	Diff line number	Diff line change
`@@ -206,9 +206,7 @@ JvmtiBreakpoint::JvmtiBreakpoint(Method* m_method, jlocation location)`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`JvmtiBreakpoint::~JvmtiBreakpoint() {`
`209`		`- if (_class_holder.peek() != NULL) {`
`210`		`- _class_holder.release(JvmtiExport::jvmti_oop_storage());`
`211`		`- }`
	`209`	`+ _class_holder.release(JvmtiExport::jvmti_oop_storage());`
`212`	`210`	`}`
`213`	`211`
`214`	`212`	`void JvmtiBreakpoint::copy(JvmtiBreakpoint& bp) {`