1.1 --- a/src/share/vm/oops/oop.pcgc.inline.hpp Mon Feb 07 22:19:57 2011 -0800
1.2 +++ b/src/share/vm/oops/oop.pcgc.inline.hpp Tue Feb 08 12:33:19 2011 +0100
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -57,41 +57,6 @@
1.11 // Else skip it. The typeArrayKlass in the header never needs scavenging.
1.12 }
1.13
1.14 -inline void oopDesc::update_contents(ParCompactionManager* cm,
1.15 - HeapWord* begin_limit,
1.16 - HeapWord* end_limit) {
1.17 - // The klass field must be updated before anything else
1.18 - // can be done.
1.19 - debug_only(klassOopDesc* original_klass = klass());
1.20 -
1.21 - update_contents(cm, klass(), begin_limit, end_limit);
1.22 -}
1.23 -
1.24 -inline void oopDesc::update_contents(ParCompactionManager* cm,
1.25 - klassOop old_klass,
1.26 - HeapWord* begin_limit,
1.27 - HeapWord* end_limit) {
1.28 -
1.29 - klassOop updated_klass =
1.30 - PSParallelCompact::summary_data().calc_new_klass(old_klass);
1.31 -
1.32 - // Needs to be boundary aware for the 64 bit case
1.33 - // update_header();
1.34 - // The klass has moved. Is the location of the klass
1.35 - // within the limits?
1.36 - if ((((HeapWord*)&_metadata._klass) >= begin_limit) &&
1.37 - (((HeapWord*)&_metadata._klass) < end_limit)) {
1.38 - set_klass(updated_klass);
1.39 - }
1.40 -
1.41 - Klass* klass = updated_klass->klass_part();
1.42 - if (!klass->oop_is_typeArray()) {
1.43 - // It might contain oops beyond the header, so take the virtual call.
1.44 - klass->oop_update_pointers(cm, this, begin_limit, end_limit);
1.45 - }
1.46 - // Else skip it. The typeArrayKlass in the header never needs scavenging.
1.47 -}
1.48 -
1.49 inline void oopDesc::follow_contents(ParCompactionManager* cm) {
1.50 assert (PSParallelCompact::mark_bitmap()->is_marked(this),
1.51 "should be marked");
1.52 @@ -140,13 +105,4 @@
1.53 }
1.54 }
1.55
1.56 -inline void oopDesc::update_header(HeapWord* beg_addr, HeapWord* end_addr) {
1.57 - if (UseCompressedOops) {
1.58 - PSParallelCompact::adjust_pointer(compressed_klass_addr(),
1.59 - beg_addr, end_addr);
1.60 - } else {
1.61 - PSParallelCompact::adjust_pointer(klass_addr(), beg_addr, end_addr);
1.62 - }
1.63 -}
1.64 -
1.65 #endif // SHARE_VM_OOPS_OOP_PCGC_INLINE_HPP
