Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	Fri Apr 13 01:59:38 2012 +0200
     1.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	Mon Apr 16 08:57:18 2012 +0200
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2001, 2012, 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 @@ -2444,7 +2444,7 @@
    1.11    virtual void do_oop(narrowOop* p) { VerifyAllOopsClosure::do_oop_work(p); }
    1.12  };
    1.13  
    1.14 -void CompactibleFreeListSpace::verify(bool ignored) const {
    1.15 +void CompactibleFreeListSpace::verify() const {
    1.16    assert_lock_strong(&_freelistLock);
    1.17    verify_objects_initialized();
    1.18    MemRegion span = _collector->_span;

     2.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp	Fri Apr 13 01:59:38 2012 +0200
     2.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp	Mon Apr 16 08:57:18 2012 +0200
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -492,7 +492,7 @@
    2.11    void print()                            const;
    2.12    void print_on(outputStream* st)         const;
    2.13    void prepare_for_verify();
    2.14 -  void verify(bool allow_dirty)           const;
    2.15 +  void verify()                           const;
    2.16    void verifyFreeLists()                  const PRODUCT_RETURN;
    2.17    void verifyIndexedFreeLists()           const;
    2.18    void verifyIndexedFreeList(size_t size) const;

     3.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	Fri Apr 13 01:59:38 2012 +0200
     3.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	Mon Apr 16 08:57:18 2012 +0200
     3.3 @@ -3109,21 +3109,21 @@
     3.4  }
     3.5  
     3.6  void
     3.7 -ConcurrentMarkSweepGeneration::verify(bool allow_dirty /* ignored */) {
     3.8 +ConcurrentMarkSweepGeneration::verify() {
     3.9    // Locks are normally acquired/released in gc_prologue/gc_epilogue, but those
    3.10    // are not called when the heap is verified during universe initialization and
    3.11    // at vm shutdown.
    3.12    if (freelistLock()->owned_by_self()) {
    3.13 -    cmsSpace()->verify(false /* ignored */);
    3.14 +    cmsSpace()->verify();
    3.15    } else {
    3.16      MutexLockerEx fll(freelistLock(), Mutex::_no_safepoint_check_flag);
    3.17 -    cmsSpace()->verify(false /* ignored */);
    3.18 -  }
    3.19 -}
    3.20 -
    3.21 -void CMSCollector::verify(bool allow_dirty /* ignored */) {
    3.22 -  _cmsGen->verify(allow_dirty);
    3.23 -  _permGen->verify(allow_dirty);
    3.24 +    cmsSpace()->verify();
    3.25 +  }
    3.26 +}
    3.27 +
    3.28 +void CMSCollector::verify() {
    3.29 +  _cmsGen->verify();
    3.30 +  _permGen->verify();
    3.31  }
    3.32  
    3.33  #ifndef PRODUCT

     4.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp	Fri Apr 13 01:59:38 2012 +0200
     4.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp	Mon Apr 16 08:57:18 2012 +0200
     4.3 @@ -1,5 +1,5 @@
     4.4  /*
     4.5 - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
     4.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
     4.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8   *
     4.9   * This code is free software; you can redistribute it and/or modify it
    4.10 @@ -988,7 +988,7 @@
    4.11    CMSGCAdaptivePolicyCounters* gc_adaptive_policy_counters();
    4.12  
    4.13    // debugging
    4.14 -  void verify(bool);
    4.15 +  void verify();
    4.16    bool verify_after_remark();
    4.17    void verify_ok_to_terminate() const PRODUCT_RETURN;
    4.18    void verify_work_stacks_empty() const PRODUCT_RETURN;
    4.19 @@ -1279,7 +1279,7 @@
    4.20  
    4.21    // Debugging
    4.22    void prepare_for_verify();
    4.23 -  void verify(bool allow_dirty);
    4.24 +  void verify();
    4.25    void print_statistics()               PRODUCT_RETURN;
    4.26  
    4.27    // Performance Counters support

     5.1 --- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Fri Apr 13 01:59:38 2012 +0200
     5.2 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Mon Apr 16 08:57:18 2012 +0200
     5.3 @@ -1120,8 +1120,7 @@
     5.4      HandleMark hm;  // handle scope
     5.5      gclog_or_tty->print(" VerifyDuringGC:(before)");
     5.6      Universe::heap()->prepare_for_verify();
     5.7 -    Universe::verify(/* allow dirty */ true,
     5.8 -                     /* silent      */ false,
     5.9 +    Universe::verify(/* silent      */ false,
    5.10                       /* option      */ VerifyOption_G1UsePrevMarking);
    5.11    }
    5.12  
    5.13 @@ -1160,8 +1159,7 @@
    5.14        HandleMark hm;  // handle scope
    5.15        gclog_or_tty->print(" VerifyDuringGC:(after)");
    5.16        Universe::heap()->prepare_for_verify();
    5.17 -      Universe::verify(/* allow dirty */ true,
    5.18 -                       /* silent      */ false,
    5.19 +      Universe::verify(/* silent      */ false,
    5.20                         /* option      */ VerifyOption_G1UseNextMarking);
    5.21      }
    5.22      assert(!restart_for_overflow(), "sanity");
    5.23 @@ -1950,8 +1948,7 @@
    5.24      HandleMark hm;  // handle scope
    5.25      gclog_or_tty->print(" VerifyDuringGC:(before)");
    5.26      Universe::heap()->prepare_for_verify();
    5.27 -    Universe::verify(/* allow dirty */ true,
    5.28 -                     /* silent      */ false,
    5.29 +    Universe::verify(/* silent      */ false,
    5.30                       /* option      */ VerifyOption_G1UsePrevMarking);
    5.31    }
    5.32  
    5.33 @@ -2132,8 +2129,7 @@
    5.34      HandleMark hm;  // handle scope
    5.35      gclog_or_tty->print(" VerifyDuringGC:(after)");
    5.36      Universe::heap()->prepare_for_verify();
    5.37 -    Universe::verify(/* allow dirty */ true,
    5.38 -                     /* silent      */ false,
    5.39 +    Universe::verify(/* silent      */ false,
    5.40                       /* option      */ VerifyOption_G1UsePrevMarking);
    5.41    }
    5.42  

     6.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Fri Apr 13 01:59:38 2012 +0200
     6.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Mon Apr 16 08:57:18 2012 +0200
     6.3 @@ -1291,8 +1291,7 @@
     6.4        HandleMark hm;  // Discard invalid handles created during verification
     6.5        gclog_or_tty->print(" VerifyBeforeGC:");
     6.6        prepare_for_verify();
     6.7 -      Universe::verify(/* allow dirty */ true,
     6.8 -                       /* silent      */ false,
     6.9 +      Universe::verify(/* silent      */ false,
    6.10                         /* option      */ VerifyOption_G1UsePrevMarking);
    6.11  
    6.12      }
    6.13 @@ -1366,8 +1365,7 @@
    6.14        HandleMark hm;  // Discard invalid handles created during verification
    6.15        gclog_or_tty->print(" VerifyAfterGC:");
    6.16        prepare_for_verify();
    6.17 -      Universe::verify(/* allow dirty */ false,
    6.18 -                       /* silent      */ false,
    6.19 +      Universe::verify(/* silent      */ false,
    6.20                         /* option      */ VerifyOption_G1UsePrevMarking);
    6.21  
    6.22      }
    6.23 @@ -3036,7 +3034,6 @@
    6.24  
    6.25  class VerifyRegionClosure: public HeapRegionClosure {
    6.26  private:
    6.27 -  bool         _allow_dirty;
    6.28    bool         _par;
    6.29    VerifyOption _vo;
    6.30    bool         _failures;
    6.31 @@ -3044,9 +3041,8 @@
    6.32    // _vo == UsePrevMarking -> use "prev" marking information,
    6.33    // _vo == UseNextMarking -> use "next" marking information,
    6.34    // _vo == UseMarkWord    -> use mark word from object header.
    6.35 -  VerifyRegionClosure(bool allow_dirty, bool par, VerifyOption vo)
    6.36 -    : _allow_dirty(allow_dirty),
    6.37 -      _par(par),
    6.38 +  VerifyRegionClosure(bool par, VerifyOption vo)
    6.39 +    : _par(par),
    6.40        _vo(vo),
    6.41        _failures(false) {}
    6.42  
    6.43 @@ -3059,7 +3055,7 @@
    6.44                "Should be unclaimed at verify points.");
    6.45      if (!r->continuesHumongous()) {
    6.46        bool failures = false;
    6.47 -      r->verify(_allow_dirty, _vo, &failures);
    6.48 +      r->verify(_vo, &failures);
    6.49        if (failures) {
    6.50          _failures = true;
    6.51        } else {
    6.52 @@ -3127,7 +3123,6 @@
    6.53  class G1ParVerifyTask: public AbstractGangTask {
    6.54  private:
    6.55    G1CollectedHeap* _g1h;
    6.56 -  bool             _allow_dirty;
    6.57    VerifyOption     _vo;
    6.58    bool             _failures;
    6.59  
    6.60 @@ -3135,10 +3130,9 @@
    6.61    // _vo == UsePrevMarking -> use "prev" marking information,
    6.62    // _vo == UseNextMarking -> use "next" marking information,
    6.63    // _vo == UseMarkWord    -> use mark word from object header.
    6.64 -  G1ParVerifyTask(G1CollectedHeap* g1h, bool allow_dirty, VerifyOption vo) :
    6.65 +  G1ParVerifyTask(G1CollectedHeap* g1h, VerifyOption vo) :
    6.66      AbstractGangTask("Parallel verify task"),
    6.67      _g1h(g1h),
    6.68 -    _allow_dirty(allow_dirty),
    6.69      _vo(vo),
    6.70      _failures(false) { }
    6.71  
    6.72 @@ -3148,7 +3142,7 @@
    6.73  
    6.74    void work(uint worker_id) {
    6.75      HandleMark hm;
    6.76 -    VerifyRegionClosure blk(_allow_dirty, true, _vo);
    6.77 +    VerifyRegionClosure blk(true, _vo);
    6.78      _g1h->heap_region_par_iterate_chunked(&blk, worker_id,
    6.79                                            _g1h->workers()->active_workers(),
    6.80                                            HeapRegion::ParVerifyClaimValue);
    6.81 @@ -3158,12 +3152,11 @@
    6.82    }
    6.83  };
    6.84  
    6.85 -void G1CollectedHeap::verify(bool allow_dirty, bool silent) {
    6.86 -  verify(allow_dirty, silent, VerifyOption_G1UsePrevMarking);
    6.87 -}
    6.88 -
    6.89 -void G1CollectedHeap::verify(bool allow_dirty,
    6.90 -                             bool silent,
    6.91 +void G1CollectedHeap::verify(bool silent) {
    6.92 +  verify(silent, VerifyOption_G1UsePrevMarking);
    6.93 +}
    6.94 +
    6.95 +void G1CollectedHeap::verify(bool silent,
    6.96                               VerifyOption vo) {
    6.97    if (SafepointSynchronize::is_at_safepoint() || ! UseTLAB) {
    6.98      if (!silent) { gclog_or_tty->print("Roots (excluding permgen) "); }
    6.99 @@ -3215,7 +3208,7 @@
   6.100        assert(check_heap_region_claim_values(HeapRegion::InitialClaimValue),
   6.101               "sanity check");
   6.102  
   6.103 -      G1ParVerifyTask task(this, allow_dirty, vo);
   6.104 +      G1ParVerifyTask task(this, vo);
   6.105        assert(UseDynamicNumberOfGCThreads ||
   6.106          workers()->active_workers() == workers()->total_workers(),
   6.107          "If not dynamic should be using all the workers");
   6.108 @@ -3237,7 +3230,7 @@
   6.109        assert(check_heap_region_claim_values(HeapRegion::InitialClaimValue),
   6.110               "sanity check");
   6.111      } else {
   6.112 -      VerifyRegionClosure blk(allow_dirty, false, vo);
   6.113 +      VerifyRegionClosure blk(false, vo);
   6.114        heap_region_iterate(&blk);
   6.115        if (blk.failures()) {
   6.116          failures = true;
   6.117 @@ -3650,8 +3643,7 @@
   6.118          HandleMark hm;  // Discard invalid handles created during verification
   6.119          gclog_or_tty->print(" VerifyBeforeGC:");
   6.120          prepare_for_verify();
   6.121 -        Universe::verify(/* allow dirty */ false,
   6.122 -                         /* silent      */ false,
   6.123 +        Universe::verify(/* silent      */ false,
   6.124                           /* option      */ VerifyOption_G1UsePrevMarking);
   6.125        }
   6.126  
   6.127 @@ -3895,8 +3887,7 @@
   6.128            HandleMark hm;  // Discard invalid handles created during verification
   6.129            gclog_or_tty->print(" VerifyAfterGC:");
   6.130            prepare_for_verify();
   6.131 -          Universe::verify(/* allow dirty */ true,
   6.132 -                           /* silent      */ false,
   6.133 +          Universe::verify(/* silent      */ false,
   6.134                             /* option      */ VerifyOption_G1UsePrevMarking);
   6.135          }
   6.136  

     7.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Fri Apr 13 01:59:38 2012 +0200
     7.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Mon Apr 16 08:57:18 2012 +0200
     7.3 @@ -1504,10 +1504,10 @@
     7.4    // Currently there is only one place where this is called with
     7.5    // vo == UseMarkWord, which is to verify the marking during a
     7.6    // full GC.
     7.7 -  void verify(bool allow_dirty, bool silent, VerifyOption vo);
     7.8 +  void verify(bool silent, VerifyOption vo);
     7.9  
    7.10    // Override; it uses the "prev" marking information
    7.11 -  virtual void verify(bool allow_dirty, bool silent);
    7.12 +  virtual void verify(bool silent);
    7.13    virtual void print_on(outputStream* st) const;
    7.14    virtual void print_extended_on(outputStream* st) const;
    7.15  

     8.1 --- a/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp	Fri Apr 13 01:59:38 2012 +0200
     8.2 +++ b/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp	Mon Apr 16 08:57:18 2012 +0200
     8.3 @@ -193,8 +193,7 @@
     8.4      // fail. At the end of the GC, the orginal mark word values
     8.5      // (including hash values) are restored to the appropriate
     8.6      // objects.
     8.7 -    Universe::heap()->verify(/* allow dirty */ true,
     8.8 -                             /* silent      */ false,
     8.9 +    Universe::heap()->verify(/* silent      */ false,
    8.10                               /* option      */ VerifyOption_G1UseMarkWord);
    8.11  
    8.12      G1CollectedHeap* g1h = G1CollectedHeap::heap();

     9.1 --- a/src/share/vm/gc_implementation/g1/heapRegion.cpp	Fri Apr 13 01:59:38 2012 +0200
     9.2 +++ b/src/share/vm/gc_implementation/g1/heapRegion.cpp	Mon Apr 16 08:57:18 2012 +0200
     9.3 @@ -779,16 +779,15 @@
     9.4    G1OffsetTableContigSpace::print_on(st);
     9.5  }
     9.6  
     9.7 -void HeapRegion::verify(bool allow_dirty) const {
     9.8 +void HeapRegion::verify() const {
     9.9    bool dummy = false;
    9.10 -  verify(allow_dirty, VerifyOption_G1UsePrevMarking, /* failures */ &dummy);
    9.11 +  verify(VerifyOption_G1UsePrevMarking, /* failures */ &dummy);
    9.12  }
    9.13  
    9.14  // This really ought to be commoned up into OffsetTableContigSpace somehow.
    9.15  // We would need a mechanism to make that code skip dead objects.
    9.16  
    9.17 -void HeapRegion::verify(bool allow_dirty,
    9.18 -                        VerifyOption vo,
    9.19 +void HeapRegion::verify(VerifyOption vo,
    9.20                          bool* failures) const {
    9.21    G1CollectedHeap* g1 = G1CollectedHeap::heap();
    9.22    *failures = false;

    10.1 --- a/src/share/vm/gc_implementation/g1/heapRegion.hpp	Fri Apr 13 01:59:38 2012 +0200
    10.2 +++ b/src/share/vm/gc_implementation/g1/heapRegion.hpp	Mon Apr 16 08:57:18 2012 +0200
    10.3 @@ -823,10 +823,10 @@
    10.4    // Currently there is only one place where this is called with
    10.5    // vo == UseMarkWord, which is to verify the marking during a
    10.6    // full GC.
    10.7 -  void verify(bool allow_dirty, VerifyOption vo, bool *failures) const;
    10.8 +  void verify(VerifyOption vo, bool *failures) const;
    10.9  
   10.10    // Override; it uses the "prev" marking information
   10.11 -  virtual void verify(bool allow_dirty) const;
   10.12 +  virtual void verify() const;
   10.13  };
   10.14  
   10.15  // HeapRegionClosure is used for iterating over regions.

    11.1 --- a/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp	Fri Apr 13 01:59:38 2012 +0200
    11.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp	Mon Apr 16 08:57:18 2012 +0200
    11.3 @@ -911,23 +911,23 @@
    11.4  }
    11.5  
    11.6  
    11.7 -void ParallelScavengeHeap::verify(bool allow_dirty, bool silent, VerifyOption option /* ignored */) {
    11.8 +void ParallelScavengeHeap::verify(bool silent, VerifyOption option /* ignored */) {
    11.9    // Why do we need the total_collections()-filter below?
   11.10    if (total_collections() > 0) {
   11.11      if (!silent) {
   11.12        gclog_or_tty->print("permanent ");
   11.13      }
   11.14 -    perm_gen()->verify(allow_dirty);
   11.15 +    perm_gen()->verify();
   11.16  
   11.17      if (!silent) {
   11.18        gclog_or_tty->print("tenured ");
   11.19      }
   11.20 -    old_gen()->verify(allow_dirty);
   11.21 +    old_gen()->verify();
   11.22  
   11.23      if (!silent) {
   11.24        gclog_or_tty->print("eden ");
   11.25      }
   11.26 -    young_gen()->verify(allow_dirty);
   11.27 +    young_gen()->verify();
   11.28    }
   11.29  }
   11.30  

    12.1 --- a/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp	Fri Apr 13 01:59:38 2012 +0200
    12.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp	Mon Apr 16 08:57:18 2012 +0200
    12.3 @@ -257,7 +257,7 @@
    12.4    virtual void gc_threads_do(ThreadClosure* tc) const;
    12.5    virtual void print_tracing_info() const;
    12.6  
    12.7 -  void verify(bool allow_dirty, bool silent, VerifyOption option /* ignored */);
    12.8 +  void verify(bool silent, VerifyOption option /* ignored */);
    12.9  
   12.10    void print_heap_change(size_t prev_used);
   12.11  

    13.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp	Fri Apr 13 01:59:38 2012 +0200
    13.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp	Mon Apr 16 08:57:18 2012 +0200
    13.3 @@ -1,5 +1,5 @@
    13.4  /*
    13.5 - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
    13.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
    13.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    13.8   *
    13.9   * This code is free software; you can redistribute it and/or modify it
   13.10 @@ -477,8 +477,8 @@
   13.11  }
   13.12  #endif
   13.13  
   13.14 -void PSOldGen::verify(bool allow_dirty) {
   13.15 -  object_space()->verify(allow_dirty);
   13.16 +void PSOldGen::verify() {
   13.17 +  object_space()->verify();
   13.18  }
   13.19  class VerifyObjectStartArrayClosure : public ObjectClosure {
   13.20    PSOldGen* _gen;

    14.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp	Fri Apr 13 01:59:38 2012 +0200
    14.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp	Mon Apr 16 08:57:18 2012 +0200
    14.3 @@ -1,5 +1,5 @@
    14.4  /*
    14.5 - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
    14.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
    14.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    14.8   *
    14.9   * This code is free software; you can redistribute it and/or modify it
   14.10 @@ -174,7 +174,7 @@
   14.11    virtual void print_on(outputStream* st) const;
   14.12    void print_used_change(size_t prev_used) const;
   14.13  
   14.14 -  void verify(bool allow_dirty);
   14.15 +  void verify();
   14.16    void verify_object_start_array();
   14.17  
   14.18    // These should not used

    15.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp	Fri Apr 13 01:59:38 2012 +0200
    15.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp	Mon Apr 16 08:57:18 2012 +0200
    15.3 @@ -1,5 +1,5 @@
    15.4  /*
    15.5 - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
    15.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
    15.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    15.8   *
    15.9   * This code is free software; you can redistribute it and/or modify it
   15.10 @@ -937,10 +937,10 @@
   15.11    }
   15.12  }
   15.13  
   15.14 -void PSYoungGen::verify(bool allow_dirty) {
   15.15 -  eden_space()->verify(allow_dirty);
   15.16 -  from_space()->verify(allow_dirty);
   15.17 -  to_space()->verify(allow_dirty);
   15.18 +void PSYoungGen::verify() {
   15.19 +  eden_space()->verify();
   15.20 +  from_space()->verify();
   15.21 +  to_space()->verify();
   15.22  }
   15.23  
   15.24  #ifndef PRODUCT

    16.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp	Fri Apr 13 01:59:38 2012 +0200
    16.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp	Mon Apr 16 08:57:18 2012 +0200
    16.3 @@ -1,5 +1,5 @@
    16.4  /*
    16.5 - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
    16.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
    16.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    16.8   *
    16.9   * This code is free software; you can redistribute it and/or modify it
   16.10 @@ -181,7 +181,7 @@
   16.11    void print_used_change(size_t prev_used) const;
   16.12    virtual const char* name() const { return "PSYoungGen"; }
   16.13  
   16.14 -  void verify(bool allow_dirty);
   16.15 +  void verify();
   16.16  
   16.17    // Space boundary invariant checker
   16.18    void space_invariants() PRODUCT_RETURN;

    17.1 --- a/src/share/vm/gc_implementation/shared/immutableSpace.cpp	Fri Apr 13 01:59:38 2012 +0200
    17.2 +++ b/src/share/vm/gc_implementation/shared/immutableSpace.cpp	Mon Apr 16 08:57:18 2012 +0200
    17.3 @@ -1,5 +1,5 @@
    17.4  /*
    17.5 - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
    17.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
    17.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    17.8   *
    17.9   * This code is free software; you can redistribute it and/or modify it
   17.10 @@ -70,7 +70,7 @@
   17.11  
   17.12  #endif
   17.13  
   17.14 -void ImmutableSpace::verify(bool allow_dirty) {
   17.15 +void ImmutableSpace::verify() {
   17.16    HeapWord* p = bottom();
   17.17    HeapWord* t = end();
   17.18    HeapWord* prev_p = NULL;

    18.1 --- a/src/share/vm/gc_implementation/shared/immutableSpace.hpp	Fri Apr 13 01:59:38 2012 +0200
    18.2 +++ b/src/share/vm/gc_implementation/shared/immutableSpace.hpp	Mon Apr 16 08:57:18 2012 +0200
    18.3 @@ -1,5 +1,5 @@
    18.4  /*
    18.5 - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
    18.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
    18.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    18.8   *
    18.9   * This code is free software; you can redistribute it and/or modify it
   18.10 @@ -65,7 +65,7 @@
   18.11    // Debugging
   18.12    virtual void print() const            PRODUCT_RETURN;
   18.13    virtual void print_short() const      PRODUCT_RETURN;
   18.14 -  virtual void verify(bool allow_dirty);
   18.15 +  virtual void verify();
   18.16  };
   18.17  
   18.18  #endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_IMMUTABLESPACE_HPP

    19.1 --- a/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp	Fri Apr 13 01:59:38 2012 +0200
    19.2 +++ b/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp	Mon Apr 16 08:57:18 2012 +0200
    19.3 @@ -891,12 +891,12 @@
    19.4    }
    19.5  }
    19.6  
    19.7 -void MutableNUMASpace::verify(bool allow_dirty) {
    19.8 +void MutableNUMASpace::verify() {
    19.9    // This can be called after setting an arbitary value to the space's top,
   19.10    // so an object can cross the chunk boundary. We ensure the parsablity
   19.11    // of the space and just walk the objects in linear fashion.
   19.12    ensure_parsability();
   19.13 -  MutableSpace::verify(allow_dirty);
   19.14 +  MutableSpace::verify();
   19.15  }
   19.16  
   19.17  // Scan pages and gather stats about page placement and size.

    20.1 --- a/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp	Fri Apr 13 01:59:38 2012 +0200
    20.2 +++ b/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp	Mon Apr 16 08:57:18 2012 +0200
    20.3 @@ -1,5 +1,5 @@
    20.4  /*
    20.5 - * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
    20.6 + * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
    20.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    20.8   *
    20.9   * This code is free software; you can redistribute it and/or modify it
   20.10 @@ -225,7 +225,7 @@
   20.11    // Debugging
   20.12    virtual void print_on(outputStream* st) const;
   20.13    virtual void print_short_on(outputStream* st) const;
   20.14 -  virtual void verify(bool allow_dirty);
   20.15 +  virtual void verify();
   20.16  
   20.17    virtual void set_top(HeapWord* value);
   20.18  };

    21.1 --- a/src/share/vm/gc_implementation/shared/mutableSpace.cpp	Fri Apr 13 01:59:38 2012 +0200
    21.2 +++ b/src/share/vm/gc_implementation/shared/mutableSpace.cpp	Mon Apr 16 08:57:18 2012 +0200
    21.3 @@ -1,5 +1,5 @@
    21.4  /*
    21.5 - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
    21.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
    21.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    21.8   *
    21.9   * This code is free software; you can redistribute it and/or modify it
   21.10 @@ -246,7 +246,7 @@
   21.11                   bottom(), top(), end());
   21.12  }
   21.13  
   21.14 -void MutableSpace::verify(bool allow_dirty) {
   21.15 +void MutableSpace::verify() {
   21.16    HeapWord* p = bottom();
   21.17    HeapWord* t = top();
   21.18    HeapWord* prev_p = NULL;

    22.1 --- a/src/share/vm/gc_implementation/shared/mutableSpace.hpp	Fri Apr 13 01:59:38 2012 +0200
    22.2 +++ b/src/share/vm/gc_implementation/shared/mutableSpace.hpp	Mon Apr 16 08:57:18 2012 +0200
    22.3 @@ -1,5 +1,5 @@
    22.4  /*
    22.5 - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
    22.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
    22.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    22.8   *
    22.9   * This code is free software; you can redistribute it and/or modify it
   22.10 @@ -141,7 +141,7 @@
   22.11    virtual void print_on(outputStream* st) const;
   22.12    virtual void print_short() const;
   22.13    virtual void print_short_on(outputStream* st) const;
   22.14 -  virtual void verify(bool allow_dirty);
   22.15 +  virtual void verify();
   22.16  };
   22.17  
   22.18  #endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_MUTABLESPACE_HPP

    23.1 --- a/src/share/vm/gc_interface/collectedHeap.hpp	Fri Apr 13 01:59:38 2012 +0200
    23.2 +++ b/src/share/vm/gc_interface/collectedHeap.hpp	Mon Apr 16 08:57:18 2012 +0200
    23.3 @@ -659,7 +659,7 @@
    23.4    }
    23.5  
    23.6    // Heap verification
    23.7 -  virtual void verify(bool allow_dirty, bool silent, VerifyOption option) = 0;
    23.8 +  virtual void verify(bool silent, VerifyOption option) = 0;
    23.9  
   23.10    // Non product verification and debugging.
   23.11  #ifndef PRODUCT

    24.1 --- a/src/share/vm/memory/compactingPermGenGen.cpp	Fri Apr 13 01:59:38 2012 +0200
    24.2 +++ b/src/share/vm/memory/compactingPermGenGen.cpp	Mon Apr 16 08:57:18 2012 +0200
    24.3 @@ -444,11 +444,11 @@
    24.4  }
    24.5  
    24.6  
    24.7 -void CompactingPermGenGen::verify(bool allow_dirty) {
    24.8 -  the_space()->verify(allow_dirty);
    24.9 +void CompactingPermGenGen::verify() {
   24.10 +  the_space()->verify();
   24.11    if (!SharedSkipVerify && spec()->enable_shared_spaces()) {
   24.12 -    ro_space()->verify(allow_dirty);
   24.13 -    rw_space()->verify(allow_dirty);
   24.14 +    ro_space()->verify();
   24.15 +    rw_space()->verify();
   24.16    }
   24.17  }
   24.18  

    25.1 --- a/src/share/vm/memory/compactingPermGenGen.hpp	Fri Apr 13 01:59:38 2012 +0200
    25.2 +++ b/src/share/vm/memory/compactingPermGenGen.hpp	Mon Apr 16 08:57:18 2012 +0200
    25.3 @@ -1,5 +1,5 @@
    25.4  /*
    25.5 - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
    25.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    25.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    25.8   *
    25.9   * This code is free software; you can redistribute it and/or modify it
   25.10 @@ -230,7 +230,7 @@
   25.11                                        void* new_vtable_start,
   25.12                                        void* obj);
   25.13  
   25.14 -  void verify(bool allow_dirty);
   25.15 +  void verify();
   25.16  
   25.17    // Serialization
   25.18    static void initialize_oops() KERNEL_RETURN;

    26.1 --- a/src/share/vm/memory/defNewGeneration.cpp	Fri Apr 13 01:59:38 2012 +0200
    26.2 +++ b/src/share/vm/memory/defNewGeneration.cpp	Mon Apr 16 08:57:18 2012 +0200
    26.3 @@ -939,10 +939,10 @@
    26.4    }
    26.5  }
    26.6  
    26.7 -void DefNewGeneration::verify(bool allow_dirty) {
    26.8 -  eden()->verify(allow_dirty);
    26.9 -  from()->verify(allow_dirty);
   26.10 -    to()->verify(allow_dirty);
   26.11 +void DefNewGeneration::verify() {
   26.12 +  eden()->verify();
   26.13 +  from()->verify();
   26.14 +    to()->verify();
   26.15  }
   26.16  
   26.17  void DefNewGeneration::print_on(outputStream* st) const {

    27.1 --- a/src/share/vm/memory/defNewGeneration.hpp	Fri Apr 13 01:59:38 2012 +0200
    27.2 +++ b/src/share/vm/memory/defNewGeneration.hpp	Mon Apr 16 08:57:18 2012 +0200
    27.3 @@ -1,5 +1,5 @@
    27.4  /*
    27.5 - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
    27.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
    27.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    27.8   *
    27.9   * This code is free software; you can redistribute it and/or modify it
   27.10 @@ -340,7 +340,7 @@
   27.11    // PrintHeapAtGC support.
   27.12    void print_on(outputStream* st) const;
   27.13  
   27.14 -  void verify(bool allow_dirty);
   27.15 +  void verify();
   27.16  
   27.17    bool promo_failure_scan_is_complete() const {
   27.18      return _promo_failure_scan_stack.is_empty();

    28.1 --- a/src/share/vm/memory/genCollectedHeap.cpp	Fri Apr 13 01:59:38 2012 +0200
    28.2 +++ b/src/share/vm/memory/genCollectedHeap.cpp	Mon Apr 16 08:57:18 2012 +0200
    28.3 @@ -1247,18 +1247,18 @@
    28.4    return _gens[level]->gc_stats();
    28.5  }
    28.6  
    28.7 -void GenCollectedHeap::verify(bool allow_dirty, bool silent, VerifyOption option /* ignored */) {
    28.8 +void GenCollectedHeap::verify(bool silent, VerifyOption option /* ignored */) {
    28.9    if (!silent) {
   28.10      gclog_or_tty->print("permgen ");
   28.11    }
   28.12 -  perm_gen()->verify(allow_dirty);
   28.13 +  perm_gen()->verify();
   28.14    for (int i = _n_gens-1; i >= 0; i--) {
   28.15      Generation* g = _gens[i];
   28.16      if (!silent) {
   28.17        gclog_or_tty->print(g->name());
   28.18        gclog_or_tty->print(" ");
   28.19      }
   28.20 -    g->verify(allow_dirty);
   28.21 +    g->verify();
   28.22    }
   28.23    if (!silent) {
   28.24      gclog_or_tty->print("remset ");

    29.1 --- a/src/share/vm/memory/genCollectedHeap.hpp	Fri Apr 13 01:59:38 2012 +0200
    29.2 +++ b/src/share/vm/memory/genCollectedHeap.hpp	Mon Apr 16 08:57:18 2012 +0200
    29.3 @@ -1,5 +1,5 @@
    29.4  /*
    29.5 - * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
    29.6 + * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
    29.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    29.8   *
    29.9   * This code is free software; you can redistribute it and/or modify it
   29.10 @@ -357,7 +357,7 @@
   29.11    void prepare_for_verify();
   29.12  
   29.13    // Override.
   29.14 -  void verify(bool allow_dirty, bool silent, VerifyOption option);
   29.15 +  void verify(bool silent, VerifyOption option);
   29.16  
   29.17    // Override.
   29.18    virtual void print_on(outputStream* st) const;

    30.1 --- a/src/share/vm/memory/generation.cpp	Fri Apr 13 01:59:38 2012 +0200
    30.2 +++ b/src/share/vm/memory/generation.cpp	Mon Apr 16 08:57:18 2012 +0200
    30.3 @@ -1,5 +1,5 @@
    30.4  /*
    30.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
    30.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    30.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    30.8   *
    30.9   * This code is free software; you can redistribute it and/or modify it
   30.10 @@ -696,8 +696,8 @@
   30.11    the_space()->set_top_for_allocations();
   30.12  }
   30.13  
   30.14 -void OneContigSpaceCardGeneration::verify(bool allow_dirty) {
   30.15 -  the_space()->verify(allow_dirty);
   30.16 +void OneContigSpaceCardGeneration::verify() {
   30.17 +  the_space()->verify();
   30.18  }
   30.19  
   30.20  void OneContigSpaceCardGeneration::print_on(outputStream* st)  const {

    31.1 --- a/src/share/vm/memory/generation.hpp	Fri Apr 13 01:59:38 2012 +0200
    31.2 +++ b/src/share/vm/memory/generation.hpp	Mon Apr 16 08:57:18 2012 +0200
    31.3 @@ -1,5 +1,5 @@
    31.4  /*
    31.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    31.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    31.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    31.8   *
    31.9   * This code is free software; you can redistribute it and/or modify it
   31.10 @@ -599,7 +599,7 @@
   31.11    virtual void print() const;
   31.12    virtual void print_on(outputStream* st) const;
   31.13  
   31.14 -  virtual void verify(bool allow_dirty) = 0;
   31.15 +  virtual void verify() = 0;
   31.16  
   31.17    struct StatRecord {
   31.18      int invocations;
   31.19 @@ -753,7 +753,7 @@
   31.20  
   31.21    virtual void record_spaces_top();
   31.22  
   31.23 -  virtual void verify(bool allow_dirty);
   31.24 +  virtual void verify();
   31.25    virtual void print_on(outputStream* st) const;
   31.26  };
   31.27  

    32.1 --- a/src/share/vm/memory/space.cpp	Fri Apr 13 01:59:38 2012 +0200
    32.2 +++ b/src/share/vm/memory/space.cpp	Mon Apr 16 08:57:18 2012 +0200
    32.3 @@ -1,5 +1,5 @@
    32.4  /*
    32.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    32.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    32.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    32.8   *
    32.9   * This code is free software; you can redistribute it and/or modify it
   32.10 @@ -531,7 +531,7 @@
   32.11                bottom(), top(), _offsets.threshold(), end());
   32.12  }
   32.13  
   32.14 -void ContiguousSpace::verify(bool allow_dirty) const {
   32.15 +void ContiguousSpace::verify() const {
   32.16    HeapWord* p = bottom();
   32.17    HeapWord* t = top();
   32.18    HeapWord* prev_p = NULL;
   32.19 @@ -965,27 +965,12 @@
   32.20    initialize(mr, SpaceDecorator::Clear, SpaceDecorator::Mangle);
   32.21  }
   32.22  
   32.23 -
   32.24 -class VerifyOldOopClosure : public OopClosure {
   32.25 - public:
   32.26 -  oop  _the_obj;
   32.27 -  bool _allow_dirty;
   32.28 -  void do_oop(oop* p) {
   32.29 -    _the_obj->verify_old_oop(p, _allow_dirty);
   32.30 -  }
   32.31 -  void do_oop(narrowOop* p) {
   32.32 -    _the_obj->verify_old_oop(p, _allow_dirty);
   32.33 -  }
   32.34 -};
   32.35 -
   32.36  #define OBJ_SAMPLE_INTERVAL 0
   32.37  #define BLOCK_SAMPLE_INTERVAL 100
   32.38  
   32.39 -void OffsetTableContigSpace::verify(bool allow_dirty) const {
   32.40 +void OffsetTableContigSpace::verify() const {
   32.41    HeapWord* p = bottom();
   32.42    HeapWord* prev_p = NULL;
   32.43 -  VerifyOldOopClosure blk;      // Does this do anything?
   32.44 -  blk._allow_dirty = allow_dirty;
   32.45    int objs = 0;
   32.46    int blocks = 0;
   32.47  
   32.48 @@ -1007,8 +992,6 @@
   32.49  
   32.50      if (objs == OBJ_SAMPLE_INTERVAL) {
   32.51        oop(p)->verify();
   32.52 -      blk._the_obj = oop(p);
   32.53 -      oop(p)->oop_iterate(&blk);
   32.54        objs = 0;
   32.55      } else {
   32.56        objs++;

    33.1 --- a/src/share/vm/memory/space.hpp	Fri Apr 13 01:59:38 2012 +0200
    33.2 +++ b/src/share/vm/memory/space.hpp	Mon Apr 16 08:57:18 2012 +0200
    33.3 @@ -1,5 +1,5 @@
    33.4  /*
    33.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
    33.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    33.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33.8   *
    33.9   * This code is free software; you can redistribute it and/or modify it
   33.10 @@ -306,7 +306,7 @@
   33.11    }
   33.12  
   33.13    // Debugging
   33.14 -  virtual void verify(bool allow_dirty) const = 0;
   33.15 +  virtual void verify() const = 0;
   33.16  };
   33.17  
   33.18  // A MemRegionClosure (ResourceObj) whose "do_MemRegion" function applies an
   33.19 @@ -948,7 +948,7 @@
   33.20    }
   33.21  
   33.22    // Debugging
   33.23 -  virtual void verify(bool allow_dirty) const;
   33.24 +  virtual void verify() const;
   33.25  
   33.26    // Used to increase collection frequency.  "factor" of 0 means entire
   33.27    // space.
   33.28 @@ -1100,7 +1100,7 @@
   33.29    virtual void print_on(outputStream* st) const;
   33.30  
   33.31    // Debugging
   33.32 -  void verify(bool allow_dirty) const;
   33.33 +  void verify() const;
   33.34  
   33.35    // Shared space support
   33.36    void serialize_block_offset_array_offsets(SerializeOopClosure* soc);

    34.1 --- a/src/share/vm/memory/universe.cpp	Fri Apr 13 01:59:38 2012 +0200
    34.2 +++ b/src/share/vm/memory/universe.cpp	Mon Apr 16 08:57:18 2012 +0200
    34.3 @@ -1,5 +1,5 @@
    34.4  /*
    34.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
    34.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    34.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    34.8   *
    34.9   * This code is free software; you can redistribute it and/or modify it
   34.10 @@ -1326,7 +1326,7 @@
   34.11    st->print_cr("}");
   34.12  }
   34.13  
   34.14 -void Universe::verify(bool allow_dirty, bool silent, VerifyOption option) {
   34.15 +void Universe::verify(bool silent, VerifyOption option) {
   34.16    if (SharedSkipVerify) {
   34.17      return;
   34.18    }
   34.19 @@ -1350,7 +1350,7 @@
   34.20    if (!silent) gclog_or_tty->print("[Verifying ");
   34.21    if (!silent) gclog_or_tty->print("threads ");
   34.22    Threads::verify();
   34.23 -  heap()->verify(allow_dirty, silent, option);
   34.24 +  heap()->verify(silent, option);
   34.25  
   34.26    if (!silent) gclog_or_tty->print("syms ");
   34.27    SymbolTable::verify();

    35.1 --- a/src/share/vm/memory/universe.hpp	Fri Apr 13 01:59:38 2012 +0200
    35.2 +++ b/src/share/vm/memory/universe.hpp	Mon Apr 16 08:57:18 2012 +0200
    35.3 @@ -1,5 +1,5 @@
    35.4  /*
    35.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
    35.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    35.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    35.8   *
    35.9   * This code is free software; you can redistribute it and/or modify it
   35.10 @@ -412,7 +412,7 @@
   35.11  
   35.12    // Debugging
   35.13    static bool verify_in_progress() { return _verify_in_progress; }
   35.14 -  static void verify(bool allow_dirty = true, bool silent = false,
   35.15 +  static void verify(bool silent = false,
   35.16                       VerifyOption option = VerifyOption_Default );
   35.17    static int  verify_count()       { return _verify_count; }
   35.18    // The default behavior is to call print_on() on gclog_or_tty.

    36.1 --- a/src/share/vm/oops/instanceRefKlass.cpp	Fri Apr 13 01:59:38 2012 +0200
    36.2 +++ b/src/share/vm/oops/instanceRefKlass.cpp	Mon Apr 16 08:57:18 2012 +0200
    36.3 @@ -1,5 +1,5 @@
    36.4  /*
    36.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
    36.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    36.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    36.8   *
    36.9   * This code is free software; you can redistribute it and/or modify it
   36.10 @@ -497,36 +497,12 @@
   36.11  
   36.12    if (referent != NULL) {
   36.13      guarantee(referent->is_oop(), "referent field heap failed");
   36.14 -    if (gch != NULL && !gch->is_in_young(obj)) {
   36.15 -      // We do a specific remembered set check here since the referent
   36.16 -      // field is not part of the oop mask and therefore skipped by the
   36.17 -      // regular verify code.
   36.18 -      if (UseCompressedOops) {
   36.19 -        narrowOop* referent_addr = (narrowOop*)java_lang_ref_Reference::referent_addr(obj);
   36.20 -        obj->verify_old_oop(referent_addr, true);
   36.21 -      } else {
   36.22 -        oop* referent_addr = (oop*)java_lang_ref_Reference::referent_addr(obj);
   36.23 -        obj->verify_old_oop(referent_addr, true);
   36.24 -      }
   36.25 -    }
   36.26    }
   36.27    // Verify next field
   36.28    oop next = java_lang_ref_Reference::next(obj);
   36.29    if (next != NULL) {
   36.30      guarantee(next->is_oop(), "next field verify failed");
   36.31      guarantee(next->is_instanceRef(), "next field verify failed");
   36.32 -    if (gch != NULL && !gch->is_in_young(obj)) {
   36.33 -      // We do a specific remembered set check here since the next field is
   36.34 -      // not part of the oop mask and therefore skipped by the regular
   36.35 -      // verify code.
   36.36 -      if (UseCompressedOops) {
   36.37 -        narrowOop* next_addr = (narrowOop*)java_lang_ref_Reference::next_addr(obj);
   36.38 -        obj->verify_old_oop(next_addr, true);
   36.39 -      } else {
   36.40 -        oop* next_addr = (oop*)java_lang_ref_Reference::next_addr(obj);
   36.41 -        obj->verify_old_oop(next_addr, true);
   36.42 -      }
   36.43 -    }
   36.44    }
   36.45  }
   36.46  

    37.1 --- a/src/share/vm/oops/klass.cpp	Fri Apr 13 01:59:38 2012 +0200
    37.2 +++ b/src/share/vm/oops/klass.cpp	Mon Apr 16 08:57:18 2012 +0200
    37.3 @@ -581,14 +581,6 @@
    37.4    guarantee(obj->klass()->is_klass(), "klass field is not a klass");
    37.5  }
    37.6  
    37.7 -
    37.8 -void Klass::oop_verify_old_oop(oop obj, oop* p, bool allow_dirty) {
    37.9 -  /* $$$ I think this functionality should be handled by verification of
   37.10 -  RememberedSet::verify_old_oop(obj, p, allow_dirty, false);
   37.11 -  the card table. */
   37.12 -}
   37.13 -void Klass::oop_verify_old_oop(oop obj, narrowOop* p, bool allow_dirty) { }
   37.14 -
   37.15  #ifndef PRODUCT
   37.16  
   37.17  void Klass::verify_vtable_index(int i) {

    38.1 --- a/src/share/vm/oops/klass.hpp	Fri Apr 13 01:59:38 2012 +0200
    38.2 +++ b/src/share/vm/oops/klass.hpp	Mon Apr 16 08:57:18 2012 +0200
    38.3 @@ -805,8 +805,6 @@
    38.4    // Verification
    38.5    virtual const char* internal_name() const = 0;
    38.6    virtual void oop_verify_on(oop obj, outputStream* st);
    38.7 -  virtual void oop_verify_old_oop(oop obj, oop* p, bool allow_dirty);
    38.8 -  virtual void oop_verify_old_oop(oop obj, narrowOop* p, bool allow_dirty);
    38.9    // tells whether obj is partially constructed (gc during class loading)
   38.10    virtual bool oop_partially_loaded(oop obj) const { return false; }
   38.11    virtual void oop_set_partially_loaded(oop obj) {};

    39.1 --- a/src/share/vm/oops/objArrayKlass.cpp	Fri Apr 13 01:59:38 2012 +0200
    39.2 +++ b/src/share/vm/oops/objArrayKlass.cpp	Mon Apr 16 08:57:18 2012 +0200
    39.3 @@ -545,10 +545,3 @@
    39.4      guarantee(oa->obj_at(index)->is_oop_or_null(), "should be oop");
    39.5    }
    39.6  }
    39.7 -
    39.8 -void objArrayKlass::oop_verify_old_oop(oop obj, oop* p, bool allow_dirty) {
    39.9 -  /* $$$ move into remembered set verification?
   39.10 -  RememberedSet::verify_old_oop(obj, p, allow_dirty, true);
   39.11 -  */
   39.12 -}
   39.13 -void objArrayKlass::oop_verify_old_oop(oop obj, narrowOop* p, bool allow_dirty) {}

    40.1 --- a/src/share/vm/oops/objArrayKlass.hpp	Fri Apr 13 01:59:38 2012 +0200
    40.2 +++ b/src/share/vm/oops/objArrayKlass.hpp	Mon Apr 16 08:57:18 2012 +0200
    40.3 @@ -1,5 +1,5 @@
    40.4  /*
    40.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    40.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    40.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    40.8   *
    40.9   * This code is free software; you can redistribute it and/or modify it
   40.10 @@ -144,8 +144,6 @@
   40.11    // Verification
   40.12    const char* internal_name() const;
   40.13    void oop_verify_on(oop obj, outputStream* st);
   40.14 -  void oop_verify_old_oop(oop obj, oop* p, bool allow_dirty);
   40.15 -  void oop_verify_old_oop(oop obj, narrowOop* p, bool allow_dirty);
   40.16  };
   40.17  
   40.18  #endif // SHARE_VM_OOPS_OBJARRAYKLASS_HPP

    41.1 --- a/src/share/vm/oops/oop.cpp	Fri Apr 13 01:59:38 2012 +0200
    41.2 +++ b/src/share/vm/oops/oop.cpp	Mon Apr 16 08:57:18 2012 +0200
    41.3 @@ -1,5 +1,5 @@
    41.4  /*
    41.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    41.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    41.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    41.8   *
    41.9   * This code is free software; you can redistribute it and/or modify it
   41.10 @@ -107,16 +107,6 @@
   41.11    verify_on(tty);
   41.12  }
   41.13  
   41.14 -
   41.15 -// XXX verify_old_oop doesn't do anything (should we remove?)
   41.16 -void oopDesc::verify_old_oop(oop* p, bool allow_dirty) {
   41.17 -  blueprint()->oop_verify_old_oop(this, p, allow_dirty);
   41.18 -}
   41.19 -
   41.20 -void oopDesc::verify_old_oop(narrowOop* p, bool allow_dirty) {
   41.21 -  blueprint()->oop_verify_old_oop(this, p, allow_dirty);
   41.22 -}
   41.23 -
   41.24  bool oopDesc::partially_loaded() {
   41.25    return blueprint()->oop_partially_loaded(this);
   41.26  }

    42.1 --- a/src/share/vm/oops/oop.hpp	Fri Apr 13 01:59:38 2012 +0200
    42.2 +++ b/src/share/vm/oops/oop.hpp	Mon Apr 16 08:57:18 2012 +0200
    42.3 @@ -1,5 +1,5 @@
    42.4  /*
    42.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
    42.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    42.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    42.8   *
    42.9   * This code is free software; you can redistribute it and/or modify it
   42.10 @@ -293,8 +293,6 @@
   42.11    // verification operations
   42.12    void verify_on(outputStream* st);
   42.13    void verify();
   42.14 -  void verify_old_oop(oop* p, bool allow_dirty);
   42.15 -  void verify_old_oop(narrowOop* p, bool allow_dirty);
   42.16  
   42.17    // tells whether this oop is partially constructed (gc during class loading)
   42.18    bool partially_loaded();

    43.1 --- a/src/share/vm/runtime/vmThread.cpp	Fri Apr 13 01:59:38 2012 +0200
    43.2 +++ b/src/share/vm/runtime/vmThread.cpp	Mon Apr 16 08:57:18 2012 +0200
    43.3 @@ -1,5 +1,5 @@
    43.4  /*
    43.5 - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
    43.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    43.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    43.8   *
    43.9   * This code is free software; you can redistribute it and/or modify it
   43.10 @@ -304,7 +304,7 @@
   43.11      os::check_heap();
   43.12      // Silent verification so as not to pollute normal output,
   43.13      // unless we really asked for it.
   43.14 -    Universe::verify(true, !(PrintGCDetails || Verbose));
   43.15 +    Universe::verify(!(PrintGCDetails || Verbose));
   43.16    }
   43.17  
   43.18    CompileBroker::set_should_block();