--- a/hotspot/src/share/vm/classfile/classFileParser.cpp Wed Jun 18 14:21:28 2014 -0700
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp Thu Jun 19 11:16:10 2014 -0400
@@ -510,7 +510,7 @@
jbyte tag = cp->tag_at(index).value();
switch (tag) {
case JVM_CONSTANT_UnresolvedClass: {
- Symbol* class_name = cp->unresolved_klass_at(index);
+ Symbol* class_name = cp->klass_name_at(index);
// check the name, even if _cp_patches will overwrite it
verify_legal_class_name(class_name, CHECK_(nullHandle));
break;
@@ -3161,7 +3161,7 @@
if (_need_verify)
is_array = super_klass->oop_is_array();
} else if (_need_verify) {
- is_array = (_cp->unresolved_klass_at(super_class_index)->byte_at(0) == JVM_SIGNATURE_ARRAY);
+ is_array = (_cp->klass_name_at(super_class_index)->byte_at(0) == JVM_SIGNATURE_ARRAY);
}
if (_need_verify) {
guarantee_property(!is_array,
@@ -3855,7 +3855,7 @@
"Invalid this class index %u in constant pool in class file %s",
this_class_index, CHECK_(nullHandle));
- Symbol* class_name = cp->unresolved_klass_at(this_class_index);
+ Symbol* class_name = cp->klass_name_at(this_class_index);
assert(class_name != NULL, "class_name can't be null");
// It's important to set parsed_name *before* resolving the super class.