--- old/src/cpu/x86/vm/stubGenerator_x86_32.cpp	2011-12-07 12:03:22.000000000 +0100
+++ new/src/cpu/x86/vm/stubGenerator_x86_32.cpp	2011-12-07 12:03:22.000000000 +0100
@@ -1374,8 +1374,7 @@
     //                                  L_success, L_failure, NULL);
     assert_different_registers(sub_klass, temp);
 
-    int sc_offset = (klassOopDesc::header_size() * HeapWordSize +
-                     Klass::secondary_super_cache_offset_in_bytes());
+    int sc_offset = Klass::secondary_super_cache_offset_in_bytes();
 
     // if the pointers are equal, we are done (e.g., String[] elements)
     __ cmpptr(sub_klass, super_klass_addr);
@@ -1787,8 +1786,7 @@
     //   array_tag: typeArray = 0x3, objArray = 0x2, non-array = 0x0
     //
 
-    int lh_offset = klassOopDesc::header_size() * HeapWordSize +
-                    Klass::layout_helper_offset_in_bytes();
+    int lh_offset = Klass::layout_helper_offset_in_bytes();
     Address src_klass_lh_addr(rcx_src_klass, lh_offset);
 
     // Handle objArrays completely differently...
@@ -1914,10 +1912,8 @@
     // live at this point:  rcx_src_klass, dst[_pos], src[_pos]
     {
       // Handy offsets:
-      int  ek_offset = (klassOopDesc::header_size() * HeapWordSize +
-                        objArrayKlass::element_klass_offset_in_bytes());
-      int sco_offset = (klassOopDesc::header_size() * HeapWordSize +
-                        Klass::super_check_offset_offset_in_bytes());
+      int  ek_offset = objArrayKlass::element_klass_offset_in_bytes();
+      int sco_offset = Klass::super_check_offset_offset_in_bytes();
 
       Register rsi_dst_klass = rsi;
       Register rdi_temp      = rdi;