Mercurial > hg > graal-jvmci-8
changeset 23413:b1883db930e7
8048353: jstack -l crashes VM when a Java mirror for a primitive type is locked
Reviewed-by: coleenp, dcubed
| author | vkempik |
|---|---|
| date | Mon, 20 Jul 2015 18:57:07 +0300 |
| parents | ae5624088d86 |
| children | b2ca5aba9449 |
| files | src/share/vm/classfile/javaClasses.cpp src/share/vm/classfile/javaClasses.hpp src/share/vm/runtime/vframe.cpp |
| diffstat | 3 files changed, 18 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/classfile/javaClasses.cpp Wed Jul 22 10:12:56 2015 -0700 +++ b/src/share/vm/classfile/javaClasses.cpp Mon Jul 20 18:57:07 2015 +0300 @@ -782,6 +782,22 @@ return name; } +// Returns the Java name for this Java mirror (Resource allocated) +// See Klass::external_name(). +// For primitive type Java mirrors, its type name is returned. +const char* java_lang_Class::as_external_name(oop java_class) { + assert(java_lang_Class::is_instance(java_class), "must be a Class object"); + const char* name = NULL; + if (is_primitive(java_class)) { + name = type2name(primitive_type(java_class)); + } else { + name = as_Klass(java_class)->external_name(); + } + if (name == NULL) { + name = "<null>"; + } + return name; +} Klass* java_lang_Class::array_klass(oop java_class) { Klass* k = ((Klass*)java_class->metadata_field(_array_klass_offset));
--- a/src/share/vm/classfile/javaClasses.hpp Wed Jul 22 10:12:56 2015 -0700 +++ b/src/share/vm/classfile/javaClasses.hpp Mon Jul 20 18:57:07 2015 +0300 @@ -270,6 +270,7 @@ } static Symbol* as_signature(oop java_class, bool intern_if_not_found, TRAPS); static void print_signature(oop java_class, outputStream *st); + static const char* as_external_name(oop java_class); // Testing static bool is_instance(oop obj) { return obj != NULL && obj->klass() == SystemDictionary::Class_klass();
--- a/src/share/vm/runtime/vframe.cpp Wed Jul 22 10:12:56 2015 -0700 +++ b/src/share/vm/runtime/vframe.cpp Mon Jul 20 18:57:07 2015 +0300 @@ -148,8 +148,7 @@ if (obj.not_null()) { st->print("\t- %s <" INTPTR_FORMAT "> ", lock_state, (address)obj()); if (obj->klass() == SystemDictionary::Class_klass()) { - Klass* target_klass = java_lang_Class::as_Klass(obj()); - st->print_cr("(a java.lang.Class for %s)", InstanceKlass::cast(target_klass)->external_name()); + st->print_cr("(a java.lang.Class for %s)", java_lang_Class::as_external_name(obj())); } else { Klass* k = obj->klass(); st->print_cr("(a %s)", k->external_name());