comparison src/share/vm/oops/klass.hpp @ 12355:cefad50507d8

Merge with hs25-b53
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 10:38:03 +0200
parents 58fc8e2b7b6d b2e698d2276c
children 359f7e70ae7f
comparison
equal deleted inserted replaced
12058:ccb4f2af2319 12355:cefad50507d8
178 jbyte _accumulated_modified_oops; // Mod Union Equivalent (CMS support) 178 jbyte _accumulated_modified_oops; // Mod Union Equivalent (CMS support)
179 179
180 // Constructor 180 // Constructor
181 Klass(); 181 Klass();
182 182
183 void* operator new(size_t size, ClassLoaderData* loader_data, size_t word_size, TRAPS); 183 void* operator new(size_t size, ClassLoaderData* loader_data, size_t word_size, TRAPS) throw();
184 184
185 public: 185 public:
186 bool is_klass() const volatile { return true; } 186 bool is_klass() const volatile { return true; }
187 187
188 // super 188 // super
355 return (BasicType) btvalue; 355 return (BasicType) btvalue;
356 } 356 }
357 static int layout_helper_log2_element_size(jint lh) { 357 static int layout_helper_log2_element_size(jint lh) {
358 assert(lh < (jint)_lh_neutral_value, "must be array"); 358 assert(lh < (jint)_lh_neutral_value, "must be array");
359 int l2esz = (lh >> _lh_log2_element_size_shift) & _lh_log2_element_size_mask; 359 int l2esz = (lh >> _lh_log2_element_size_shift) & _lh_log2_element_size_mask;
360 assert(l2esz <= LogBitsPerLong, "sanity"); 360 assert(l2esz <= LogBitsPerLong,
361 err_msg("sanity. l2esz: 0x%x for lh: 0x%x", (uint)l2esz, (uint)lh));
361 return l2esz; 362 return l2esz;
362 } 363 }
363 static jint array_layout_helper(jint tag, int hsize, BasicType etype, int log2_esize) { 364 static jint array_layout_helper(jint tag, int hsize, BasicType etype, int log2_esize) {
364 return (tag << _lh_array_tag_shift) 365 return (tag << _lh_array_tag_shift)
365 | (hsize << _lh_header_size_shift) 366 | (hsize << _lh_header_size_shift)
698 // Verification 699 // Verification
699 virtual void verify_on(outputStream* st, bool check_dictionary); 700 virtual void verify_on(outputStream* st, bool check_dictionary);
700 void verify(bool check_dictionary = true) { verify_on(tty, check_dictionary); } 701 void verify(bool check_dictionary = true) { verify_on(tty, check_dictionary); }
701 702
702 #ifndef PRODUCT 703 #ifndef PRODUCT
703 void verify_vtable_index(int index); 704 bool verify_vtable_index(int index);
705 bool verify_itable_index(int index);
704 #endif 706 #endif
705 707
706 virtual void oop_verify_on(oop obj, outputStream* st); 708 virtual void oop_verify_on(oop obj, outputStream* st);
707 709
708 static bool is_null(narrowKlass obj); 710 static bool is_null(narrowKlass obj);