src/share/vm/gc/g1/g1CollectedHeap.inline.hpp

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

*** 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.
*** 140,159 ****
  
  inline bool G1CollectedHeap::isMarkedNext(oop obj) const {
    return _cm->nextMarkBitMap()->isMarked((HeapWord *)obj);
  }
  
- // This is a fast test on whether a reference points into the
- // collection set or not. Assume that the reference
- // points into the heap.
  inline bool G1CollectedHeap::is_in_cset(oop obj) {
!   bool ret = _in_cset_fast_test.is_in_cset((HeapWord*)obj);
!   // let's make sure the result is consistent with what the slower
!   // test returns
!   assert( ret || !obj_in_cs(obj), "sanity");
!   assert(!ret ||  obj_in_cs(obj), "sanity");
!   return ret;
  }
  
  bool G1CollectedHeap::is_in_cset(const HeapRegion* hr) {
    return _in_cset_fast_test.is_in_cset(hr);
  }
--- 140,151 ----
  
  inline bool G1CollectedHeap::isMarkedNext(oop obj) const {
    return _cm->nextMarkBitMap()->isMarked((HeapWord *)obj);
  }
  
  inline bool G1CollectedHeap::is_in_cset(oop obj) {
!   return _in_cset_fast_test.is_in_cset((HeapWord*)obj);
  }
  
  bool G1CollectedHeap::is_in_cset(const HeapRegion* hr) {
    return _in_cset_fast_test.is_in_cset(hr);
  }