hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java

rev 611 : Merge

*** 1,7 ****
  /*
!  * Copyright 2000-2007 Sun Microsystems, Inc.  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.
--- 1,7 ----
  /*
!  * Copyright 2000-2008 Sun Microsystems, Inc.  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.
*** 465,475 ****
      TypeArray fields = getFields();
      int length = (int) fields.getLength();
      for (int index = 0; index < length; index += NEXT_OFFSET) {
        short accessFlags    = fields.getShortAt(index + ACCESS_FLAGS_OFFSET);
        short signatureIndex = fields.getShortAt(index + SIGNATURE_INDEX_OFFSET);
-             
        FieldType   type   = new FieldType((Symbol) getConstants().getObjAt(signatureIndex));
        AccessFlags access = new AccessFlags(accessFlags);
        if (access.isStatic()) {
          visitField(visitor, type, index);
        }
--- 465,474 ----
*** 788,799 ****
--- 787,802 ----
    private Field newField(int index) {
      TypeArray fields = getFields();
      short signatureIndex = fields.getShortAt(index + SIGNATURE_INDEX_OFFSET);
      FieldType type = new FieldType((Symbol) getConstants().getObjAt(signatureIndex));
      if (type.isOop()) {
+      if (VM.getVM().isCompressedOopsEnabled()) {
+         return new NarrowOopField(this, index);
+      } else {
          return new OopField(this, index);
       }
+     }
      if (type.isByte()) {
        return new ByteField(this, index);
      }
      if (type.isChar()) {
        return new CharField(this, index);