Mercurial > hg > truffle
changeset 9094:6194aefabf1a
weakened assertion in unsafe.cpp for GRAAL builds such that non-GRAAL builds still work
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Fri, 12 Apr 2013 21:41:34 +0200 |
| parents | cd22923e7ca7 |
| children | d538dce8f403 |
| files | src/share/vm/prims/unsafe.cpp |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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");