*** old/src/cpu/x86/vm/templateInterpreter_x86_64.cpp	Tue Dec 13 20:05:40 2011
--- new/src/cpu/x86/vm/templateInterpreter_x86_64.cpp	Tue Dec 13 20:05:40 2011

*** 503,514 ****
--- 503,513 ----
    }
  #endif // ASSERT
  
    // get synchronization object
    {
!     const int mirror_offset = klassOopDesc::klass_part_offset_in_bytes() +
                                Klass::java_mirror_offset_in_bytes();
!     const int mirror_offset = in_bytes(Klass::java_mirror_offset());
      Label done;
      __ movl(rax, access_flags);
      __ testl(rax, JVM_ACC_STATIC);
      // get receiver (assume this is frequent case)
      __ movptr(rax, Address(r14, Interpreter::local_offset_in_bytes(0)));

*** 1004,1015 ****
--- 1003,1013 ----
              rax);
  
    // pass mirror handle if static call
    {
      Label L;
!     const int mirror_offset = klassOopDesc::klass_part_offset_in_bytes() +
                                Klass::java_mirror_offset_in_bytes();
!     const int mirror_offset = in_bytes(Klass::java_mirror_offset());
      __ movl(t, Address(method, methodOopDesc::access_flags_offset()));
      __ testl(t, JVM_ACC_STATIC);
      __ jcc(Assembler::zero, L);
      // get mirror
      __ movptr(t, Address(method, methodOopDesc::constants_offset()));