# HG changeset patch
# User mgronlun
# Date 1568278155 -7200
# Node ID 0e549560be5ecc1a23c41b286fa10345c138f05c
# Parent  0c9dd7f5d23aabeb10c913a63cb7a7b615a08bec
merge stuff

diff -r 0c9dd7f5d23a -r 0e549560be5e src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.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);
   }
 }
diff -r 0c9dd7f5d23a -r 0e549560be5e src/hotspot/share/jfr/support/jfrThreadLocal.cpp
--- 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);
   }
 }