Mercurial > hg > truffle

comparison src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp @ 20804:7848fc12602b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u40-b25
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Tue, 07 Apr 2015 14:58:49 +0200
parents 52b4284cb496 ee019285a52c
children
comparison
equal deleted inserted replaced
20184:84105dcdb05b 20804:7848fc12602b
25 #ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_INLINE_HPP 25 #ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_INLINE_HPP
26 #define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_INLINE_HPP 26 #define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_INLINE_HPP
27 27
28 #include "gc_implementation/parallelScavenge/psOldGen.hpp" 28 #include "gc_implementation/parallelScavenge/psOldGen.hpp"
29 #include "gc_implementation/parallelScavenge/psPromotionManager.hpp" 29 #include "gc_implementation/parallelScavenge/psPromotionManager.hpp"
30 #include "gc_implementation/parallelScavenge/psPromotionLAB.inline.hpp"
30 #include "gc_implementation/parallelScavenge/psScavenge.hpp" 31 #include "gc_implementation/parallelScavenge/psScavenge.hpp"
31 #include "oops/oop.psgc.inline.hpp" 32 #include "oops/oop.psgc.inline.hpp"
32 33
33 inline PSPromotionManager* PSPromotionManager::manager_array(int index) { 34 inline PSPromotionManager* PSPromotionManager::manager_array(int index) {
34 assert(_manager_array != NULL, "access of NULL manager_array"); 35 assert(_manager_array != NULL, "access of NULL manager_array");