src/hotspot/share/opto/macro.cpp

*** 45,57 ****
--- 45,61 ----
  #include "opto/rootnode.hpp"
  #include "opto/runtime.hpp"
  #include "opto/subnode.hpp"
  #include "opto/type.hpp"
  #include "runtime/sharedRuntime.hpp"
+ #include "utilities/macros.hpp"
  #if INCLUDE_G1GC
  #include "gc/g1/g1ThreadLocalData.hpp"
  #endif // INCLUDE_G1GC
+ #if INCLUDE_SHENANDOAHGC
+ #include "gc/shenandoah/c2/shenandoahBarrierSetC2.hpp"
+ #endif
  
  
  //
  // Replace any references to "oldref" in inputs to "use" with "newref".
  // Returns the number of replacements made.
*** 627,636 ****
--- 631,641 ----
          }
          for (DUIterator_Fast kmax, k = use->fast_outs(kmax);
                                     k < kmax && can_eliminate; k++) {
            Node* n = use->fast_out(k);
            if (!n->is_Store() && n->Opcode() != Op_CastP2X &&
+               SHENANDOAHGC_ONLY((!UseShenandoahGC || !ShenandoahBarrierSetC2::is_shenandoah_wb_pre_call(n)) &&)
                !(n->is_ArrayCopy() &&
                  n->as_ArrayCopy()->is_clonebasic() &&
                  n->in(ArrayCopyNode::Dest) == use)) {
              DEBUG_ONLY(disq_node = n;)
              if (n->is_Load() || n->is_LoadStore()) {