*** old/src/share/vm/oops/oop.hpp	Thu Aug 15 09:54:05 2013
--- new/src/share/vm/oops/oop.hpp	Thu Aug 15 09:54:04 2013

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 1997, 2013, 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.

*** 60,70 ****
--- 60,70 ----
    friend class VMStructs;
   private:
    volatile markOop  _mark;
    union _metadata {
      Klass*      _klass;
!     narrowOop       _compressed_klass;
!     narrowKlass _compressed_klass;
    } _metadata;
  
    // Fast access to barrier set.  Must be initialized.
    static BarrierSet* _bs;
  

*** 82,92 ****
--- 82,92 ----
    void init_mark();
  
    Klass* klass() const;
    Klass* klass_or_null() const volatile;
    Klass** klass_addr();
!   narrowOop* compressed_klass_addr();
!   narrowKlass* compressed_klass_addr();
  
    void set_klass(Klass* k);
  
    // For klass field compression
    int klass_gap() const;

*** 187,203 ****
--- 187,196 ----
    static oop atomic_compare_exchange_oop(oop exchange_value,
                                           volatile HeapWord *dest,
                                           oop compare_value,
                                           bool prebarrier = false);
  
    // klass encoding for klass pointer in objects.
    static narrowOop encode_klass_not_null(Klass* v);
    static narrowOop encode_klass(Klass* v);
  
    static Klass* decode_klass_not_null(narrowOop v);
    static Klass* decode_klass(narrowOop v);
  
    // Access to fields in a instanceOop through these methods.
    oop obj_field(int offset) const;
    volatile oop obj_field_volatile(int offset) const;
    void obj_field_put(int offset, oop value);
    void obj_field_put_raw(int offset, oop value);