comparison src/share/vm/oops/objArrayKlass.inline.hpp @ 2044:06f017f7daa7

Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Fri, 07 Jan 2011 18:18:08 +0100
parents f95d63e2154a
children da91efe96a93
comparison
equal deleted inserted replaced
1942:00bc9eaf0e24 2044:06f017f7daa7
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 * or visit www.oracle.com if you need additional information or have any 20 * or visit www.oracle.com if you need additional information or have any
21 * questions. 21 * questions.
22 * 22 *
23 */ 23 */
24
25 #ifndef SHARE_VM_OOPS_OBJARRAYKLASS_INLINE_HPP
26 #define SHARE_VM_OOPS_OBJARRAYKLASS_INLINE_HPP
27
28 #include "oops/objArrayKlass.hpp"
29 #ifndef SERIALGC
30 #include "gc_implementation/parallelScavenge/psCompactionManager.inline.hpp"
31 #include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
32 #endif
24 33
25 void objArrayKlass::oop_follow_contents(oop obj, int index) { 34 void objArrayKlass::oop_follow_contents(oop obj, int index) {
26 if (UseCompressedOops) { 35 if (UseCompressedOops) {
27 objarray_follow_contents<narrowOop>(obj, index); 36 objarray_follow_contents<narrowOop>(obj, index);
28 } else { 37 } else {
85 if (end_index < len) { 94 if (end_index < len) {
86 cm->push_objarray(a, end_index); // Push the continuation. 95 cm->push_objarray(a, end_index); // Push the continuation.
87 } 96 }
88 } 97 }
89 #endif // #ifndef SERIALGC 98 #endif // #ifndef SERIALGC
99
100 #endif // SHARE_VM_OOPS_OBJARRAYKLASS_INLINE_HPP