comparison src/share/vm/oops/klass.cpp @ 13584:2dfe246179c0

Merge
author dholmes
date Wed, 20 Sep 2017 23:55:35 -0400
parents 2eceb84edcf1
children 7df86c5f8b5d
comparison
equal deleted inserted replaced
92:d77eab184b05 93:7ae859ef7d58
711 guarantee(ko->is_klass(), "should be klass"); 711 guarantee(ko->is_klass(), "should be klass");
712 } 712 }
713 } 713 }
714 714
715 if (java_mirror() != NULL) { 715 if (java_mirror() != NULL) {
716 guarantee(java_mirror()->is_oop(), "should be instance"); 716 guarantee(oopDesc::is_oop(java_mirror()), "should be instance");
717 } 717 }
718 } 718 }
719 719
720 void Klass::oop_verify_on(oop obj, outputStream* st) { 720 void Klass::oop_verify_on(oop obj, outputStream* st) {
721 guarantee(obj->is_oop(), "should be oop"); 721 guarantee(oopDesc::is_oop(obj), "should be oop");
722 guarantee(obj->klass()->is_klass(), "klass field is not a klass"); 722 guarantee(obj->klass()->is_klass(), "klass field is not a klass");
723 } 723 }
724 724
725 klassVtable Klass::vtable() const { 725 klassVtable Klass::vtable() const {
726 return klassVtable(const_cast<Klass*>(this), start_of_vtable(), vtable_length() / vtableEntry::size()); 726 return klassVtable(const_cast<Klass*>(this), start_of_vtable(), vtable_length() / vtableEntry::size());