OpenJDK / jdk / hs
changeset 46803:eae083666a41
Merge
| author | stefank |
|---|---|
| date | Fri, 11 Aug 2017 23:12:11 +0000 |
| parents | d8a818513b8c cf78889c7590 |
| children | 22196b3c7dfd 8b2c620d7092 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/share/vm/gc/g1/g1ConcurrentMark.inline.hpp Fri Aug 11 21:50:20 2017 +0000 +++ b/hotspot/src/share/vm/gc/g1/g1ConcurrentMark.inline.hpp Fri Aug 11 23:12:11 2017 +0000 @@ -47,7 +47,7 @@ } // Some callers may have stale objects to mark above nTAMS after humongous reclaim. - assert(obj->is_oop(true /* ignore mark word */), "Address " PTR_FORMAT " to mark is not an oop", p2i(obj)); + // Can't assert that this is a valid object at this point, since it might be in the process of being copied by another thread. assert(!hr->is_continues_humongous(), "Should not try to mark object " PTR_FORMAT " in Humongous continues region %u above nTAMS " PTR_FORMAT, p2i(obj), hr->hrm_index(), p2i(hr->next_top_at_mark_start())); HeapWord* const obj_addr = (HeapWord*)obj;