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

     1.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp	Wed Dec 26 15:05:30 2012 -0800
     1.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp	Wed Jan 02 11:32:41 2013 -0800
     1.3 @@ -164,7 +164,6 @@
     1.4          start_array->allocate_block(compact_top);
     1.5        }
     1.6  
     1.7 -      VALIDATE_MARK_SWEEP_ONLY(MarkSweep::register_live_oop(oop(q), size));
     1.8        compact_top += size;
     1.9        assert(compact_top <= dest->space()->end(),
    1.10          "Exceeding space in destination");
    1.11 @@ -225,7 +224,6 @@
    1.12              start_array->allocate_block(compact_top);
    1.13            }
    1.14  
    1.15 -          VALIDATE_MARK_SWEEP_ONLY(MarkSweep::register_live_oop(oop(q), sz));
    1.16            compact_top += sz;
    1.17            assert(compact_top <= dest->space()->end(),
    1.18              "Exceeding space in destination");
    1.19 @@ -304,11 +302,8 @@
    1.20      HeapWord* end = _first_dead;
    1.21  
    1.22      while (q < end) {
    1.23 -      VALIDATE_MARK_SWEEP_ONLY(MarkSweep::track_interior_pointers(oop(q)));
    1.24        // point all the oops to the new location
    1.25        size_t size = oop(q)->adjust_pointers();
    1.26 -      VALIDATE_MARK_SWEEP_ONLY(MarkSweep::check_interior_pointers());
    1.27 -      VALIDATE_MARK_SWEEP_ONLY(MarkSweep::validate_live_oop(oop(q), size));
    1.28        q += size;
    1.29      }
    1.30  
    1.31 @@ -328,11 +323,8 @@
    1.32      Prefetch::write(q, interval);
    1.33      if (oop(q)->is_gc_marked()) {
    1.34        // q is alive
    1.35 -      VALIDATE_MARK_SWEEP_ONLY(MarkSweep::track_interior_pointers(oop(q)));
    1.36        // point all the oops to the new location
    1.37        size_t size = oop(q)->adjust_pointers();
    1.38 -      VALIDATE_MARK_SWEEP_ONLY(MarkSweep::check_interior_pointers());
    1.39 -      VALIDATE_MARK_SWEEP_ONLY(MarkSweep::validate_live_oop(oop(q), size));
    1.40        debug_only(prev_q = q);
    1.41        q += size;
    1.42      } else {
    1.43 @@ -366,7 +358,6 @@
    1.44      while (q < end) {
    1.45        size_t size = oop(q)->size();
    1.46        assert(!oop(q)->is_gc_marked(), "should be unmarked (special dense prefix handling)");
    1.47 -      VALIDATE_MARK_SWEEP_ONLY(MarkSweep::live_oop_moved_to(q, size, q));
    1.48        debug_only(prev_q = q);
    1.49        q += size;
    1.50      }
    1.51 @@ -401,7 +392,6 @@
    1.52        Prefetch::write(compaction_top, copy_interval);
    1.53  
    1.54        // copy object and reinit its mark
    1.55 -      VALIDATE_MARK_SWEEP_ONLY(MarkSweep::live_oop_moved_to(q, size, compaction_top));
    1.56        assert(q != compaction_top, "everything in this pass should be moving");
    1.57        Copy::aligned_conjoint_words(q, compaction_top, size);
    1.58        oop(compaction_top)->init_mark();