src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp

*** 21,10 ***
--- 21,13 ---
   * questions.
   *
   */
  
  #include "classfile/javaClasses.hpp"
+ #if INCLUDE_CDS
+ #include "code/SCCache.hpp"
+ #endif
  #include "code/vmreg.inline.hpp"
  #include "gc/g1/c2/g1BarrierSetC2.hpp"
  #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1BarrierSetAssembler.hpp"
  #include "gc/g1/g1BarrierSetRuntime.hpp"

*** 593,11 ***
  void G1BarrierSetC2::emit_stubs(CodeBuffer& cb) const {
    MacroAssembler masm(&cb);
    GrowableArray<G1BarrierStubC2*>* const stubs = barrier_set_state()->stubs();
    for (int i = 0; i < stubs->length(); i++) {
      // Make sure there is enough space in the code buffer
!     if (cb.insts()->maybe_expand_to_ensure_remaining(PhaseOutput::MAX_inst_size) && cb.blob() == nullptr) {
        ciEnv::current()->record_failure("CodeCache is full");
        return;
      }
      stubs->at(i)->emit_code(masm);
    }
--- 596,11 ---
  void G1BarrierSetC2::emit_stubs(CodeBuffer& cb) const {
    MacroAssembler masm(&cb);
    GrowableArray<G1BarrierStubC2*>* const stubs = barrier_set_state()->stubs();
    for (int i = 0; i < stubs->length(); i++) {
      // Make sure there is enough space in the code buffer
!     if (cb.insts()->maybe_expand_to_ensure_remaining(PhaseOutput::max_inst_gcstub_size()) && cb.blob() == nullptr) {
        ciEnv::current()->record_failure("CodeCache is full");
        return;
      }
      stubs->at(i)->emit_code(masm);
    }