1.1 --- a/src/share/vm/oops/markOop.hpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/oops/markOop.hpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2012, 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 @@ -261,9 +261,9 @@
1.11 // Should this header be preserved during a scavenge where CMS is
1.12 // the old generation?
1.13 // (This is basically the same body as must_be_preserved_for_promotion_failure(),
1.14 - // but takes the klassOop as argument instead)
1.15 - inline bool must_be_preserved_for_cms_scavenge(klassOop klass_of_obj_containing_mark) const;
1.16 - inline bool must_be_preserved_with_bias_for_cms_scavenge(klassOop klass_of_obj_containing_mark) const;
1.17 + // but takes the Klass* as argument instead)
1.18 + inline bool must_be_preserved_for_cms_scavenge(Klass* klass_of_obj_containing_mark) const;
1.19 + inline bool must_be_preserved_with_bias_for_cms_scavenge(Klass* klass_of_obj_containing_mark) const;
1.20
1.21 // WARNING: The following routines are used EXCLUSIVELY by
1.22 // synchronization functions. They are not really gc safe.
1.23 @@ -331,6 +331,7 @@
1.24
1.25 // age operations
1.26 markOop set_marked() { return markOop((value() & ~lock_mask_in_place) | marked_value); }
1.27 + markOop set_unmarked() { return markOop((value() & ~lock_mask_in_place) | unlocked_value); }
1.28
1.29 int age() const { return mask_bits(value() >> age_shift, age_mask); }
1.30 markOop set_age(int v) const {
1.31 @@ -365,9 +366,6 @@
1.32 // Recover address of oop from encoded form used in mark
1.33 inline void* decode_pointer() { if (UseBiasedLocking && has_bias_pattern()) return NULL; return clear_lock_bits(); }
1.34
1.35 - // see the definition in markOop.cpp for the gory details
1.36 - bool should_not_be_cached() const;
1.37 -
1.38 // These markOops indicate cms free chunk blocks and not objects.
1.39 // In 64 bit, the markOop is set to distinguish them from oops.
1.40 // These are defined in 32 bit mode for vmStructs.
