Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/oops/instanceOop.hpp	Wed May 21 13:46:23 2008 -0700
     1.2 +++ b/src/share/vm/oops/instanceOop.hpp	Wed May 21 16:31:35 2008 -0700
     1.3 @@ -39,14 +39,7 @@
     1.4  
     1.5    static bool contains_field_offset(int offset, int nonstatic_field_size) {
     1.6      int base_in_bytes = base_offset_in_bytes();
     1.7 -    if (UseCompressedOops) {
     1.8 -      return (offset >= base_in_bytes &&
     1.9 -              // field can be embedded in header, or is after header.
    1.10 -              (offset < (int)sizeof(instanceOopDesc) ||
    1.11 -              (offset-(int)sizeof(instanceOopDesc))/wordSize < nonstatic_field_size));
    1.12 -    } else {
    1.13 -      return (offset >= base_in_bytes &&
    1.14 -              (offset-base_in_bytes)/wordSize < nonstatic_field_size);
    1.15 -    }
    1.16 +    return (offset >= base_in_bytes &&
    1.17 +            (offset-base_in_bytes) < nonstatic_field_size * heapOopSize);
    1.18    }
    1.19  };