1.1 --- a/src/share/vm/oops/markOop.inline.hpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/oops/markOop.inline.hpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2006, 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 @@ -26,7 +26,6 @@
1.11 #define SHARE_VM_OOPS_MARKOOP_INLINE_HPP
1.12
1.13 #include "oops/klass.hpp"
1.14 -#include "oops/klassOop.hpp"
1.15 #include "oops/markOop.hpp"
1.16 #include "runtime/globals.hpp"
1.17
1.18 @@ -84,20 +83,20 @@
1.19
1.20
1.21 // Same as must_be_preserved_with_bias_for_promotion_failure() except that
1.22 -// it takes a klassOop argument, instead of the object of which this is the mark word.
1.23 -inline bool markOopDesc::must_be_preserved_with_bias_for_cms_scavenge(klassOop klass_of_obj_containing_mark) const {
1.24 +// it takes a Klass* argument, instead of the object of which this is the mark word.
1.25 +inline bool markOopDesc::must_be_preserved_with_bias_for_cms_scavenge(Klass* klass_of_obj_containing_mark) const {
1.26 assert(UseBiasedLocking, "unexpected");
1.27 // CMS scavenges preserve mark words in similar fashion to promotion failures; see above
1.28 if (has_bias_pattern() ||
1.29 - klass_of_obj_containing_mark->klass_part()->prototype_header()->has_bias_pattern()) {
1.30 + klass_of_obj_containing_mark->prototype_header()->has_bias_pattern()) {
1.31 return true;
1.32 }
1.33 return (!is_unlocked() || !has_no_hash());
1.34 }
1.35
1.36 // Same as must_be_preserved_for_promotion_failure() except that
1.37 -// it takes a klassOop argument, instead of the object of which this is the mark word.
1.38 -inline bool markOopDesc::must_be_preserved_for_cms_scavenge(klassOop klass_of_obj_containing_mark) const {
1.39 +// it takes a Klass* argument, instead of the object of which this is the mark word.
1.40 +inline bool markOopDesc::must_be_preserved_for_cms_scavenge(Klass* klass_of_obj_containing_mark) const {
1.41 if (!UseBiasedLocking)
1.42 return (!is_unlocked() || !has_no_hash());
1.43 return must_be_preserved_with_bias_for_cms_scavenge(klass_of_obj_containing_mark);
1.44 @@ -105,10 +104,10 @@
1.45
1.46 inline markOop markOopDesc::prototype_for_object(oop obj) {
1.47 #ifdef ASSERT
1.48 - markOop prototype_header = obj->klass()->klass_part()->prototype_header();
1.49 + markOop prototype_header = obj->klass()->prototype_header();
1.50 assert(prototype_header == prototype() || prototype_header->has_bias_pattern(), "corrupt prototype header");
1.51 #endif
1.52 - return obj->klass()->klass_part()->prototype_header();
1.53 + return obj->klass()->prototype_header();
1.54 }
1.55
1.56 #endif // SHARE_VM_OOPS_MARKOOP_INLINE_HPP
