Mercurial > hg > graal-compiler
view src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp @ 17833:bfdf528be8e8
8038498: Fix includes and C inlining after 8035330
Summary: Change 8035330: Remove G1ParScanPartialArrayClosure and G1ParScanHeapEvacClosure broke the debug build on AIX. The method do_oop_partial_array() is added in a header, but requires the inline function par_write_ref() through several inlined calls. In some cpp files, like arguments.cpp, par_write_ref() is not defined as the corresponding inline header and is not included. The AIX debug VM does not start because of the missing symbol. This change solves this by cleaning up include dependencies.
Reviewed-by: tschatzl, stefank
author | tschatzl |
---|---|
date | Fri, 04 Apr 2014 10:43:56 +0200 |
parents | 8ee855b4e667 |
children | 14bd75c9dbfa |
line wrap: on
line source
/* * Copyright (c) 2011, 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. * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. * */ #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSET_INLINE_HPP #define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSET_INLINE_HPP #include "gc_implementation/g1/heapRegionSet.hpp" inline void HeapRegionSetBase::add(HeapRegion* hr) { check_mt_safety(); assert(hr->containing_set() == NULL, hrs_ext_msg(this, "should not already have a containing set %u")); assert(hr->next() == NULL, hrs_ext_msg(this, "should not already be linked")); _count.increment(1u, hr->capacity()); hr->set_containing_set(this); verify_region(hr); } inline void HeapRegionSetBase::remove(HeapRegion* hr) { check_mt_safety(); verify_region(hr); assert(hr->next() == NULL, hrs_ext_msg(this, "should already be unlinked")); hr->set_containing_set(NULL); assert(_count.length() > 0, hrs_ext_msg(this, "pre-condition")); _count.decrement(1u, hr->capacity()); } inline void FreeRegionList::add_ordered(HeapRegion* hr) { check_mt_safety(); assert((length() == 0 && _head == NULL && _tail == NULL) || (length() > 0 && _head != NULL && _tail != NULL), hrs_ext_msg(this, "invariant")); // add() will verify the region and check mt safety. add(hr); // Now link the region if (_head != NULL) { HeapRegion* curr; if (_last != NULL && _last->hrs_index() < hr->hrs_index()) { curr = _last; } else { curr = _head; } // Find first entry with a Region Index larger than entry to insert. while (curr != NULL && curr->hrs_index() < hr->hrs_index()) { curr = curr->next(); } hr->set_next(curr); if (curr == NULL) { // Adding at the end hr->set_prev(_tail); _tail->set_next(hr); _tail = hr; } else if (curr->prev() == NULL) { // Adding at the beginning hr->set_prev(NULL); _head = hr; curr->set_prev(hr); } else { hr->set_prev(curr->prev()); hr->prev()->set_next(hr); curr->set_prev(hr); } } else { // The list was empty _tail = hr; _head = hr; } _last = hr; } inline void FreeRegionList::add_as_head(HeapRegion* hr) { assert((length() == 0 && _head == NULL && _tail == NULL) || (length() > 0 && _head != NULL && _tail != NULL), hrs_ext_msg(this, "invariant")); // add() will verify the region and check mt safety. add(hr); // Now link the region. if (_head != NULL) { hr->set_next(_head); _head->set_prev(hr); } else { _tail = hr; } _head = hr; } inline void FreeRegionList::add_as_tail(HeapRegion* hr) { check_mt_safety(); assert((length() == 0 && _head == NULL && _tail == NULL) || (length() > 0 && _head != NULL && _tail != NULL), hrs_ext_msg(this, "invariant")); // add() will verify the region and check mt safety. add(hr); // Now link the region. if (_tail != NULL) { _tail->set_next(hr); hr->set_prev(_tail); } else { _head = hr; } _tail = hr; } inline HeapRegion* FreeRegionList::remove_head() { assert(!is_empty(), hrs_ext_msg(this, "the list should not be empty")); assert(length() > 0 && _head != NULL && _tail != NULL, hrs_ext_msg(this, "invariant")); // We need to unlink it first. HeapRegion* hr = _head; _head = hr->next(); if (_head == NULL) { _tail = NULL; } else { _head->set_prev(NULL); } hr->set_next(NULL); if (_last == hr) { _last = NULL; } // remove() will verify the region and check mt safety. remove(hr); return hr; } inline HeapRegion* FreeRegionList::remove_head_or_null() { check_mt_safety(); if (!is_empty()) { return remove_head(); } else { return NULL; } } inline HeapRegion* FreeRegionList::remove_tail() { assert(!is_empty(), hrs_ext_msg(this, "The list should not be empty")); assert(length() > 0 && _head != NULL && _tail != NULL, hrs_ext_msg(this, "invariant")); // We need to unlink it first HeapRegion* hr = _tail; _tail = hr->prev(); if (_tail == NULL) { _head = NULL; } else { _tail->set_next(NULL); } hr->set_prev(NULL); if (_last == hr) { _last = NULL; } // remove() will verify the region and check mt safety. remove(hr); return hr; } inline HeapRegion* FreeRegionList::remove_tail_or_null() { check_mt_safety(); if (!is_empty()) { return remove_tail(); } else { return NULL; } } inline HeapRegion* FreeRegionList::remove_region(bool from_head) { if (from_head) { return remove_head_or_null(); } else { return remove_tail_or_null(); } } #endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSET_INLINE_HPP