src/share/vm/gc/cms/compactibleFreeListSpace.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2016, Oracle and/or its affiliates. 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,7 ----
  /*
!  * Copyright (c) 2001, 2017, Oracle and/or its affiliates. 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.
*** 21,37 ****
   * questions.
   *
   */
  
  #include "precompiled.hpp"
  #include "gc/cms/cmsLockVerifier.hpp"
  #include "gc/cms/compactibleFreeListSpace.hpp"
  #include "gc/cms/concurrentMarkSweepGeneration.inline.hpp"
  #include "gc/cms/concurrentMarkSweepThread.hpp"
  #include "gc/shared/blockOffsetTable.inline.hpp"
  #include "gc/shared/collectedHeap.inline.hpp"
- #include "gc/shared/genCollectedHeap.hpp"
  #include "gc/shared/space.inline.hpp"
  #include "gc/shared/spaceDecorator.hpp"
  #include "logging/logStream.inline.hpp"
  #include "memory/allocation.inline.hpp"
  #include "memory/resourceArea.hpp"
--- 21,37 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
+ #include "gc/cms/cmsHeap.hpp"
  #include "gc/cms/cmsLockVerifier.hpp"
  #include "gc/cms/compactibleFreeListSpace.hpp"
  #include "gc/cms/concurrentMarkSweepGeneration.inline.hpp"
  #include "gc/cms/concurrentMarkSweepThread.hpp"
  #include "gc/shared/blockOffsetTable.inline.hpp"
  #include "gc/shared/collectedHeap.inline.hpp"
  #include "gc/shared/space.inline.hpp"
  #include "gc/shared/spaceDecorator.hpp"
  #include "logging/logStream.inline.hpp"
  #include "memory/allocation.inline.hpp"
  #include "memory/resourceArea.hpp"
*** 151,161 ****
      do {
        // switch to next compaction space
        cp->space->set_compaction_top(compact_top);
        cp->space = cp->space->next_compaction_space();
        if (cp->space == NULL) {
!         cp->gen = GenCollectedHeap::heap()->young_gen();
          assert(cp->gen != NULL, "compaction must succeed");
          cp->space = cp->gen->first_compaction_space();
          assert(cp->space != NULL, "generation must have a first compaction space");
        }
        compact_top = cp->space->bottom();
--- 151,161 ----
      do {
        // switch to next compaction space
        cp->space->set_compaction_top(compact_top);
        cp->space = cp->space->next_compaction_space();
        if (cp->space == NULL) {
!         cp->gen = CMSHeap::heap()->young_gen();
          assert(cp->gen != NULL, "compaction must succeed");
          cp->space = cp->gen->first_compaction_space();
          assert(cp->space != NULL, "generation must have a first compaction space");
        }
        compact_top = cp->space->bottom();
*** 2298,2308 ****
      VerifyAllOopsClosure cl(_collector, this, span, past_remark,
        _collector->markBitMap());
  
      // Iterate over all oops in the heap. Uses the _no_header version
      // since we are not interested in following the klass pointers.
!     GenCollectedHeap::heap()->oop_iterate_no_header(&cl);
    }
  
    if (VerifyObjectStartArray) {
      // Verify the block offset table
      _bt.verify();
--- 2298,2308 ----
      VerifyAllOopsClosure cl(_collector, this, span, past_remark,
        _collector->markBitMap());
  
      // Iterate over all oops in the heap. Uses the _no_header version
      // since we are not interested in following the klass pointers.
!     CMSHeap::heap()->oop_iterate_no_header(&cl);
    }
  
    if (VerifyObjectStartArray) {
      // Verify the block offset table
      _bt.verify();