--- a/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp	Tue Dec 20 00:55:02 2011 -0800
+++ b/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp	Wed Dec 07 11:35:03 2011 +0100
@@ -1160,7 +1160,7 @@
   Address rcx_amh_conversion( rcx_recv, java_lang_invoke_AdapterMethodHandle::conversion_offset_in_bytes() );
   Address vmarg;                // __ argument_address(vmargslot)
 
-  const int java_mirror_offset = klassOopDesc::klass_part_offset_in_bytes() + Klass::java_mirror_offset_in_bytes();
+  const int java_mirror_offset = in_bytes(Klass::java_mirror_offset());
 
   if (have_entry(ek)) {
     __ nop();                   // empty stubs make SG sick