# HG changeset patch # User Doug Simon # Date 1365795694 -7200 # Node ID 6194aefabf1a66fe5a7327aafc5f85ae280b3cd1 # Parent cd22923e7ca791a3c9abdf0311b9a2a8c4d8cdcc weakened assertion in unsafe.cpp for GRAAL builds such that non-GRAAL builds still work diff -r cd22923e7ca7 -r 6194aefabf1a src/share/vm/prims/unsafe.cpp --- a/src/share/vm/prims/unsafe.cpp Fri Apr 12 21:35:27 2013 +0200 +++ b/src/share/vm/prims/unsafe.cpp Fri Apr 12 21:41:34 2013 +0200 @@ -118,7 +118,9 @@ // Don't allow unsafe to be used to read or write the header word of oops // unless running GRAAL which wants to read the misc word for example when // interpreting computeHashCode(). - assert(p == NULL || field_offset >= oopDesc::header_size() || GRAAL, "offset must be outside of header"); +#ifndef GRAAL + assert(p == NULL || field_offset >= oopDesc::header_size(), "offset must be outside of header"); +#endif #ifdef ASSERT if (p != NULL) { assert(byte_offset >= 0 && byte_offset <= (jlong)MAX_OBJECT_SIZE, "sane offset");