src/hotspot/share/opto/memnode.cpp

*** 47,59 ****
  #include "opto/rootnode.hpp"
  #include "utilities/align.hpp"
  #include "utilities/copy.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/vmError.hpp"
- #if INCLUDE_ZGC
- #include "gc/z/c2/zBarrierSetC2.hpp"
- #endif
  
  // Portions of code courtesy of Clifford Click
  
  // Optimization - Graph Style
  
--- 47,56 ----
*** 2849,2859 ****
  //----------------------------------LoadStoreNode------------------------------
  LoadStoreNode::LoadStoreNode( Node *c, Node *mem, Node *adr, Node *val, const TypePtr* at, const Type* rt, uint required )
    : Node(required),
      _type(rt),
      _adr_type(at),
!     _has_barrier(false)
  {
    init_req(MemNode::Control, c  );
    init_req(MemNode::Memory , mem);
    init_req(MemNode::Address, adr);
    init_req(MemNode::ValueIn, val);
--- 2846,2856 ----
  //----------------------------------LoadStoreNode------------------------------
  LoadStoreNode::LoadStoreNode( Node *c, Node *mem, Node *adr, Node *val, const TypePtr* at, const Type* rt, uint required )
    : Node(required),
      _type(rt),
      _adr_type(at),
!     _barrier(0)
  {
    init_req(MemNode::Control, c  );
    init_req(MemNode::Memory , mem);
    init_req(MemNode::Address, adr);
    init_req(MemNode::ValueIn, val);