From 0ac6d29cc84f431940be00cee9af127a9e90142c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20H=C3=BCbner?= Date: Thu, 23 Oct 2025 17:50:01 +0200 Subject: [PATCH 1/2] Convert conditional to assertion. --- src/hotspot/share/prims/jvm.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp index 6b464ae8e3eee..887016bc932a3 100644 --- a/src/hotspot/share/prims/jvm.cpp +++ b/src/hotspot/share/prims/jvm.cpp @@ -828,10 +828,9 @@ JVM_ENTRY(jclass, JVM_FindClassFromClass(JNIEnv *env, const char *name, Klass* from_class = (from_class_oop == nullptr) ? (Klass*)nullptr : java_lang_Class::as_Klass(from_class_oop); - oop class_loader = nullptr; - if (from_class != nullptr) { - class_loader = from_class->class_loader(); - } + assert(from_class != nullptr, "must be"); + oop class_loader = from_class->class_loader(); + Handle h_loader(THREAD, class_loader); jclass result = find_class_from_class_loader(env, h_name, init, h_loader, true, thread); From b4b81474b987768b6d8b878e0a4bec6ce196f27b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20H=C3=BCbner?= Date: Tue, 28 Oct 2025 08:39:10 +0100 Subject: [PATCH 2/2] Turn conditional into assert. --- src/hotspot/share/prims/jvm.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp index 887016bc932a3..a868f6337e242 100644 --- a/src/hotspot/share/prims/jvm.cpp +++ b/src/hotspot/share/prims/jvm.cpp @@ -825,9 +825,8 @@ JVM_ENTRY(jclass, JVM_FindClassFromClass(JNIEnv *env, const char *name, SystemDictionary::class_name_symbol(name, vmSymbols::java_lang_ClassNotFoundException(), CHECK_NULL); oop from_class_oop = JNIHandles::resolve(from); - Klass* from_class = (from_class_oop == nullptr) - ? (Klass*)nullptr - : java_lang_Class::as_Klass(from_class_oop); + assert(from_class_oop != nullptr, "must be"); + Klass* from_class = java_lang_Class::as_Klass(from_class_oop); assert(from_class != nullptr, "must be"); oop class_loader = from_class->class_loader();