Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/gc_implementation/g1/g1OopClosures.hpp	Wed Jun 08 15:31:51 2011 -0400
     1.2 +++ b/src/share/vm/gc_implementation/g1/g1OopClosures.hpp	Wed Jun 08 21:48:38 2011 -0400
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -40,7 +40,7 @@
    1.11  protected:
    1.12    HeapRegion* _from;
    1.13  public:
    1.14 -  virtual void set_region(HeapRegion* from) { _from = from; }
    1.15 +  void set_region(HeapRegion* from) { _from = from; }
    1.16  };
    1.17  
    1.18  class G1ParClosureSuper : public OopsInHeapRegionClosure {
    1.19 @@ -161,44 +161,6 @@
    1.20    bool do_header() { return false; }
    1.21  };
    1.22  
    1.23 -class FilterInHeapRegionAndIntoCSClosure : public OopsInHeapRegionClosure {
    1.24 -  G1CollectedHeap* _g1;
    1.25 -  OopsInHeapRegionClosure* _oc;
    1.26 -public:
    1.27 -  FilterInHeapRegionAndIntoCSClosure(G1CollectedHeap* g1,
    1.28 -                                     OopsInHeapRegionClosure* oc) :
    1.29 -    _g1(g1), _oc(oc)
    1.30 -  {}
    1.31 -  template <class T> void do_oop_nv(T* p);
    1.32 -  virtual void do_oop(oop* p) { do_oop_nv(p); }
    1.33 -  virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
    1.34 -  bool apply_to_weak_ref_discovered_field() { return true; }
    1.35 -  bool do_header() { return false; }
    1.36 -  void set_region(HeapRegion* from) {
    1.37 -    _oc->set_region(from);
    1.38 -  }
    1.39 -};
    1.40 -
    1.41 -class FilterAndMarkInHeapRegionAndIntoCSClosure : public OopsInHeapRegionClosure {
    1.42 -  G1CollectedHeap* _g1;
    1.43 -  ConcurrentMark* _cm;
    1.44 -  OopsInHeapRegionClosure* _oc;
    1.45 -public:
    1.46 -  FilterAndMarkInHeapRegionAndIntoCSClosure(G1CollectedHeap* g1,
    1.47 -                                            OopsInHeapRegionClosure* oc,
    1.48 -                                            ConcurrentMark* cm)
    1.49 -  : _g1(g1), _oc(oc), _cm(cm) { }
    1.50 -
    1.51 -  template <class T> void do_oop_nv(T* p);
    1.52 -  virtual void do_oop(oop* p) { do_oop_nv(p); }
    1.53 -  virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
    1.54 -  bool apply_to_weak_ref_discovered_field() { return true; }
    1.55 -  bool do_header() { return false; }
    1.56 -  void set_region(HeapRegion* from) {
    1.57 -    _oc->set_region(from);
    1.58 -  }
    1.59 -};
    1.60 -
    1.61  class FilterOutOfRegionClosure: public OopClosure {
    1.62    HeapWord* _r_bottom;
    1.63    HeapWord* _r_end;