src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp

*** 3477,3487 ****
        scratch = op->scratch_opr()->as_register();
      }
      assert(BasicLock::displaced_header_offset_in_bytes() == 0, "lock_reg must point to the displaced header");
      __ resolve(ACCESS_READ | ACCESS_WRITE, obj);
      // add debug info for NullPointerException only if one is possible
!     int null_check_offset = __ lock_object(hdr, obj, lock, scratch, *op->stub()->entry());
      if (op->info() != NULL) {
        add_debug_info_for_null_check(null_check_offset, op->info());
      }
      // done
    } else if (op->code() == lir_unlock) {
--- 3477,3488 ----
        scratch = op->scratch_opr()->as_register();
      }
      assert(BasicLock::displaced_header_offset_in_bytes() == 0, "lock_reg must point to the displaced header");
      __ resolve(ACCESS_READ | ACCESS_WRITE, obj);
      // add debug info for NullPointerException only if one is possible
!     bool check_always_locked = (op->throw_imse_stub() != NULL);
!     int null_check_offset = __ lock_object(hdr, obj, lock, scratch, *op->stub()->entry(), check_always_locked);
      if (op->info() != NULL) {
        add_debug_info_for_null_check(null_check_offset, op->info());
      }
      // done
    } else if (op->code() == lir_unlock) {