comparison src/share/vm/oops/klass.hpp @ 12356:359f7e70ae7f

Reduce HotSpot diff and fix previous merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 15:41:33 +0200
parents cefad50507d8
children d8041d695d19
comparison
equal deleted inserted replaced
12355:cefad50507d8 12356:359f7e70ae7f
145 Array<Klass*>* _secondary_supers; 145 Array<Klass*>* _secondary_supers;
146 // Ordered list of all primary supertypes 146 // Ordered list of all primary supertypes
147 Klass* _primary_supers[_primary_super_limit]; 147 Klass* _primary_supers[_primary_super_limit];
148 // java/lang/Class instance mirroring this class 148 // java/lang/Class instance mirroring this class
149 oop _java_mirror; 149 oop _java_mirror;
150
151 // Superclass 150 // Superclass
152 Klass* _super; 151 Klass* _super;
153 // First subclass (NULL if none); _subklass->next_sibling() is next one 152 // First subclass (NULL if none); _subklass->next_sibling() is next one
154 Klass* _subklass; 153 Klass* _subklass;
155 // Sibling link (or NULL); links all subklasses of a klass 154 // Sibling link (or NULL); links all subklasses of a klass
459 virtual void restore_unshareable_info(TRAPS); 458 virtual void restore_unshareable_info(TRAPS);
460 459
461 protected: 460 protected:
462 // computes the subtype relationship 461 // computes the subtype relationship
463 virtual bool compute_is_subtype_of(Klass* k); 462 virtual bool compute_is_subtype_of(Klass* k);
463 public:
464 // subclass accessor (here for convenience; undefined for non-klass objects)
465 virtual bool is_leaf_class() const { fatal("not a class"); return false; }
464 public: 466 public:
465 // ALL FUNCTIONS BELOW THIS POINT ARE DISPATCHED FROM AN OOP 467 // ALL FUNCTIONS BELOW THIS POINT ARE DISPATCHED FROM AN OOP
466 // These functions describe behavior for the oop not the KLASS. 468 // These functions describe behavior for the oop not the KLASS.
467 469
468 // actual oop size of obj in memory 470 // actual oop size of obj in memory