# HG changeset patch # User jwilhelm # Date 1395677654 25200 # Node ID 6e7e363c5a8fbc2348300fe275c0a977234c36d5 # Parent ac767c227ea20bbc466df2740c87f1c188fae915# Parent fd54db8eb0df3652c5a4bf4db4c20cbc7a469d80 Merge diff -r ac767c227ea2 -r 6e7e363c5a8f src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp --- a/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp Mon Mar 24 08:05:53 2014 -0700 +++ b/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp Mon Mar 24 09:14:14 2014 -0700 @@ -139,11 +139,6 @@ return true; } } - // No object starts in this slice; verify this using - // more traditional methods: Note that no object can - // start before the start_addr. - assert(end_addr == start_addr || - object_start(end_addr - 1) <= start_addr, - "Oops an object does start in this slice?"); + return false; }