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

*** 82,19 ***
    static const TypeFunc* write_ref_field_pre_entry_Type();
    static const TypeFunc* write_ref_field_post_entry_Type();
  
    virtual Node* load_at_resolved(C2Access& access, const Type* val_type) const;
  
! #ifdef ASSERT
-   bool has_cas_in_use_chain(Node* x) const;
-   void verify_pre_load(Node* marking_check_if, Unique_Node_List& loads /*output*/) const;
-   void verify_no_safepoints(Compile* compile, Node* marking_load, const Unique_Node_List& loads) const;
- #endif
- 
- public:
    virtual bool is_gc_barrier_node(Node* node) const;
!   virtual void eliminate_gc_barrier(PhaseMacroExpand* macro, Node* node) const;
    virtual Node* step_over_gc_barrier(Node* c) const;
  
  #ifdef ASSERT
    virtual void verify_gc_barriers(Compile* compile, CompilePhase phase) const;
  #endif
--- 82,13 ---
    static const TypeFunc* write_ref_field_pre_entry_Type();
    static const TypeFunc* write_ref_field_post_entry_Type();
  
    virtual Node* load_at_resolved(C2Access& access, const Type* val_type) const;
  
!  public:
    virtual bool is_gc_barrier_node(Node* node) const;
!   virtual void eliminate_gc_barrier(PhaseIterGVN* igvn, Node* node) const;
    virtual Node* step_over_gc_barrier(Node* c) const;
  
  #ifdef ASSERT
    virtual void verify_gc_barriers(Compile* compile, CompilePhase phase) const;
  #endif