Mercurial > hg > graal-compiler
comparison src/share/vm/oops/objArrayKlass.inline.hpp @ 8002:8391fdd36e1f
Merge
author | dlong |
---|---|
date | Sun, 27 Jan 2013 01:07:09 -0800 |
parents | db9981fd3124 |
children | de6a9e811145 |
comparison
equal
deleted
inserted
replaced
7946:6fbe8a57549d | 8002:8391fdd36e1f |
---|---|
25 #ifndef SHARE_VM_OOPS_OBJARRAYKLASS_INLINE_HPP | 25 #ifndef SHARE_VM_OOPS_OBJARRAYKLASS_INLINE_HPP |
26 #define SHARE_VM_OOPS_OBJARRAYKLASS_INLINE_HPP | 26 #define SHARE_VM_OOPS_OBJARRAYKLASS_INLINE_HPP |
27 | 27 |
28 #include "gc_implementation/shared/markSweep.inline.hpp" | 28 #include "gc_implementation/shared/markSweep.inline.hpp" |
29 #include "oops/objArrayKlass.hpp" | 29 #include "oops/objArrayKlass.hpp" |
30 #ifndef SERIALGC | 30 #include "utilities/macros.hpp" |
31 #if INCLUDE_ALL_GCS | |
31 #include "gc_implementation/parallelScavenge/psCompactionManager.inline.hpp" | 32 #include "gc_implementation/parallelScavenge/psCompactionManager.inline.hpp" |
32 #include "gc_implementation/parallelScavenge/psParallelCompact.hpp" | 33 #include "gc_implementation/parallelScavenge/psParallelCompact.hpp" |
33 #endif | 34 #endif // INCLUDE_ALL_GCS |
34 | 35 |
35 void ObjArrayKlass::oop_follow_contents(oop obj, int index) { | 36 void ObjArrayKlass::oop_follow_contents(oop obj, int index) { |
36 if (UseCompressedOops) { | 37 if (UseCompressedOops) { |
37 objarray_follow_contents<narrowOop>(obj, index); | 38 objarray_follow_contents<narrowOop>(obj, index); |
38 } else { | 39 } else { |
61 if (end_index < len) { | 62 if (end_index < len) { |
62 MarkSweep::push_objarray(a, end_index); // Push the continuation. | 63 MarkSweep::push_objarray(a, end_index); // Push the continuation. |
63 } | 64 } |
64 } | 65 } |
65 | 66 |
66 #ifndef SERIALGC | 67 #if INCLUDE_ALL_GCS |
67 void ObjArrayKlass::oop_follow_contents(ParCompactionManager* cm, oop obj, | 68 void ObjArrayKlass::oop_follow_contents(ParCompactionManager* cm, oop obj, |
68 int index) { | 69 int index) { |
69 if (UseCompressedOops) { | 70 if (UseCompressedOops) { |
70 objarray_follow_contents<narrowOop>(cm, obj, index); | 71 objarray_follow_contents<narrowOop>(cm, obj, index); |
71 } else { | 72 } else { |
94 | 95 |
95 if (end_index < len) { | 96 if (end_index < len) { |
96 cm->push_objarray(a, end_index); // Push the continuation. | 97 cm->push_objarray(a, end_index); // Push the continuation. |
97 } | 98 } |
98 } | 99 } |
99 #endif // #ifndef SERIALGC | 100 #endif // INCLUDE_ALL_GCS |
100 | 101 |
101 #endif // SHARE_VM_OOPS_OBJARRAYKLASS_INLINE_HPP | 102 #endif // SHARE_VM_OOPS_OBJARRAYKLASS_INLINE_HPP |