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

*** 509,519 ****
--- 509,519 ----
  
      // Allocate initial monitor and pre initialize it
      // get synchronization object
  
      Label done;
!     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(rax, access_flags);
      __ testl(rax, JVM_ACC_STATIC);
      __ movptr(rax, Address(locals, 0));                   // get receiver (assume this is frequent case)
      __ jcc(Assembler::zero, done);
      __ movptr(rax, Address(rbx, methodOopDesc::constants_offset()));

*** 761,771 ****
--- 761,771 ----
      __ bind(L);
    }
  #endif // ASSERT
    // get synchronization object
    { Label done;
!     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(rax, access_flags);
      __ movptr(rdi, STATE(_locals));                                     // prepare to get receiver (assume common case)
      __ testl(rax, JVM_ACC_STATIC);
      __ movptr(rax, Address(rdi, 0));                                    // get receiver (assume this is frequent case)
      __ jcc(Assembler::zero, done);

*** 1178,1188 ****
--- 1178,1188 ----
      __ bind(L);
    }
  
    // 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()));