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

rev 7780 : imported patch 8072621

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2014, 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, 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.
*** 129,140 ****
    HeapRegion* r = _hrm.addr_to_region((HeapWord*) obj);
    return r != NULL && r->in_collection_set();
  }
  
  inline HeapWord* G1CollectedHeap::attempt_allocation(size_t word_size,
!                                                      unsigned int* gc_count_before_ret,
!                                                      int* gclocker_retry_count_ret) {
    assert_heap_not_locked_and_not_at_safepoint();
    assert(!is_humongous(word_size), "attempt_allocation() should not "
           "be called for humongous allocation requests");
  
    AllocationContext_t context = AllocationContext::current();
--- 129,140 ----
    HeapRegion* r = _hrm.addr_to_region((HeapWord*) obj);
    return r != NULL && r->in_collection_set();
  }
  
  inline HeapWord* G1CollectedHeap::attempt_allocation(size_t word_size,
!                                                      uint* gc_count_before_ret,
!                                                      uint* gclocker_retry_count_ret) {
    assert_heap_not_locked_and_not_at_safepoint();
    assert(!is_humongous(word_size), "attempt_allocation() should not "
           "be called for humongous allocation requests");
  
    AllocationContext_t context = AllocationContext::current();