src/hotspot/share/gc/shared/collectedHeap.inline.hpp

@@ -58,16 +58,11 @@
 void CollectedHeap::post_allocation_setup_no_klass_install(Klass* klass,
                                                            HeapWord* obj_ptr) {
   oop obj = (oop)obj_ptr;
 
   assert(obj != NULL, "NULL object pointer");
-  if (UseBiasedLocking && (klass != NULL)) {
-    obj->set_mark(klass->prototype_header());
-  } else {
-    // May be bootstrapping
-    obj->set_mark(markOopDesc::prototype());
-  }
+  obj->set_mark(Klass::default_prototype_header(klass));
 }
 
 // Support for jvmti and dtrace
 inline void post_allocation_notify(Klass* klass, oop obj, int size) {
   // support low memory notifications (no-op if not enabled)