*** old/agent/src/share/classes/sun/jvm/hotspot/oops/OopUtilities.java	Tue Mar  8 20:17:49 2011
--- new/agent/src/share/classes/sun/jvm/hotspot/oops/OopUtilities.java	Tue Mar  8 20:17:49 2011

*** 272,288 ****
--- 272,282 ----
    private static void initClassFields() {
      if (hcKlassField == null) {
         // hc_klass is a HotSpot magic field and hence we can't
         // find it from InstanceKlass for java.lang.Class.
         TypeDataBase db = VM.getVM().getTypeDataBase();
!        int hcKlassOffset = (int) Instance.getHeaderSize();
         try {
            hcKlassOffset += (db.lookupIntConstant("java_lang_Class::hc_klass_offset").intValue() *
                             VM.getVM().getHeapOopSize());
         } catch (RuntimeException re) {
            // ignore, currently java_lang_Class::hc_klass_offset is zero
         }
!        int hcKlassOffset = (int) db.lookupType("java_lang_Class").getCIntegerField("klass_offset").getValue();
         if (VM.getVM().isCompressedOopsEnabled()) {
           hcKlassField = new NarrowOopField(new NamedFieldIdentifier("hc_klass"), hcKlassOffset, true);
         } else {
           hcKlassField = new OopField(new NamedFieldIdentifier("hc_klass"), hcKlassOffset, true);
         }