1.1 --- a/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp Mon Mar 04 22:39:00 2013 -0800
1.2 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp Tue Mar 05 15:36:56 2013 -0800
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -252,12 +252,10 @@
1.11
1.12 start_offset = _bm.get_next_one_offset(start_offset, end_offset);
1.13 while (start_offset < end_offset) {
1.14 - HeapWord* obj_addr = offsetToHeapWord(start_offset);
1.15 - oop obj = (oop) obj_addr;
1.16 if (!cl->do_bit(start_offset)) {
1.17 return false;
1.18 }
1.19 - HeapWord* next_addr = MIN2(obj_addr + obj->size(), end_addr);
1.20 + HeapWord* next_addr = MIN2(nextObject(offsetToHeapWord(start_offset)), end_addr);
1.21 BitMap::idx_t next_offset = heapWordToOffset(next_addr);
1.22 start_offset = _bm.get_next_one_offset(next_offset, end_offset);
1.23 }
