src/cpu/x86/vm/stubGenerator_x86_64.cpp

*** 40,49 ****
--- 40,52 ----
  #include "runtime/thread.inline.hpp"
  #include "utilities/top.hpp"
  #ifdef COMPILER2
  #include "opto/runtime.hpp"
  #endif
+ #if INCLUDE_ALL_GCS
+ #include "shenandoahBarrierSetAssembler_x86.hpp"
+ #endif
  
  // Declaration and definition of StubGenerator (no .hpp file).
  // For a more detailed description of the stub routine structure
  // see the comment in stubRoutines.hpp
  
*** 1181,1190 ****
--- 1184,1194 ----
    void  gen_write_ref_array_pre_barrier(Register addr, Register count, bool dest_uninitialized) {
      BarrierSet* bs = Universe::heap()->barrier_set();
      switch (bs->kind()) {
        case BarrierSet::G1SATBCT:
        case BarrierSet::G1SATBCTLogging:
+       case BarrierSet::ShenandoahBarrierSet:
          // With G1, don't generate the call if we statically know that the target in uninitialized
          if (!dest_uninitialized) {
             __ pusha();                      // push registers
             if (count == c_rarg0) {
               if (addr == c_rarg1) {
*** 1226,1235 ****
--- 1230,1240 ----
      assert_different_registers(start, count, scratch);
      BarrierSet* bs = Universe::heap()->barrier_set();
      switch (bs->kind()) {
        case BarrierSet::G1SATBCT:
        case BarrierSet::G1SATBCTLogging:
+       case BarrierSet::ShenandoahBarrierSet:
          {
            __ pusha();             // push registers (overkill)
            if (c_rarg0 == count) { // On win64 c_rarg0 == rcx
              assert_different_registers(c_rarg1, start);
              __ mov(c_rarg1, count);