Mercurial > hg > graal-jvmci-8
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/oops/oop.psgc.inline.hpp Mon Nov 12 18:11:17 2012 +0100 +++ b/src/share/vm/oops/oop.psgc.inline.hpp Mon Nov 12 23:14:12 2012 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,12 +34,12 @@ // ParallelScavengeHeap methods inline void oopDesc::push_contents(PSPromotionManager* pm) { - Klass* klass = blueprint(); - if (!klass->oop_is_typeArray()) { + Klass* k = klass(); + if (!k->oop_is_typeArray()) { // It might contain oops beyond the header, so take the virtual call. - klass->oop_push_contents(pm, this); + k->oop_push_contents(pm, this); } - // Else skip it. The typeArrayKlass in the header never needs scavenging. + // Else skip it. The TypeArrayKlass in the header never needs scavenging. } #endif // SHARE_VM_OOPS_OOP_PSGC_INLINE_HPP