1.1 --- a/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp Fri Jul 10 16:01:20 2009 -0700
1.2 +++ b/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp Tue Jul 14 15:40:39 2009 -0700
1.3 @@ -96,14 +96,14 @@
1.4 while (n <= addr) {
1.5 q = n;
1.6 oop obj = oop(q);
1.7 - if (obj->klass() == NULL) return q;
1.8 + if (obj->klass_or_null() == NULL) return q;
1.9 n += obj->size();
1.10 }
1.11 } else {
1.12 while (n <= addr) {
1.13 q = n;
1.14 oop obj = oop(q);
1.15 - if (obj->klass() == NULL) return q;
1.16 + if (obj->klass_or_null() == NULL) return q;
1.17 n += _sp->block_size(q);
1.18 }
1.19 }
1.20 @@ -115,7 +115,7 @@
1.21 inline HeapWord*
1.22 G1BlockOffsetArray::forward_to_block_containing_addr(HeapWord* q,
1.23 const void* addr) {
1.24 - if (oop(q)->klass() == NULL) return q;
1.25 + if (oop(q)->klass_or_null() == NULL) return q;
1.26 HeapWord* n = q + _sp->block_size(q);
1.27 // In the normal case, where the query "addr" is a card boundary, and the
1.28 // offset table chunks are the same size as cards, the block starting at
