src/share/vm/gc/g1/g1ParScanThreadState.cpp

rev 10310 : imported patch 8150629-test

*** 1,7 ****
  /*
!  * Copyright (c) 2014, 2015, 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) 2014, 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.
*** 325,334 ****
--- 325,337 ----
    }
  }
  
  G1ParScanThreadState* G1ParScanThreadStateSet::state_for_worker(uint worker_id) {
    assert(worker_id < _n_workers, "out of bounds access");
+   if (_states[worker_id] == NULL) {
+     _states[worker_id] = new_par_scan_state(worker_id, _young_cset_length);
+   }
    return _states[worker_id];
  }
  
  void G1ParScanThreadStateSet::add_cards_scanned(uint worker_id, size_t cards_scanned) {
    assert(worker_id < _n_workers, "out of bounds access");
*** 350,359 ****
--- 353,366 ----
    assert(_total_cards_scanned == 0, "should have been cleared");
  
    for (uint worker_index = 0; worker_index < _n_workers; ++worker_index) {
      G1ParScanThreadState* pss = _states[worker_index];
  
+     if (pss == NULL) {
+       continue;
+     }
+ 
      _total_cards_scanned += _cards_scanned[worker_index];
  
      pss->flush(_surviving_young_words_total);
      delete pss;
      _states[worker_index] = NULL;