src/share/vm/runtime/vframe.cpp

changeset 1577
4ce7240d622c
parent 1279
bd02caa94611
child 1587
cd37471eaecc
     1.1 --- a/src/share/vm/runtime/vframe.cpp	Tue Jan 05 11:16:09 2010 -0800
     1.2 +++ b/src/share/vm/runtime/vframe.cpp	Wed Jan 06 14:22:39 2010 -0800
     1.3 @@ -124,7 +124,7 @@
     1.4  static void print_locked_object_class_name(outputStream* st, Handle obj, const char* lock_state) {
     1.5    if (obj.not_null()) {
     1.6      st->print("\t- %s <" INTPTR_FORMAT "> ", lock_state, (address)obj());
     1.7 -    if (obj->klass() == SystemDictionary::class_klass()) {
     1.8 +    if (obj->klass() == SystemDictionary::Class_klass()) {
     1.9        klassOop target_klass = java_lang_Class::as_klassOop(obj());
    1.10        st->print_cr("(a java.lang.Class for %s)", instanceKlass::cast(target_klass)->external_name());
    1.11      } else {
    1.12 @@ -430,7 +430,7 @@
    1.13        // This is Method.invoke() -- skip it
    1.14      } else if (use_new_reflection &&
    1.15                Klass::cast(method()->method_holder())
    1.16 -                 ->is_subclass_of(SystemDictionary::reflect_method_accessor_klass())) {
    1.17 +                 ->is_subclass_of(SystemDictionary::reflect_MethodAccessorImpl_klass())) {
    1.18        // This is an auxilary frame -- skip it
    1.19      } else {
    1.20        // This is non-excluded frame, we need to count it against the depth
    1.21 @@ -490,8 +490,8 @@
    1.22  void vframeStreamCommon::skip_reflection_related_frames() {
    1.23    while (!at_end() &&
    1.24           (JDK_Version::is_gte_jdk14x_version() && UseNewReflection &&
    1.25 -          (Klass::cast(method()->method_holder())->is_subclass_of(SystemDictionary::reflect_method_accessor_klass()) ||
    1.26 -           Klass::cast(method()->method_holder())->is_subclass_of(SystemDictionary::reflect_constructor_accessor_klass())))) {
    1.27 +          (Klass::cast(method()->method_holder())->is_subclass_of(SystemDictionary::reflect_MethodAccessorImpl_klass()) ||
    1.28 +           Klass::cast(method()->method_holder())->is_subclass_of(SystemDictionary::reflect_ConstructorAccessorImpl_klass())))) {
    1.29      next();
    1.30    }
    1.31  }

mercurial