src/hotspot/share/c1/c1_LIR.cpp

@@ -888,10 +888,11 @@
        LIR_OpLoadKlass* opLoadKlass = op->as_OpLoadKlass();
        assert(opLoadKlass != nullptr, "must be");
  
        do_input(opLoadKlass->_obj);
        do_output(opLoadKlass->_result);
+       if (opLoadKlass->_stub) do_stub(opLoadKlass->_stub);
        if (opLoadKlass->_info) do_info(opLoadKlass->_info);
        break;
      }
  
  

@@ -1068,10 +1069,13 @@
    }
  }
  
  void LIR_OpLoadKlass::emit_code(LIR_Assembler* masm) {
    masm->emit_load_klass(this);
+   if (stub()) {
+     masm->append_code_stub(stub());
+   }
  }
  
  #ifdef ASSERT
  void LIR_OpAssert::emit_code(LIR_Assembler* masm) {
    masm->emit_assert(this);

@@ -2044,10 +2048,13 @@
  }
  
  void LIR_OpLoadKlass::print_instr(outputStream* out) const {
    obj()->print(out);        out->print(" ");
    result_opr()->print(out); out->print(" ");
+   if (stub()) {
+     out->print("[lbl:" INTPTR_FORMAT "]", p2i(stub()->entry()));
+   }
  }
  
  #ifdef ASSERT
  void LIR_OpAssert::print_instr(outputStream* out) const {
    print_condition(out, condition()); out->print(" ");