hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp

rev 611 : Merge

*** 1,10 ****
  #ifdef USE_PRAGMA_IDENT_SRC
  #pragma ident "@(#)psPermGen.cpp        1.28 07/05/05 17:05:30 JVM"
  #endif
  /*
!  * Copyright 2001-2005 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,10 ----
  #ifdef USE_PRAGMA_IDENT_SRC
  #pragma ident "@(#)psPermGen.cpp        1.28 07/05/05 17:05:30 JVM"
  #endif
  /*
!  * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 124,133 ****
    PSParallelCompact::move_and_update(cm, PSParallelCompact::perm_space_id);
  }
  
  void PSPermGen::precompact() {
    // Reset start array first.
-   debug_only(if (!UseParallelOldGC || !VerifyParallelOldWithMarkSweep) {)
    _start_array.reset();
-   debug_only(})
    object_mark_sweep()->precompact();
  }
--- 124,131 ----