jdk8-mips64-public/hotspot: changeset 5160:2138a2c14831

     1.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp	Fri May 17 09:10:04 2013 -0700
     1.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp	Sun May 19 20:31:30 2013 +0200
     1.3 @@ -485,10 +485,6 @@
     1.4      assert(!span.is_empty(), "Empty span could spell trouble");
     1.5    }
     1.6  
     1.7 -  void do_object(oop obj) {
     1.8 -    assert(false, "not to be invoked");
     1.9 -  }
    1.10 -
    1.11    bool do_object_b(oop obj);
    1.12  };
    1.13  
    1.14 @@ -1536,9 +1532,6 @@
    1.15      _bit_map(bit_map),
    1.16      _par_scan_closure(cl) { }
    1.17  
    1.18 -  void do_object(oop obj) {
    1.19 -    guarantee(false, "Call do_object_b(oop, MemRegion) instead");
    1.20 -  }
    1.21    bool do_object_b(oop obj) {
    1.22      guarantee(false, "Call do_object_b(oop, MemRegion) form instead");
    1.23      return false;

     2.1 --- a/src/share/vm/gc_implementation/g1/concurrentMark.hpp	Fri May 17 09:10:04 2013 -0700
     2.2 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.hpp	Sun May 19 20:31:30 2013 +0200
     2.3 @@ -44,9 +44,6 @@
     2.4   public:
     2.5    G1CMIsAliveClosure(G1CollectedHeap* g1) : _g1(g1) { }
     2.6  
     2.7 -  void do_object(oop obj) {
     2.8 -    ShouldNotCallThis();
     2.9 -  }
    2.10    bool do_object_b(oop obj);
    2.11  };
    2.12

     3.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Fri May 17 09:10:04 2013 -0700
     3.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Sun May 19 20:31:30 2013 +0200
     3.3 @@ -5090,7 +5090,6 @@
     3.4    G1CollectedHeap* _g1;
     3.5  public:
     3.6    G1AlwaysAliveClosure(G1CollectedHeap* g1) : _g1(g1) {}
     3.7 -  void do_object(oop p) { assert(false, "Do not call."); }
     3.8    bool do_object_b(oop p) {
     3.9      if (p != NULL) {
    3.10        return true;

     4.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Fri May 17 09:10:04 2013 -0700
     4.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Sun May 19 20:31:30 2013 +0200
     4.3 @@ -165,7 +165,6 @@
     4.4    G1CollectedHeap* _g1;
     4.5  public:
     4.6    G1STWIsAliveClosure(G1CollectedHeap* g1) : _g1(g1) {}
     4.7 -  void do_object(oop p) { assert(false, "Do not call."); }
     4.8    bool do_object_b(oop p);
     4.9  };
    4.10

     5.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	Fri May 17 09:10:04 2013 -0700
     5.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	Sun May 19 20:31:30 2013 +0200
     5.3 @@ -580,7 +580,6 @@
     5.4  // This should be moved to the shared markSweep code!
     5.5  class PSAlwaysTrueClosure: public BoolObjectClosure {
     5.6  public:
     5.7 -  void do_object(oop p) { ShouldNotReachHere(); }
     5.8    bool do_object_b(oop p) { return true; }
     5.9  };
    5.10  static PSAlwaysTrueClosure always_true;

     6.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	Fri May 17 09:10:04 2013 -0700
     6.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	Sun May 19 20:31:30 2013 +0200
     6.3 @@ -781,7 +781,6 @@
     6.4  
     6.5  PSParallelCompact::IsAliveClosure PSParallelCompact::_is_alive_closure;
     6.6  
     6.7 -void PSParallelCompact::IsAliveClosure::do_object(oop p)   { ShouldNotReachHere(); }
     6.8  bool PSParallelCompact::IsAliveClosure::do_object_b(oop p) { return mark_bitmap()->is_marked(p); }
     6.9  
    6.10  void PSParallelCompact::KeepAliveClosure::do_oop(oop* p)       { PSParallelCompact::KeepAliveClosure::do_oop_work(p); }
    6.11 @@ -2413,7 +2412,6 @@
    6.12  // This should be moved to the shared markSweep code!
    6.13  class PSAlwaysTrueClosure: public BoolObjectClosure {
    6.14  public:
    6.15 -  void do_object(oop p) { ShouldNotReachHere(); }
    6.16    bool do_object_b(oop p) { return true; }
    6.17  };
    6.18  static PSAlwaysTrueClosure always_true;

     7.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp	Fri May 17 09:10:04 2013 -0700
     7.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp	Sun May 19 20:31:30 2013 +0200
     7.3 @@ -784,7 +784,6 @@
     7.4    //
     7.5    class IsAliveClosure: public BoolObjectClosure {
     7.6     public:
     7.7 -    virtual void do_object(oop p);
     7.8      virtual bool do_object_b(oop p);
     7.9    };
    7.10

     8.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp	Fri May 17 09:10:04 2013 -0700
     8.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp	Sun May 19 20:31:30 2013 +0200
     8.3 @@ -70,9 +70,6 @@
     8.4  // Define before use
     8.5  class PSIsAliveClosure: public BoolObjectClosure {
     8.6  public:
     8.7 -  void do_object(oop p) {
     8.8 -    assert(false, "Do not call.");
     8.9 -  }
    8.10    bool do_object_b(oop p) {
    8.11      return (!PSScavenge::is_obj_in_young((HeapWord*) p)) || p->is_forwarded();
    8.12    }

     9.1 --- a/src/share/vm/gc_implementation/shared/markSweep.cpp	Fri May 17 09:10:04 2013 -0700
     9.2 +++ b/src/share/vm/gc_implementation/shared/markSweep.cpp	Sun May 19 20:31:30 2013 +0200
     9.3 @@ -166,7 +166,6 @@
     9.4  
     9.5  MarkSweep::IsAliveClosure   MarkSweep::is_alive;
     9.6  
     9.7 -void MarkSweep::IsAliveClosure::do_object(oop p)   { ShouldNotReachHere(); }
     9.8  bool MarkSweep::IsAliveClosure::do_object_b(oop p) { return p->is_gc_marked(); }
     9.9  
    9.10  MarkSweep::KeepAliveClosure MarkSweep::keep_alive;

    10.1 --- a/src/share/vm/gc_implementation/shared/markSweep.hpp	Fri May 17 09:10:04 2013 -0700
    10.2 +++ b/src/share/vm/gc_implementation/shared/markSweep.hpp	Sun May 19 20:31:30 2013 +0200
    10.3 @@ -88,7 +88,6 @@
    10.4    // Used for java/lang/ref handling
    10.5    class IsAliveClosure: public BoolObjectClosure {
    10.6     public:
    10.7 -    virtual void do_object(oop p);
    10.8      virtual bool do_object_b(oop p);
    10.9    };
   10.10

    11.1 --- a/src/share/vm/memory/defNewGeneration.cpp	Fri May 17 09:10:04 2013 -0700
    11.2 +++ b/src/share/vm/memory/defNewGeneration.cpp	Sun May 19 20:31:30 2013 +0200
    11.3 @@ -50,9 +50,6 @@
    11.4  DefNewGeneration::IsAliveClosure::IsAliveClosure(Generation* g) : _g(g) {
    11.5    assert(g->level() == 0, "Optimized for youngest gen.");
    11.6  }
    11.7 -void DefNewGeneration::IsAliveClosure::do_object(oop p) {
    11.8 -  assert(false, "Do not call.");
    11.9 -}
   11.10  bool DefNewGeneration::IsAliveClosure::do_object_b(oop p) {
   11.11    return (HeapWord*)p >= _g->reserved().end() || p->is_forwarded();
   11.12  }

    12.1 --- a/src/share/vm/memory/defNewGeneration.hpp	Fri May 17 09:10:04 2013 -0700
    12.2 +++ b/src/share/vm/memory/defNewGeneration.hpp	Sun May 19 20:31:30 2013 +0200
    12.3 @@ -150,7 +150,6 @@
    12.4      Generation* _g;
    12.5    public:
    12.6      IsAliveClosure(Generation* g);
    12.7 -    void do_object(oop p);
    12.8      bool do_object_b(oop p);
    12.9    };
   12.10

    13.1 --- a/src/share/vm/memory/iterator.hpp	Fri May 17 09:10:04 2013 -0700
    13.2 +++ b/src/share/vm/memory/iterator.hpp	Sun May 19 20:31:30 2013 +0200
    13.3 @@ -158,7 +158,7 @@
    13.4  };
    13.5  
    13.6  
    13.7 -class BoolObjectClosure : public ObjectClosure {
    13.8 +class BoolObjectClosure : public Closure {
    13.9   public:
   13.10    virtual bool do_object_b(oop obj) = 0;
   13.11  };

    14.1 --- a/src/share/vm/memory/referenceProcessor.cpp	Fri May 17 09:10:04 2013 -0700
    14.2 +++ b/src/share/vm/memory/referenceProcessor.cpp	Sun May 19 20:31:30 2013 +0200
    14.3 @@ -252,7 +252,6 @@
    14.4    class AlwaysAliveClosure: public BoolObjectClosure {
    14.5    public:
    14.6      virtual bool do_object_b(oop obj) { return true; }
    14.7 -    virtual void do_object(oop obj) { assert(false, "Don't call"); }
    14.8    };
    14.9  
   14.10    class CountHandleClosure: public OopClosure {

    15.1 --- a/src/share/vm/memory/sharedHeap.cpp	Fri May 17 09:10:04 2013 -0700
    15.2 +++ b/src/share/vm/memory/sharedHeap.cpp	Sun May 19 20:31:30 2013 +0200
    15.3 @@ -212,7 +212,6 @@
    15.4  
    15.5  class AlwaysTrueClosure: public BoolObjectClosure {
    15.6  public:
    15.7 -  void do_object(oop p) { ShouldNotReachHere(); }
    15.8    bool do_object_b(oop p) { return true; }
    15.9  };
   15.10  static AlwaysTrueClosure always_true;

    16.1 --- a/src/share/vm/runtime/jniHandles.cpp	Fri May 17 09:10:04 2013 -0700
    16.2 +++ b/src/share/vm/runtime/jniHandles.cpp	Sun May 19 20:31:30 2013 +0200
    16.3 @@ -188,7 +188,6 @@
    16.4  class AlwaysAliveClosure: public BoolObjectClosure {
    16.5  public:
    16.6    bool do_object_b(oop obj) { return true; }
    16.7 -  void do_object(oop obj) { assert(false, "Don't call"); }
    16.8  };
    16.9  
   16.10  class CountHandleClosure: public OopClosure {

Mercurial > jdk8-mips64-public > hotspot / changeset

changeset

Merge