Tue, 13 Mar 2012 13:50:48 -0400
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
Summary: Fold instanceKlass::_enclosing_method_class_index and instanceKlass::_enclosing_method_method_index into the instanceKlass::_inner_classes array.
Reviewed-by: never, coleenp
Contributed-by: Jiangli Zhou <jiangli.zhou@oracle.com>
duke@435 | 1 | /* |
stefank@2314 | 2 | * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. |
duke@435 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@435 | 4 | * |
duke@435 | 5 | * This code is free software; you can redistribute it and/or modify it |
duke@435 | 6 | * under the terms of the GNU General Public License version 2 only, as |
duke@435 | 7 | * published by the Free Software Foundation. |
duke@435 | 8 | * |
duke@435 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@435 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@435 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@435 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@435 | 13 | * accompanied this code). |
duke@435 | 14 | * |
duke@435 | 15 | * You should have received a copy of the GNU General Public License version |
duke@435 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@435 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@435 | 18 | * |
trims@1907 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
trims@1907 | 20 | * or visit www.oracle.com if you need additional information or have any |
trims@1907 | 21 | * questions. |
duke@435 | 22 | * |
duke@435 | 23 | */ |
duke@435 | 24 | |
stefank@2314 | 25 | #ifndef SHARE_VM_OOPS_MARKOOP_INLINE_HPP |
stefank@2314 | 26 | #define SHARE_VM_OOPS_MARKOOP_INLINE_HPP |
stefank@2314 | 27 | |
stefank@2314 | 28 | #include "oops/klass.hpp" |
stefank@2314 | 29 | #include "oops/klassOop.hpp" |
stefank@2314 | 30 | #include "oops/markOop.hpp" |
stefank@2314 | 31 | #include "runtime/globals.hpp" |
stefank@2314 | 32 | |
ysr@2380 | 33 | // Should this header be preserved during GC (when biased locking is enabled)? |
duke@435 | 34 | inline bool markOopDesc::must_be_preserved_with_bias(oop obj_containing_mark) const { |
duke@435 | 35 | assert(UseBiasedLocking, "unexpected"); |
duke@435 | 36 | if (has_bias_pattern()) { |
duke@435 | 37 | // Will reset bias at end of collection |
duke@435 | 38 | // Mark words of biased and currently locked objects are preserved separately |
duke@435 | 39 | return false; |
duke@435 | 40 | } |
duke@435 | 41 | markOop prototype_header = prototype_for_object(obj_containing_mark); |
duke@435 | 42 | if (prototype_header->has_bias_pattern()) { |
duke@435 | 43 | // Individual instance which has its bias revoked; must return |
duke@435 | 44 | // true for correctness |
duke@435 | 45 | return true; |
duke@435 | 46 | } |
duke@435 | 47 | return (!is_unlocked() || !has_no_hash()); |
duke@435 | 48 | } |
duke@435 | 49 | |
ysr@2380 | 50 | // Should this header be preserved during GC? |
ysr@777 | 51 | inline bool markOopDesc::must_be_preserved(oop obj_containing_mark) const { |
ysr@777 | 52 | if (!UseBiasedLocking) |
ysr@777 | 53 | return (!is_unlocked() || !has_no_hash()); |
ysr@777 | 54 | return must_be_preserved_with_bias(obj_containing_mark); |
ysr@777 | 55 | } |
ysr@777 | 56 | |
ysr@2380 | 57 | // Should this header be preserved in the case of a promotion failure |
ysr@2380 | 58 | // during scavenge (when biased locking is enabled)? |
duke@435 | 59 | inline bool markOopDesc::must_be_preserved_with_bias_for_promotion_failure(oop obj_containing_mark) const { |
duke@435 | 60 | assert(UseBiasedLocking, "unexpected"); |
duke@435 | 61 | // We don't explicitly save off the mark words of biased and |
duke@435 | 62 | // currently-locked objects during scavenges, so if during a |
duke@435 | 63 | // promotion failure we encounter either a biased mark word or a |
duke@435 | 64 | // klass which still has a biasable prototype header, we have to |
duke@435 | 65 | // preserve the mark word. This results in oversaving, but promotion |
duke@435 | 66 | // failures are rare, and this avoids adding more complex logic to |
duke@435 | 67 | // the scavengers to call new variants of |
duke@435 | 68 | // BiasedLocking::preserve_marks() / restore_marks() in the middle |
duke@435 | 69 | // of a scavenge when a promotion failure has first been detected. |
duke@435 | 70 | if (has_bias_pattern() || |
duke@435 | 71 | prototype_for_object(obj_containing_mark)->has_bias_pattern()) { |
duke@435 | 72 | return true; |
duke@435 | 73 | } |
ysr@2380 | 74 | return (!is_unlocked() || !has_no_hash()); |
duke@435 | 75 | } |
duke@435 | 76 | |
ysr@2380 | 77 | // Should this header be preserved in the case of a promotion failure |
ysr@2380 | 78 | // during scavenge? |
ysr@777 | 79 | inline bool markOopDesc::must_be_preserved_for_promotion_failure(oop obj_containing_mark) const { |
ysr@777 | 80 | if (!UseBiasedLocking) |
ysr@2380 | 81 | return (!is_unlocked() || !has_no_hash()); |
ysr@777 | 82 | return must_be_preserved_with_bias_for_promotion_failure(obj_containing_mark); |
ysr@777 | 83 | } |
ysr@777 | 84 | |
ysr@777 | 85 | |
ysr@2380 | 86 | // Same as must_be_preserved_with_bias_for_promotion_failure() except that |
ysr@2380 | 87 | // it takes a klassOop argument, instead of the object of which this is the mark word. |
duke@435 | 88 | inline bool markOopDesc::must_be_preserved_with_bias_for_cms_scavenge(klassOop klass_of_obj_containing_mark) const { |
duke@435 | 89 | assert(UseBiasedLocking, "unexpected"); |
duke@435 | 90 | // CMS scavenges preserve mark words in similar fashion to promotion failures; see above |
duke@435 | 91 | if (has_bias_pattern() || |
duke@435 | 92 | klass_of_obj_containing_mark->klass_part()->prototype_header()->has_bias_pattern()) { |
duke@435 | 93 | return true; |
duke@435 | 94 | } |
ysr@2380 | 95 | return (!is_unlocked() || !has_no_hash()); |
duke@435 | 96 | } |
ysr@2380 | 97 | |
ysr@2380 | 98 | // Same as must_be_preserved_for_promotion_failure() except that |
ysr@2380 | 99 | // it takes a klassOop argument, instead of the object of which this is the mark word. |
ysr@777 | 100 | inline bool markOopDesc::must_be_preserved_for_cms_scavenge(klassOop klass_of_obj_containing_mark) const { |
ysr@777 | 101 | if (!UseBiasedLocking) |
ysr@2380 | 102 | return (!is_unlocked() || !has_no_hash()); |
ysr@777 | 103 | return must_be_preserved_with_bias_for_cms_scavenge(klass_of_obj_containing_mark); |
ysr@777 | 104 | } |
duke@435 | 105 | |
duke@435 | 106 | inline markOop markOopDesc::prototype_for_object(oop obj) { |
duke@435 | 107 | #ifdef ASSERT |
duke@435 | 108 | markOop prototype_header = obj->klass()->klass_part()->prototype_header(); |
duke@435 | 109 | assert(prototype_header == prototype() || prototype_header->has_bias_pattern(), "corrupt prototype header"); |
duke@435 | 110 | #endif |
duke@435 | 111 | return obj->klass()->klass_part()->prototype_header(); |
duke@435 | 112 | } |
stefank@2314 | 113 | |
stefank@2314 | 114 | #endif // SHARE_VM_OOPS_MARKOOP_INLINE_HPP |