# HG changeset patch
# User stefank
# Date 1502492329 0
# Node ID cf78889c75903190575efb98ad95cf9de57fac56
# Parent  ec791efbdecf893529017c9c76f7f9aa4d38d522# Parent  4a0c196dd796a918845f7fe7bce166e0d6d26cfa
Merge

diff -r ec791efbdecf -r cf78889c7590 hotspot/src/share/vm/gc/g1/g1ConcurrentMark.inline.hpp
--- a/hotspot/src/share/vm/gc/g1/g1ConcurrentMark.inline.hpp	Fri Aug 11 16:29:00 2017 -0400
+++ b/hotspot/src/share/vm/gc/g1/g1ConcurrentMark.inline.hpp	Fri Aug 11 22:58:49 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;