merge stuff JEP-349-branch
authormgronlun
Thu, 12 Sep 2019 10:49:15 +0200
branchJEP-349-branch
changeset 58100 0e549560be5e
parent 58082 0c9dd7f5d23a
child 58101 84b0544833c4
merge stuff
src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.cpp
src/hotspot/share/jfr/support/jfrThreadLocal.cpp
--- a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.cpp	Wed Sep 11 13:31:52 2019 +0200
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.cpp	Thu Sep 12 10:49:15 2019 +0200
@@ -72,7 +72,7 @@
 }
 
 JfrStackTrace::~JfrStackTrace() {
-  if (_frames_ownership && _frames != NULL) {
+  if (_frames_ownership) {
     FREE_C_HEAP_ARRAY(JfrStackFrame, _frames);
   }
 }
--- a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp	Wed Sep 11 13:31:52 2019 +0200
+++ b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp	Thu Sep 12 10:49:15 2019 +0200
@@ -125,8 +125,7 @@
   if (tl->has_java_buffer()) {
     JfrStorage::release_thread_local(tl->java_buffer(), t);
   }
-  if (tl->_stackframes != NULL) {
-    FREE_C_HEAP_ARRAY(JfrStackFrame, tl->_stackframes);
+  FREE_C_HEAP_ARRAY(JfrStackFrame, tl->_stackframes);
   }
 }