--- a/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp	Tue Oct 09 16:09:31 2012 -0700
+++ b/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp	Thu Oct 11 18:21:01 2012 +0200
@@ -976,14 +976,13 @@
         break;
       case T_METADATA:  __ ld_ptr(base, offset, to_reg->as_register()); break;
       case T_ADDRESS:
-        if (offset == oopDesc::klass_offset_in_bytes()) {
+#ifdef _LP64
+        if (offset == oopDesc::klass_offset_in_bytes() && UseCompressedKlassPointers) {
           __ lduw(base, offset, to_reg->as_register());
-#ifdef _LP64
-          if (UseCompressedKlassPointers) {
-            __ decode_klass_not_null(to_reg->as_register());
-          }
+          __ decode_klass_not_null(to_reg->as_register());
+        } else
 #endif
-        } else {
+        {
           __ ld_ptr(base, offset, to_reg->as_register());
         }
         break;