Move assert on klass is InstanceKlass after its NULL check. Added san…

…ity check on class_list_file is not NULL before check on it is open.
openjdk · Oct 7, 2020 · 107192f · 107192f
1 parent f5584dc
commit 107192f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/hotspot/share/classfile/lambdaFormInvokers.cpp b/src/hotspot/share/classfile/lambdaFormInvokers.cpp
@@ -126,11 +126,11 @@ void LambdaFormInvokers::reload_class(char* name, ClassFileStream& st, TRAPS) {
   Symbol* class_name = SymbolTable::new_symbol((const char*)name);
   // the class must exist
   Klass* klass = SystemDictionary::resolve_or_null(class_name, THREAD);
-  assert(klass->is_instance_klass(), "Should be");
   if (klass == NULL) {
     log_info(cds)("Class %s not present, skip", name);
     return;
   }
+  assert(klass->is_instance_klass(), "Should be");
 
   ClassLoaderData* cld = ClassLoaderData::the_null_class_loader_data();
   Handle protection_domain;

diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
@@ -3869,7 +3869,7 @@ JVM_END
 
 JVM_ENTRY(jboolean, JVM_IsDumpingClassList(JNIEnv *env))
   JVMWrapper("JVM_IsDumpingClassList");
-  return DumpLoadedClassList != NULL && classlist_file->is_open();
+  return DumpLoadedClassList != NULL && classlist_file != NULL && classlist_file->is_open();
 JVM_END
 
 JVM_ENTRY(void, JVM_LogLambdaFormInvoker(JNIEnv *env, jstring line))