src/hotspot/share/c1/c1_LIR.hpp

*** 1916,17 ***
  class LIR_OpLoadKlass: public LIR_Op {
    friend class LIR_OpVisitState;
  
   private:
    LIR_Opr _obj;
   public:
!   LIR_OpLoadKlass(LIR_Opr obj, LIR_Opr result, CodeEmitInfo* info)
      : LIR_Op(lir_load_klass, result, info)
      , _obj(obj)
!     {}
  
    LIR_Opr obj()        const { return _obj;  }
  
    virtual LIR_OpLoadKlass* as_OpLoadKlass() { return this; }
    virtual void emit_code(LIR_Assembler* masm);
    void print_instr(outputStream* out) const PRODUCT_RETURN;
  };
--- 1916,19 ---
  class LIR_OpLoadKlass: public LIR_Op {
    friend class LIR_OpVisitState;
  
   private:
    LIR_Opr _obj;
+   CodeStub* _stub;
   public:
!   LIR_OpLoadKlass(LIR_Opr obj, LIR_Opr result, CodeEmitInfo* info, CodeStub* stub)
      : LIR_Op(lir_load_klass, result, info)
      , _obj(obj)
!     , _stub(stub) {}
  
    LIR_Opr obj()        const { return _obj;  }
+   CodeStub* stub()     const { return _stub; }
  
    virtual LIR_OpLoadKlass* as_OpLoadKlass() { return this; }
    virtual void emit_code(LIR_Assembler* masm);
    void print_instr(outputStream* out) const PRODUCT_RETURN;
  };

*** 2395,11 ***
    }
  
    void xadd(LIR_Opr src, LIR_Opr add, LIR_Opr res, LIR_Opr tmp) { append(new LIR_Op2(lir_xadd, src, add, res, tmp)); }
    void xchg(LIR_Opr src, LIR_Opr set, LIR_Opr res, LIR_Opr tmp) { append(new LIR_Op2(lir_xchg, src, set, res, tmp)); }
  
!   void load_klass(LIR_Opr obj, LIR_Opr result, CodeEmitInfo* info) { append(new LIR_OpLoadKlass(obj, result, info)); }
  
  #ifdef ASSERT
    void lir_assert(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, const char* msg, bool halt) { append(new LIR_OpAssert(condition, opr1, opr2, msg, halt)); }
  #endif
  };
--- 2397,11 ---
    }
  
    void xadd(LIR_Opr src, LIR_Opr add, LIR_Opr res, LIR_Opr tmp) { append(new LIR_Op2(lir_xadd, src, add, res, tmp)); }
    void xchg(LIR_Opr src, LIR_Opr set, LIR_Opr res, LIR_Opr tmp) { append(new LIR_Op2(lir_xchg, src, set, res, tmp)); }
  
!   void load_klass(LIR_Opr obj, LIR_Opr result, CodeEmitInfo* info, CodeStub* stub) { append(new LIR_OpLoadKlass(obj, result, info, stub)); }
  
  #ifdef ASSERT
    void lir_assert(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, const char* msg, bool halt) { append(new LIR_OpAssert(condition, opr1, opr2, msg, halt)); }
  #endif
  };