8313909: [JVMCI] assert(cp->tag_at(index).is_unresolved_klass()) in lookupKlassInPool

Doug Simon · Doug Simon · commit fb9a227e02eb · 2024-07-10T15:34:27.000Z
Reviewed-by: yzheng, never
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -897,7 +897,9 @@ C2V_VMENTRY_NULL(jobject, lookupKlassInPool, (JNIEnv* env, jobject, ARGUMENT_PAI
     } else if (tag.is_symbol()) {
       symbol = cp->symbol_at(index);
     } else {
-      assert(cp->tag_at(index).is_unresolved_klass(), "wrong tag");
+      if (!tag.is_unresolved_klass()) {
+        JVMCI_THROW_MSG_NULL(InternalError, err_msg("Expected %d at index %d, got %d", JVM_CONSTANT_UnresolvedClassInError, index, tag.value()));
+      }
       symbol = cp->klass_name_at(index);
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -897,7 +897,9 @@ C2V_VMENTRY_NULL(jobject, lookupKlassInPool, (JNIEnv* env, jobject, ARGUMENT_PAI`
`897`	`897`	`} else if (tag.is_symbol()) {`
`898`	`898`	`symbol = cp->symbol_at(index);`
`899`	`899`	`} else {`
`900`		`- assert(cp->tag_at(index).is_unresolved_klass(), "wrong tag");`
	`900`	`+ if (!tag.is_unresolved_klass()) {`
	`901`	`+ JVMCI_THROW_MSG_NULL(InternalError, err_msg("Expected %d at index %d, got %d", JVM_CONSTANT_UnresolvedClassInError, index, tag.value()));`
	`902`	`+ }`
`901`	`903`	`symbol = cp->klass_name_at(index);`
`902`	`904`	`}`
`903`	`905`	`}`