From c5aac0ff5b5984e844e63c5583fd56877e596958 Mon Sep 17 00:00:00 2001 From: dchuyko Date: Wed, 29 Nov 2023 01:14:04 +0600 Subject: [PATCH] Backport 21e4f06ada24098dad4e71b0f9c13afeff87c24b --- src/hotspot/share/classfile/systemDictionary.cpp | 1 - src/hotspot/share/prims/unsafe.cpp | 1 - src/hotspot/share/runtime/synchronizer.cpp | 1 - src/hotspot/share/runtime/vmThread.cpp | 1 - 4 files changed, 4 deletions(-) diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp index 03caedbbf54..3d476eba09b 100644 --- a/src/hotspot/share/classfile/systemDictionary.cpp +++ b/src/hotspot/share/classfile/systemDictionary.cpp @@ -571,7 +571,6 @@ InstanceKlass* SystemDictionary::handle_parallel_loading(JavaThread* current, void SystemDictionary::post_class_load_event(EventClassLoad* event, const InstanceKlass* k, const ClassLoaderData* init_cld) { assert(event != NULL, "invariant"); assert(k != NULL, "invariant"); - assert(event->should_commit(), "invariant"); event->set_loadedClass(k); event->set_definingClassLoader(k->class_loader_data()); event->set_initiatingClassLoader(init_cld); diff --git a/src/hotspot/share/prims/unsafe.cpp b/src/hotspot/share/prims/unsafe.cpp index 87658f1a4e7..6807fca7180 100644 --- a/src/hotspot/share/prims/unsafe.cpp +++ b/src/hotspot/share/prims/unsafe.cpp @@ -798,7 +798,6 @@ UNSAFE_ENTRY(jboolean, Unsafe_CompareAndSetLong(JNIEnv *env, jobject unsafe, job static void post_thread_park_event(EventThreadPark* event, const oop obj, jlong timeout_nanos, jlong until_epoch_millis) { assert(event != NULL, "invariant"); - assert(event->should_commit(), "invariant"); event->set_parkedClass((obj != NULL) ? obj->klass() : NULL); event->set_timeout(timeout_nanos); event->set_until(until_epoch_millis); diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp index bf278ea8440..5be659ebdcf 100644 --- a/src/hotspot/share/runtime/synchronizer.cpp +++ b/src/hotspot/share/runtime/synchronizer.cpp @@ -1224,7 +1224,6 @@ static void post_monitor_inflate_event(EventJavaMonitorInflate* event, const oop obj, ObjectSynchronizer::InflateCause cause) { assert(event != NULL, "invariant"); - assert(event->should_commit(), "invariant"); event->set_monitorClass(obj->klass()); event->set_address((uintptr_t)(void*)obj); event->set_cause((u1)cause); diff --git a/src/hotspot/share/runtime/vmThread.cpp b/src/hotspot/share/runtime/vmThread.cpp index 0422a0008dc..6939208c594 100644 --- a/src/hotspot/share/runtime/vmThread.cpp +++ b/src/hotspot/share/runtime/vmThread.cpp @@ -245,7 +245,6 @@ void VMThread::wait_for_vm_thread_exit() { static void post_vm_operation_event(EventExecuteVMOperation* event, VM_Operation* op) { assert(event != NULL, "invariant"); - assert(event->should_commit(), "invariant"); assert(op != NULL, "invariant"); const bool evaluate_at_safepoint = op->evaluate_at_safepoint(); event->set_operation(op->type());