*** old/src/share/vm/classfile/javaClasses.hpp	Mon May 19 21:13:18 2008
--- new/src/share/vm/classfile/javaClasses.hpp	Mon May 19 21:13:18 2008

*** 651,660 ****
--- 651,661 ----
   private:
    enum {
     hc_value_offset = 0
    };
    static int value_offset;
+   static int long_value_offset;
  
    static oop initialize_and_allocate(BasicType type, TRAPS);
   public:
    // Allocation. Returns a boxed value, or NULL for invalid type.
    static oop create(BasicType type, jvalue* value, TRAPS);

*** 663,673 ****
--- 664,677 ----
    static BasicType set_value(oop box, jvalue* value);
    static BasicType basic_type(oop box);
    static bool is_instance(oop box)                 { return basic_type(box) != T_ILLEGAL; }
    static bool is_instance(oop box, BasicType type) { return basic_type(box) == type; }
  
!   static int value_offset_in_bytes() { return value_offset; }
!   static int value_offset_in_bytes(BasicType type) {
+     return ( type == T_LONG || type == T_DOUBLE ) ? long_value_offset :
+                                                     value_offset;
+   }
  
    // Debugging
    friend class JavaClasses;
  };
  

*** 745,755 ****
--- 749,759 ----
  
  class java_lang_ref_SoftReference: public java_lang_ref_Reference {
   public:
    enum {
     // The timestamp is a long field and may need to be adjusted for alignment.
!    hc_timestamp_offset    = align_object_offset_(hc_discovered_offset + 1)
!    hc_timestamp_offset  = hc_discovered_offset + 1
    };
    enum {
     hc_static_clock_offset = 0
    };