*** old/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java	Fri Mar 18 14:59:15 2011
--- new/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java	Fri Mar 18 14:59:15 2011

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 85,95 ****
--- 85,95 ----
      sourceFileName       = type.getAddressField("_source_file_name");
      sourceDebugExtension = type.getAddressField("_source_debug_extension");
      innerClasses         = new OopField(type.getOopField("_inner_classes"), Oop.getHeaderSize());
      nonstaticFieldSize   = new CIntField(type.getCIntegerField("_nonstatic_field_size"), Oop.getHeaderSize());
      staticFieldSize      = new CIntField(type.getCIntegerField("_static_field_size"), Oop.getHeaderSize());
!     staticOopFieldSize   = new CIntField(type.getCIntegerField("_static_oop_field_size"), Oop.getHeaderSize());
!     staticOopFieldCount   = new CIntField(type.getCIntegerField("_static_oop_field_count"), Oop.getHeaderSize());
      nonstaticOopMapSize  = new CIntField(type.getCIntegerField("_nonstatic_oop_map_size"), Oop.getHeaderSize());
      isMarkedDependent    = new CIntField(type.getCIntegerField("_is_marked_dependent"), Oop.getHeaderSize());
      initState            = new CIntField(type.getCIntegerField("_init_state"), Oop.getHeaderSize());
      vtableLen            = new CIntField(type.getCIntegerField("_vtable_len"), Oop.getHeaderSize());
      itableLen            = new CIntField(type.getCIntegerField("_itable_len"), Oop.getHeaderSize());

*** 138,148 ****
--- 138,148 ----
    private static AddressField  sourceFileName;
    private static AddressField  sourceDebugExtension;
    private static OopField  innerClasses;
    private static CIntField nonstaticFieldSize;
    private static CIntField staticFieldSize;
!   private static CIntField staticOopFieldSize;
!   private static CIntField staticOopFieldCount;
    private static CIntField nonstaticOopMapSize;
    private static CIntField isMarkedDependent;
    private static CIntField initState;
    private static CIntField vtableLen;
    private static CIntField itableLen;

*** 259,270 ****
--- 259,269 ----
    public ObjArray  getSigners()             { return (ObjArray)     signers.getValue(this); }
    public Symbol    getSourceFileName()      { return getSymbol(sourceFileName); }
    public Symbol    getSourceDebugExtension(){ return getSymbol(sourceDebugExtension); }
    public TypeArray getInnerClasses()        { return (TypeArray)    innerClasses.getValue(this); }
    public long      getNonstaticFieldSize()  { return                nonstaticFieldSize.getValue(this); }
!   public long      getStaticFieldSize()     { return                staticFieldSize.getValue(this); }
    public long      getStaticOopFieldSize()  { return                staticOopFieldSize.getValue(this); }
!   public long      getStaticOopFieldCount() { return                staticOopFieldCount.getValue(this); }
    public long      getNonstaticOopMapSize() { return                nonstaticOopMapSize.getValue(this); }
    public boolean   getIsMarkedDependent()   { return                isMarkedDependent.getValue(this) != 0; }
    public long      getVtableLen()           { return                vtableLen.getValue(this); }
    public long      getItableLen()           { return                itableLen.getValue(this); }
    public Symbol    getGenericSignature()    { return getSymbol(genericSignature); }

*** 451,461 ****
--- 450,460 ----
        visitor.doOop(protectionDomain, true);
        visitor.doOop(signers, true);
        visitor.doOop(innerClasses, true);
        visitor.doCInt(nonstaticFieldSize, true);
        visitor.doCInt(staticFieldSize, true);
!       visitor.doCInt(staticOopFieldSize, true);
!       visitor.doCInt(staticOopFieldCount, true);
        visitor.doCInt(nonstaticOopMapSize, true);
        visitor.doCInt(isMarkedDependent, true);
        visitor.doCInt(initState, true);
        visitor.doCInt(vtableLen, true);
        visitor.doCInt(itableLen, true);

*** 690,700 ****
--- 689,699 ----
  
  
    public long getObjectSize() {
      long bodySize =    alignObjectOffset(getVtableLen() * getHeap().getOopSize())
                       + alignObjectOffset(getItableLen() * getHeap().getOopSize())
-                      + (getStaticFieldSize() + getNonstaticOopMapSize()) * getHeap().getOopSize();
      return alignObjectSize(headerSize + bodySize);
    }
  
    public Klass arrayKlassImpl(boolean orNull, int n) {
      // FIXME: in reflective system this would need to change to