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

     1.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp	Fri Aug 31 16:39:35 2012 -0700
     1.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp	Sat Sep 01 13:25:18 2012 -0400
     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 @@ -43,19 +43,11 @@
    1.11    _destination_decorator = heap->old_gen()->object_mark_sweep();
    1.12  }
    1.13  
    1.14 -void PSMarkSweepDecorator::set_destination_decorator_perm_gen() {
    1.15 -  ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
    1.16 -  assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
    1.17 -
    1.18 -  _destination_decorator = heap->perm_gen()->object_mark_sweep();
    1.19 -}
    1.20 -
    1.21  void PSMarkSweepDecorator::advance_destination_decorator() {
    1.22    ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
    1.23    assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
    1.24  
    1.25    assert(_destination_decorator != NULL, "Sanity");
    1.26 -  guarantee(_destination_decorator != heap->perm_gen()->object_mark_sweep(), "Cannot advance perm gen decorator");
    1.27  
    1.28    PSMarkSweepDecorator* first = heap->old_gen()->object_mark_sweep();
    1.29    PSMarkSweepDecorator* second = heap->young_gen()->eden_mark_sweep();