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

Merge with hs25-b53
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 10:38:03 +0200
parents 7944aba7ba41
children de6a9e811145
comparison
equal deleted inserted replaced
12058:ccb4f2af2319 12355:cefad50507d8
35 // aligned header size. 35 // aligned header size.
36 static int header_size() { return sizeof(instanceOopDesc)/HeapWordSize; } 36 static int header_size() { return sizeof(instanceOopDesc)/HeapWordSize; }
37 37
38 // If compressed, the offset of the fields of the instance may not be aligned. 38 // If compressed, the offset of the fields of the instance may not be aligned.
39 static int base_offset_in_bytes() { 39 static int base_offset_in_bytes() {
40 // offset computation code breaks if UseCompressedKlassPointers 40 // offset computation code breaks if UseCompressedClassPointers
41 // only is true 41 // only is true
42 return (UseCompressedOops && UseCompressedKlassPointers) ? 42 return (UseCompressedOops && UseCompressedClassPointers) ?
43 klass_gap_offset_in_bytes() : 43 klass_gap_offset_in_bytes() :
44 sizeof(instanceOopDesc); 44 sizeof(instanceOopDesc);
45 } 45 }
46 46
47 static bool contains_field_offset(int offset, int nonstatic_field_size) { 47 static bool contains_field_offset(int offset, int nonstatic_field_size) {