src/hotspot/share/gc/shared/c2/barrierSetC2.hpp

*** 201,222 ****
      Parsing,
      Optimization,
      Expansion
    };
    virtual bool array_copy_requires_gc_barriers(bool tightly_coupled_alloc, BasicType type, bool is_clone, ArrayCopyPhase phase) const { return false; }
  
    // Support for GC barriers emitted during parsing
    virtual bool has_load_barriers() const { return false; }
    virtual bool is_gc_barrier_node(Node* node) const { return false; }
    virtual Node* step_over_gc_barrier(Node* c) const { return c; }
  
    // Support for macro expanded GC barriers
    virtual void register_potential_barrier_node(Node* node) const { }
    virtual void unregister_potential_barrier_node(Node* node) const { }
    virtual void eliminate_gc_barrier(PhaseMacroExpand* macro, Node* node) const { }
!   virtual void enqueue_useful_gc_barrier(Unique_Node_List &worklist, Node* node) const {}
!   virtual void eliminate_useless_gc_barriers(Unique_Node_List &useful) const {}
    virtual void add_users_to_worklist(Unique_Node_List* worklist) const {}
  
    // Allow barrier sets to have shared state that is preserved across a compilation unit.
    // This could for example comprise macro nodes to be expanded during macro expansion.
    virtual void* create_barrier_state(Arena* comp_arena) const { return NULL; }
--- 201,224 ----
      Parsing,
      Optimization,
      Expansion
    };
    virtual bool array_copy_requires_gc_barriers(bool tightly_coupled_alloc, BasicType type, bool is_clone, ArrayCopyPhase phase) const { return false; }
+   virtual Node* array_copy_load_store_barrier(PhaseGVN *phase, bool can_reshape, Node* v, MergeMemNode* mem, Node*& ctl) const { return v; }
+   virtual void array_copy_post_barrier_at_expansion(ArrayCopyNode* ac, Node*& c, Node*& m, PhaseIterGVN& igvn) const { }
  
    // Support for GC barriers emitted during parsing
    virtual bool has_load_barriers() const { return false; }
    virtual bool is_gc_barrier_node(Node* node) const { return false; }
    virtual Node* step_over_gc_barrier(Node* c) const { return c; }
  
    // Support for macro expanded GC barriers
    virtual void register_potential_barrier_node(Node* node) const { }
    virtual void unregister_potential_barrier_node(Node* node) const { }
    virtual void eliminate_gc_barrier(PhaseMacroExpand* macro, Node* node) const { }
!   virtual void enqueue_useful_gc_barrier(PhaseIterGVN* igvn, Node* node) const {}
!   virtual void eliminate_useless_gc_barriers(Unique_Node_List &useful, Compile* C) const {}
    virtual void add_users_to_worklist(Unique_Node_List* worklist) const {}
  
    // Allow barrier sets to have shared state that is preserved across a compilation unit.
    // This could for example comprise macro nodes to be expanded during macro expansion.
    virtual void* create_barrier_state(Arena* comp_arena) const { return NULL; }