diff -r 105d32b27809 -r 38b5442bcab4 src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp --- a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp Mon Sep 16 13:50:20 2019 +0200 +++ b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp Mon Sep 16 14:57:11 2019 +0200 @@ -47,7 +47,7 @@ inline bool ConcurrentWriteOp::process(typename Operation::Type* t) { const u1* const current_top = t->concurrent_top(); const size_t unflushed_size = t->pos() - current_top; - if (unflushed_size == 0 || t->excluded()) { + if (unflushed_size == 0) { t->set_concurrent_top(current_top); return true; } @@ -58,8 +58,7 @@ template inline bool ConcurrentWriteOpExcludeRetired::process(typename Operation::Type* t) { - if (t->retired()) { - assert(t->empty(), "invariant"); + if (t->retired() || t->excluded()) { return true; } return ConcurrentWriteOp::process(t); @@ -70,7 +69,7 @@ assert(t != NULL, "invariant"); const u1* const current_top = t->top(); const size_t unflushed_size = t->pos() - current_top; - if (unflushed_size == 0 || t->excluded()) { + if (unflushed_size == 0) { return true; } const bool result = _operation.write(t, current_top, unflushed_size);