src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp

*** 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2001, 2018, 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.
*** 5549,5559 ****
  // Same as above but for STW paths
  void CMSCollector::reset_stw() {
    // already have the lock
    assert(_collectorState == Resetting, "just checking");
    assert_lock_strong(bitMapLock());
!   GCIdMarkAndRestore gc_id_mark(_cmsThread->gc_id());
    _markBitMap.clear_all();
    _collectorState = Idling;
    register_gc_end();
  }
  
--- 5549,5559 ----
  // Same as above but for STW paths
  void CMSCollector::reset_stw() {
    // already have the lock
    assert(_collectorState == Resetting, "just checking");
    assert_lock_strong(bitMapLock());
!   GCIdMark gc_id_mark(_cmsThread->gc_id());
    _markBitMap.clear_all();
    _collectorState = Idling;
    register_gc_end();
  }