*** old/src/share/vm/oops/instanceOop.hpp	Mon May 19 21:13:26 2008
--- new/src/share/vm/oops/instanceOop.hpp	Mon May 19 21:13:26 2008

*** 37,52 ****
--- 37,45 ----
               sizeof(instanceOopDesc);
    }
  
    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);
+             (offset-base_in_bytes) < nonstatic_field_size * heapOopSize);
    }
    }
  };