--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp	Fri Aug 31 16:39:35 2012 -0700
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp	Sat Sep 01 13:25:18 2012 -0400
@@ -199,7 +199,6 @@
   assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
   MutableSpace* to_space = heap->young_gen()->to_space();
   MutableSpace* old_space = heap->old_gen()->object_space();
-  MutableSpace* perm_space = heap->perm_gen()->object_space();
 #endif /* ASSERT */
 
   OopStarTaskQueue* const tq = claimed_stack_depth();
@@ -318,11 +317,11 @@
     obj = obj->forwardee();
   }
 
-#ifdef DEBUG
+#ifndef PRODUCT
   if (TraceScavenge) {
     gclog_or_tty->print_cr("{%s %s 0x%x (%d)}",
                            "promotion-failure",
-                           obj->blueprint()->internal_name(),
+                           obj->klass()->internal_name(),
                            obj, obj->size());
 
   }