Mercurial > hg > graal-jvmci-8
diff src/share/vm/oops/instanceOop.hpp @ 344:6aae2f9d0294
Merge
author | ysr |
---|---|
date | Thu, 12 Jun 2008 13:50:55 -0700 |
parents | 437d03ea40b1 |
children | d1605aabd0a1 |
line wrap: on
line diff
--- a/src/share/vm/oops/instanceOop.hpp Thu Jun 05 15:57:56 2008 -0700 +++ b/src/share/vm/oops/instanceOop.hpp Thu Jun 12 13:50:55 2008 -0700 @@ -39,14 +39,7 @@ static bool contains_field_offset(int offset, int nonstatic_field_size) { int base_in_bytes = base_offset_in_bytes(); - if (UseCompressedOops) { - return (offset >= base_in_bytes && - // field can be embedded in header, or is after header. - (offset < (int)sizeof(instanceOopDesc) || - (offset-(int)sizeof(instanceOopDesc))/wordSize < nonstatic_field_size)); - } else { - return (offset >= base_in_bytes && - (offset-base_in_bytes)/wordSize < nonstatic_field_size); - } + return (offset >= base_in_bytes && + (offset-base_in_bytes) < nonstatic_field_size * heapOopSize); } };