Mercurial > hg > graal-jvmci-8
comparison src/share/vm/oops/oop.psgc.inline.hpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 Nov 2012 23:14:12 +0100 |
parents | d8ce2825b193 |
children | db9981fd3124 |
comparison
equal
deleted
inserted
replaced
6711:ae13cc658b80 | 6948:e522a00b91aa |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
32 #endif | 32 #endif |
33 | 33 |
34 // ParallelScavengeHeap methods | 34 // ParallelScavengeHeap methods |
35 | 35 |
36 inline void oopDesc::push_contents(PSPromotionManager* pm) { | 36 inline void oopDesc::push_contents(PSPromotionManager* pm) { |
37 Klass* klass = blueprint(); | 37 Klass* k = klass(); |
38 if (!klass->oop_is_typeArray()) { | 38 if (!k->oop_is_typeArray()) { |
39 // It might contain oops beyond the header, so take the virtual call. | 39 // It might contain oops beyond the header, so take the virtual call. |
40 klass->oop_push_contents(pm, this); | 40 k->oop_push_contents(pm, this); |
41 } | 41 } |
42 // Else skip it. The typeArrayKlass in the header never needs scavenging. | 42 // Else skip it. The TypeArrayKlass in the header never needs scavenging. |
43 } | 43 } |
44 | 44 |
45 #endif // SHARE_VM_OOPS_OOP_PSGC_INLINE_HPP | 45 #endif // SHARE_VM_OOPS_OOP_PSGC_INLINE_HPP |