src/cpu/x86/vm/c1_CodeStubs_x86.cpp

*** 414,424 ****
    assert(_patch_info_offset == (patch_info_pc - __ pc()), "must not change");
    ce->add_call_info_here(_info);
    int jmp_off = __ offset();
    __ jmp(_patch_site_entry);
    // Add enough nops so deoptimization can overwrite the jmp above with a call
!   // and not destroy the world.
    for (int j = __ offset() ; j < jmp_off + 5 ; j++ ) {
      __ nop();
    }
    if (_id == load_klass_id || _id == load_mirror_id || _id == load_appendix_id) {
      CodeSection* cs = __ code_section();
--- 414,425 ----
    assert(_patch_info_offset == (patch_info_pc - __ pc()), "must not change");
    ce->add_call_info_here(_info);
    int jmp_off = __ offset();
    __ jmp(_patch_site_entry);
    // Add enough nops so deoptimization can overwrite the jmp above with a call
!   // and not destroy the world. We cannot use fat nops here, since the concurrent
!   // code rewrite may transiently create the illegal instruction sequence.
    for (int j = __ offset() ; j < jmp_off + 5 ; j++ ) {
      __ nop();
    }
    if (_id == load_klass_id || _id == load_mirror_id || _id == load_appendix_id) {
      CodeSection* cs = __ code_section();