--- old/src/cpu/sparc/vm/templateTable_sparc.cpp	2016-01-22 15:20:55.962647889 +0100
+++ new/src/cpu/sparc/vm/templateTable_sparc.cpp	2016-01-22 15:20:55.862643773 +0100
@@ -3153,11 +3153,11 @@
   //
 
   // compute start of first itableOffsetEntry (which is at end of vtable)
-  const int base = in_bytes(InstanceKlass::vtable_start_offset());
+  const int base = in_bytes(Klass::vtable_start_offset());
   Label search;
   Register Rtemp = O1_flags;
 
-  __ ld(O2_Klass, in_bytes(InstanceKlass::vtable_length_offset()), Rtemp);
+  __ ld(O2_Klass, in_bytes(Klass::vtable_length_offset()), Rtemp);
   if (align_object_offset(1) > 1) {
     __ round_to(Rtemp, align_object_offset(1));
   }