25 lines
982 B
Diff
25 lines
982 B
Diff
|
Subject: Backport JDK-8313909 [JVMCI] assert(cp->tag_at(index).is_unresolved_klass()) in lookupKlassInPool
|
||
|
|
|
||
|
|
---
|
||
|
|
src/hotspot/share/jvmci/jvmciCompilerToVM.cpp | 4 +++-
|
||
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
|
||
|
|
index 5b45499f9..df9f866b9 100644
|
||
|
|
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
|
||
|
|
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
|
||
|
|
@@ -879,7 +879,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);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|