*** old/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp	Thu Apr 24 15:52:59 2014
--- new/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp	Thu Apr 24 15:52:58 2014

*** 146,156 ****
--- 146,156 ----
  }
  
  
  void C1_MacroAssembler::initialize_header(Register obj, Register klass, Register len, Register t1, Register t2) {
    assert_different_registers(obj, klass, len);
!   if (UseBiasedLocking && !len->is_valid()) {
!   if (UseBiasedLocking && !len.is_valid()) {
      assert_different_registers(obj, klass, len, t1, t2);
      movptr(t1, Address(klass, Klass::prototype_header_offset()));
      movptr(Address(obj, oopDesc::mark_offset_in_bytes()), t1);
    } else {
      // This assumes that all prototype bits fit in an int32_t

*** 165,175 ****
--- 165,175 ----
  #endif
    {
      movptr(Address(obj, oopDesc::klass_offset_in_bytes()), klass);
    }
  
!   if (len->is_valid()) {
!   if (len.is_valid()) {
      movl(Address(obj, arrayOopDesc::length_offset_in_bytes()), len);
    }
  #ifdef _LP64
    else if (UseCompressedClassPointers) {
      xorptr(t1, t1);