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

rev 12504 : imported patch 8162104-use-is_in_cset-instead-of-obj_in_cs

*** 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2014, 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.
*** 111,121 ****
  bool G1ParScanThreadState::verify_ref(oop* ref) const {
    assert(ref != NULL, "invariant");
    if (has_partial_array_mask(ref)) {
      // Must be in the collection set--it's already been copied.
      oop p = clear_partial_array_mask(ref);
!     assert(_g1h->obj_in_cs(p),
             "ref=" PTR_FORMAT " p=" PTR_FORMAT, p2i(ref), p2i(p));
    } else {
      oop p = oopDesc::load_decode_heap_oop(ref);
      assert(_g1h->is_in_g1_reserved(p),
             "ref=" PTR_FORMAT " p=" PTR_FORMAT, p2i(ref), p2i(p));
--- 111,121 ----
  bool G1ParScanThreadState::verify_ref(oop* ref) const {
    assert(ref != NULL, "invariant");
    if (has_partial_array_mask(ref)) {
      // Must be in the collection set--it's already been copied.
      oop p = clear_partial_array_mask(ref);
!     assert(_g1h->is_in_cset(p),
             "ref=" PTR_FORMAT " p=" PTR_FORMAT, p2i(ref), p2i(p));
    } else {
      oop p = oopDesc::load_decode_heap_oop(ref);
      assert(_g1h->is_in_g1_reserved(p),
             "ref=" PTR_FORMAT " p=" PTR_FORMAT, p2i(ref), p2i(p));
*** 370,380 ****
    }
    _flushed = true;
  }
  
  oop G1ParScanThreadState::handle_evacuation_failure_par(oop old, markOop m) {
!   assert(_g1h->obj_in_cs(old), "Object " PTR_FORMAT " should be in the CSet", p2i(old));
  
    oop forward_ptr = old->forward_to_atomic(old);
    if (forward_ptr == NULL) {
      // Forward-to-self succeeded. We are the "owner" of the object.
      HeapRegion* r = _g1h->heap_region_containing(old);
--- 370,380 ----
    }
    _flushed = true;
  }
  
  oop G1ParScanThreadState::handle_evacuation_failure_par(oop old, markOop m) {
!   assert(_g1h->is_in_cset(old), "Object " PTR_FORMAT " should be in the CSet", p2i(old));
  
    oop forward_ptr = old->forward_to_atomic(old);
    if (forward_ptr == NULL) {
      // Forward-to-self succeeded. We are the "owner" of the object.
      HeapRegion* r = _g1h->heap_region_containing(old);
*** 392,402 ****
      return old;
    } else {
      // Forward-to-self failed. Either someone else managed to allocate
      // space for this object (old != forward_ptr) or they beat us in
      // self-forwarding it (old == forward_ptr).
!     assert(old == forward_ptr || !_g1h->obj_in_cs(forward_ptr),
             "Object " PTR_FORMAT " forwarded to: " PTR_FORMAT " "
             "should not be in the CSet",
             p2i(old), p2i(forward_ptr));
      return forward_ptr;
    }
--- 392,402 ----
      return old;
    } else {
      // Forward-to-self failed. Either someone else managed to allocate
      // space for this object (old != forward_ptr) or they beat us in
      // self-forwarding it (old == forward_ptr).
!     assert(old == forward_ptr || !_g1h->is_in_cset(forward_ptr),
             "Object " PTR_FORMAT " forwarded to: " PTR_FORMAT " "
             "should not be in the CSet",
             p2i(old), p2i(forward_ptr));
      return forward_ptr;
    }