comparison src/share/vm/oops/oop.pcgc.inline.hpp @ 8001:db9981fd3124

8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS Summary: Rename INCLUDE_ALTERNATE_GCS to INCLUDE_ALL_GCS and replace SERIALGC with INCLUDE_ALL_GCS. Reviewed-by: coleenp, stefank
author jprovino
date Wed, 23 Jan 2013 13:02:39 -0500
parents d8ce2825b193
children ad72068ac41e
comparison
equal deleted inserted replaced
7619:46e60405583b 8001:db9981fd3124
23 */ 23 */
24 24
25 #ifndef SHARE_VM_OOPS_OOP_PCGC_INLINE_HPP 25 #ifndef SHARE_VM_OOPS_OOP_PCGC_INLINE_HPP
26 #define SHARE_VM_OOPS_OOP_PCGC_INLINE_HPP 26 #define SHARE_VM_OOPS_OOP_PCGC_INLINE_HPP
27 27
28 #ifndef SERIALGC 28 #include "utilities/macros.hpp"
29 #if INCLUDE_ALL_GCS
29 #include "gc_implementation/parNew/parNewGeneration.hpp" 30 #include "gc_implementation/parNew/parNewGeneration.hpp"
30 #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" 31 #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
31 #include "gc_implementation/parallelScavenge/psCompactionManager.hpp" 32 #include "gc_implementation/parallelScavenge/psCompactionManager.hpp"
32 #include "gc_implementation/parallelScavenge/psParallelCompact.hpp" 33 #include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
33 #include "gc_implementation/parallelScavenge/psScavenge.hpp" 34 #include "gc_implementation/parallelScavenge/psScavenge.hpp"
34 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp" 35 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
35 #endif 36 #endif // INCLUDE_ALL_GCS
36 37
37 inline void oopDesc::update_contents(ParCompactionManager* cm) { 38 inline void oopDesc::update_contents(ParCompactionManager* cm) {
38 // The klass field must be updated before anything else 39 // The klass field must be updated before anything else
39 // can be done. 40 // can be done.
40 DEBUG_ONLY(Klass* original_klass = klass()); 41 DEBUG_ONLY(Klass* original_klass = klass());