Mercurial > hg > truffle
annotate src/share/vm/oops/instanceKlass.cpp @ 20785:9906d432d6db jdk8u31-b11
8064524: Compiler code generation improvements
Reviewed-by: jrose, acorn, vlivanov
| author | drchase |
|---|---|
| date | Mon, 01 Dec 2014 13:06:20 -0500 |
| parents | bd4d69d9cb7d |
| children | c4f1e23c4139 |
| rev | line source |
|---|---|
| 0 | 1 /* |
|
17674
85318d1fe8fe
8027146: Class loading verification failure if GC occurs in Universe::flush_dependents_on
coleenp
parents:
17464
diff
changeset
|
2 * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. |
| 0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
| 4 * | |
| 5 * This code is free software; you can redistribute it and/or modify it | |
| 6 * under the terms of the GNU General Public License version 2 only, as | |
| 7 * published by the Free Software Foundation. | |
| 8 * | |
| 9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
| 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 12 * version 2 for more details (a copy is included in the LICENSE file that | |
| 13 * accompanied this code). | |
| 14 * | |
| 15 * You should have received a copy of the GNU General Public License version | |
| 16 * 2 along with this work; if not, write to the Free Software Foundation, | |
| 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
| 18 * | |
|
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1490
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1490
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1490
diff
changeset
|
21 * questions. |
| 0 | 22 * |
| 23 */ | |
| 24 | |
| 1972 | 25 #include "precompiled.hpp" |
| 26 #include "classfile/javaClasses.hpp" | |
| 27 #include "classfile/systemDictionary.hpp" | |
| 28 #include "classfile/verifier.hpp" | |
| 29 #include "classfile/vmSymbols.hpp" | |
| 30 #include "compiler/compileBroker.hpp" | |
| 31 #include "gc_implementation/shared/markSweep.inline.hpp" | |
| 32 #include "gc_interface/collectedHeap.inline.hpp" | |
| 33 #include "interpreter/oopMapCache.hpp" | |
| 34 #include "interpreter/rewriter.hpp" | |
| 35 #include "jvmtifiles/jvmti.h" | |
| 36 #include "memory/genOopClosures.inline.hpp" | |
| 7956 | 37 #include "memory/heapInspection.hpp" |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
38 #include "memory/metadataFactory.hpp" |
| 1972 | 39 #include "memory/oopFactory.hpp" |
| 3938 | 40 #include "oops/fieldStreams.hpp" |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
41 #include "oops/instanceClassLoaderKlass.hpp" |
| 1972 | 42 #include "oops/instanceKlass.hpp" |
|
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
43 #include "oops/instanceMirrorKlass.hpp" |
| 1972 | 44 #include "oops/instanceOop.hpp" |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
45 #include "oops/klass.inline.hpp" |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
46 #include "oops/method.hpp" |
| 1972 | 47 #include "oops/oop.inline.hpp" |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
48 #include "oops/symbol.hpp" |
| 1972 | 49 #include "prims/jvmtiExport.hpp" |
| 50 #include "prims/jvmtiRedefineClassesTrace.hpp" | |
|
11148
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
51 #include "prims/jvmtiRedefineClasses.hpp" |
|
7459
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
52 #include "prims/methodComparator.hpp" |
| 1972 | 53 #include "runtime/fieldDescriptor.hpp" |
| 54 #include "runtime/handles.inline.hpp" | |
| 55 #include "runtime/javaCalls.hpp" | |
| 56 #include "runtime/mutexLocker.hpp" | |
|
7180
f34d701e952e
8003935: Simplify the needed includes for using Thread::current()
stefank
parents:
6985
diff
changeset
|
57 #include "runtime/thread.inline.hpp" |
|
10149
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
58 #include "services/classLoadingService.hpp" |
| 1972 | 59 #include "services/threadService.hpp" |
| 60 #include "utilities/dtrace.hpp" | |
|
8001
db9981fd3124
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS
jprovino
parents:
7610
diff
changeset
|
61 #include "utilities/macros.hpp" |
|
db9981fd3124
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS
jprovino
parents:
7610
diff
changeset
|
62 #if INCLUDE_ALL_GCS |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
63 #include "gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp" |
| 1972 | 64 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" |
| 65 #include "gc_implementation/g1/g1OopClosures.inline.hpp" | |
| 66 #include "gc_implementation/g1/g1RemSet.inline.hpp" | |
| 67 #include "gc_implementation/g1/heapRegionSeq.inline.hpp" | |
| 68 #include "gc_implementation/parNew/parOopClosures.inline.hpp" | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
69 #include "gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp" |
| 1972 | 70 #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp" |
| 71 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp" | |
| 72 #include "oops/oop.pcgc.inline.hpp" | |
|
8001
db9981fd3124
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS
jprovino
parents:
7610
diff
changeset
|
73 #endif // INCLUDE_ALL_GCS |
| 1972 | 74 #ifdef COMPILER1 |
| 75 #include "c1/c1_Compiler.hpp" | |
| 76 #endif | |
| 0 | 77 |
|
17937
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17889
diff
changeset
|
78 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC |
|
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17889
diff
changeset
|
79 |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
80 #ifdef DTRACE_ENABLED |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
81 |
| 4006 | 82 #ifndef USDT2 |
| 83 | |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
84 HS_DTRACE_PROBE_DECL4(hotspot, class__initialization__required, |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
85 char*, intptr_t, oop, intptr_t); |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
86 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__recursive, |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
87 char*, intptr_t, oop, intptr_t, int); |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
88 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__concurrent, |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
89 char*, intptr_t, oop, intptr_t, int); |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
90 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__erroneous, |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
91 char*, intptr_t, oop, intptr_t, int); |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
92 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__super__failed, |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
93 char*, intptr_t, oop, intptr_t, int); |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
94 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__clinit, |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
95 char*, intptr_t, oop, intptr_t, int); |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
96 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__error, |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
97 char*, intptr_t, oop, intptr_t, int); |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
98 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__end, |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
99 char*, intptr_t, oop, intptr_t, int); |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
100 |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
101 #define DTRACE_CLASSINIT_PROBE(type, clss, thread_type) \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
102 { \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
103 char* data = NULL; \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
104 int len = 0; \ |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
105 Symbol* name = (clss)->name(); \ |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
106 if (name != NULL) { \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
107 data = (char*)name->bytes(); \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
108 len = name->utf8_length(); \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
109 } \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
110 HS_DTRACE_PROBE4(hotspot, class__initialization__##type, \ |
|
12316
190899198332
7195622: CheckUnhandledOops has limited usefulness now
hseigel
parents:
12287
diff
changeset
|
111 data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), thread_type); \ |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
112 } |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
113 |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
114 #define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
115 { \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
116 char* data = NULL; \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
117 int len = 0; \ |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
118 Symbol* name = (clss)->name(); \ |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
119 if (name != NULL) { \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
120 data = (char*)name->bytes(); \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
121 len = name->utf8_length(); \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
122 } \ |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
123 HS_DTRACE_PROBE5(hotspot, class__initialization__##type, \ |
|
12316
190899198332
7195622: CheckUnhandledOops has limited usefulness now
hseigel
parents:
12287
diff
changeset
|
124 data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), thread_type, wait); \ |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
125 } |
| 4006 | 126 #else /* USDT2 */ |
| 127 | |
| 128 #define HOTSPOT_CLASS_INITIALIZATION_required HOTSPOT_CLASS_INITIALIZATION_REQUIRED | |
| 129 #define HOTSPOT_CLASS_INITIALIZATION_recursive HOTSPOT_CLASS_INITIALIZATION_RECURSIVE | |
| 130 #define HOTSPOT_CLASS_INITIALIZATION_concurrent HOTSPOT_CLASS_INITIALIZATION_CONCURRENT | |
| 131 #define HOTSPOT_CLASS_INITIALIZATION_erroneous HOTSPOT_CLASS_INITIALIZATION_ERRONEOUS | |
| 132 #define HOTSPOT_CLASS_INITIALIZATION_super__failed HOTSPOT_CLASS_INITIALIZATION_SUPER_FAILED | |
| 133 #define HOTSPOT_CLASS_INITIALIZATION_clinit HOTSPOT_CLASS_INITIALIZATION_CLINIT | |
| 134 #define HOTSPOT_CLASS_INITIALIZATION_error HOTSPOT_CLASS_INITIALIZATION_ERROR | |
| 135 #define HOTSPOT_CLASS_INITIALIZATION_end HOTSPOT_CLASS_INITIALIZATION_END | |
| 136 #define DTRACE_CLASSINIT_PROBE(type, clss, thread_type) \ | |
| 137 { \ | |
| 138 char* data = NULL; \ | |
| 139 int len = 0; \ | |
| 140 Symbol* name = (clss)->name(); \ | |
| 141 if (name != NULL) { \ | |
| 142 data = (char*)name->bytes(); \ | |
| 143 len = name->utf8_length(); \ | |
| 144 } \ | |
| 145 HOTSPOT_CLASS_INITIALIZATION_##type( \ | |
| 146 data, len, (clss)->class_loader(), thread_type); \ | |
| 147 } | |
| 148 | |
| 149 #define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) \ | |
| 150 { \ | |
| 151 char* data = NULL; \ | |
| 152 int len = 0; \ | |
| 153 Symbol* name = (clss)->name(); \ | |
| 154 if (name != NULL) { \ | |
| 155 data = (char*)name->bytes(); \ | |
| 156 len = name->utf8_length(); \ | |
| 157 } \ | |
| 158 HOTSPOT_CLASS_INITIALIZATION_##type( \ | |
| 159 data, len, (clss)->class_loader(), thread_type, wait); \ | |
| 160 } | |
| 161 #endif /* USDT2 */ | |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
162 |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
163 #else // ndef DTRACE_ENABLED |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
164 |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
165 #define DTRACE_CLASSINIT_PROBE(type, clss, thread_type) |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
166 #define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
167 |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
168 #endif // ndef DTRACE_ENABLED |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
169 |
|
7464
ecd24264898b
8005048: NMT: #loaded classes needs to just show the # defined classes
zgu
parents:
7180
diff
changeset
|
170 volatile int InstanceKlass::_total_instanceKlass_count = 0; |
|
ecd24264898b
8005048: NMT: #loaded classes needs to just show the # defined classes
zgu
parents:
7180
diff
changeset
|
171 |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
172 InstanceKlass* InstanceKlass::allocate_instance_klass( |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
173 ClassLoaderData* loader_data, |
| 8031 | 174 int vtable_len, |
| 175 int itable_len, | |
| 176 int static_field_size, | |
| 177 int nonstatic_oop_map_size, | |
| 178 ReferenceType rt, | |
| 179 AccessFlags access_flags, | |
| 180 Symbol* name, | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
181 Klass* super_klass, |
| 8031 | 182 bool is_anonymous, |
| 183 TRAPS) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
184 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
185 int size = InstanceKlass::size(vtable_len, itable_len, nonstatic_oop_map_size, |
| 8031 | 186 access_flags.is_interface(), is_anonymous); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
187 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
188 // Allocation |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
189 InstanceKlass* ik; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
190 if (rt == REF_NONE) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
191 if (name == vmSymbols::java_lang_Class()) { |
|
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6733
diff
changeset
|
192 ik = new (loader_data, size, THREAD) InstanceMirrorKlass( |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
193 vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt, |
| 8031 | 194 access_flags, is_anonymous); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
195 } else if (name == vmSymbols::java_lang_ClassLoader() || |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
196 (SystemDictionary::ClassLoader_klass_loaded() && |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
197 super_klass != NULL && |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
198 super_klass->is_subtype_of(SystemDictionary::ClassLoader_klass()))) { |
|
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6733
diff
changeset
|
199 ik = new (loader_data, size, THREAD) InstanceClassLoaderKlass( |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
200 vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt, |
| 8031 | 201 access_flags, is_anonymous); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
202 } else { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
203 // normal class |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
204 ik = new (loader_data, size, THREAD) InstanceKlass( |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
205 vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt, |
| 8031 | 206 access_flags, is_anonymous); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
207 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
208 } else { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
209 // reference klass |
|
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6733
diff
changeset
|
210 ik = new (loader_data, size, THREAD) InstanceRefKlass( |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
211 vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt, |
| 8031 | 212 access_flags, is_anonymous); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
213 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
214 |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
215 // Check for pending exception before adding to the loader data and incrementing |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
216 // class count. Can get OOM here. |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
217 if (HAS_PENDING_EXCEPTION) { |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
218 return NULL; |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
219 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
220 |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
221 // Add all classes to our internal class loader list here, |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
222 // including classes in the bootstrap (NULL) class loader. |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
223 loader_data->add_class(ik); |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
224 |
|
7464
ecd24264898b
8005048: NMT: #loaded classes needs to just show the # defined classes
zgu
parents:
7180
diff
changeset
|
225 Atomic::inc(&_total_instanceKlass_count); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
226 return ik; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
227 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
228 |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
229 |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
230 // copy method ordering from resource area to Metaspace |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
231 void InstanceKlass::copy_method_ordering(intArray* m, TRAPS) { |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
232 if (m != NULL) { |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
233 // allocate a new array and copy contents (memcpy?) |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
234 _method_ordering = MetadataFactory::new_array<int>(class_loader_data(), m->length(), CHECK); |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
235 for (int i = 0; i < m->length(); i++) { |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
236 _method_ordering->at_put(i, m->at(i)); |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
237 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
238 } else { |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
239 _method_ordering = Universe::the_empty_int_array(); |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
240 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
241 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
242 |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
243 // create a new array of vtable_indices for default methods |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
244 Array<int>* InstanceKlass::create_new_default_vtable_indices(int len, TRAPS) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
245 Array<int>* vtable_indices = MetadataFactory::new_array<int>(class_loader_data(), len, CHECK_NULL); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
246 assert(default_vtable_indices() == NULL, "only create once"); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
247 set_default_vtable_indices(vtable_indices); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
248 return vtable_indices; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
249 } |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
250 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
251 InstanceKlass::InstanceKlass(int vtable_len, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
252 int itable_len, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
253 int static_field_size, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
254 int nonstatic_oop_map_size, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
255 ReferenceType rt, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
256 AccessFlags access_flags, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
257 bool is_anonymous) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
258 No_Safepoint_Verifier no_safepoint; // until k becomes parsable |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
259 |
|
8712
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
260 int iksize = InstanceKlass::size(vtable_len, itable_len, nonstatic_oop_map_size, |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
261 access_flags.is_interface(), is_anonymous); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
262 |
|
8712
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
263 set_vtable_length(vtable_len); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
264 set_itable_length(itable_len); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
265 set_static_field_size(static_field_size); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
266 set_nonstatic_oop_map_size(nonstatic_oop_map_size); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
267 set_access_flags(access_flags); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
268 _misc_flags = 0; // initialize to zero |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
269 set_is_anonymous(is_anonymous); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
270 assert(size() == iksize, "wrong size for object"); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
271 |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
272 set_array_klasses(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
273 set_methods(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
274 set_method_ordering(NULL); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
275 set_default_methods(NULL); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
276 set_default_vtable_indices(NULL); |
|
8712
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
277 set_local_interfaces(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
278 set_transitive_interfaces(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
279 init_implementor(); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
280 set_fields(NULL, 0); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
281 set_constants(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
282 set_class_loader_data(NULL); |
|
12067
e22ee8e7ae62
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
11148
diff
changeset
|
283 set_source_file_name_index(0); |
|
8712
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
284 set_source_debug_extension(NULL, 0); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
285 set_array_name(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
286 set_inner_classes(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
287 set_static_oop_field_count(0); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
288 set_nonstatic_field_size(0); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
289 set_is_marked_dependent(false); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
290 set_init_state(InstanceKlass::allocated); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
291 set_init_thread(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
292 set_reference_type(rt); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
293 set_oop_map_cache(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
294 set_jni_ids(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
295 set_osr_nmethods_head(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
296 set_breakpoints(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
297 init_previous_versions(); |
|
12067
e22ee8e7ae62
8021948: Change InstanceKlass::_source_file_name and _generic_signature from Symbol* to constant pool indexes.
jiangli
parents:
11148
diff
changeset
|
298 set_generic_signature_index(0); |
|
8712
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
299 release_set_methods_jmethod_ids(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
300 set_annotations(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
301 set_jvmti_cached_class_field_map(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
302 set_initial_method_idnum(0); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
303 _dependencies = NULL; |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
304 set_jvmti_cached_class_field_map(NULL); |
|
11148
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
305 set_cached_class_file(NULL); |
|
8712
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
306 set_initial_method_idnum(0); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
307 set_minor_version(0); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
308 set_major_version(0); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
309 NOT_PRODUCT(_verify_count = 0;) |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
310 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
311 // initialize the non-header words to zero |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
312 intptr_t* p = (intptr_t*)this; |
|
8712
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
313 for (int index = InstanceKlass::header_size(); index < iksize; index++) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
314 p[index] = NULL_WORD; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
315 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
316 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
317 // Set temporary value until parseClassFile updates it with the real instance |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
318 // size. |
|
8712
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
319 set_layout_helper(Klass::instance_layout_helper(0, true)); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
320 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
321 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
322 |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
323 void InstanceKlass::deallocate_methods(ClassLoaderData* loader_data, |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
324 Array<Method*>* methods) { |
|
12857
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
325 if (methods != NULL && methods != Universe::the_empty_method_array() && |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
326 !methods->is_shared()) { |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
327 for (int i = 0; i < methods->length(); i++) { |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
328 Method* method = methods->at(i); |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
329 if (method == NULL) continue; // maybe null if error processing |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
330 // Only want to delete methods that are not executing for RedefineClasses. |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
331 // The previous version will point to them so they're not totally dangling |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
332 assert (!method->on_stack(), "shouldn't be called with methods on stack"); |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
333 MetadataFactory::free_metadata(loader_data, method); |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
334 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
335 MetadataFactory::free_array<Method*>(loader_data, methods); |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
336 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
337 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
338 |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
339 void InstanceKlass::deallocate_interfaces(ClassLoaderData* loader_data, |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
340 Klass* super_klass, |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
341 Array<Klass*>* local_interfaces, |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
342 Array<Klass*>* transitive_interfaces) { |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
343 // Only deallocate transitive interfaces if not empty, same as super class |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
344 // or same as local interfaces. See code in parseClassFile. |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
345 Array<Klass*>* ti = transitive_interfaces; |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
346 if (ti != Universe::the_empty_klass_array() && ti != local_interfaces) { |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
347 // check that the interfaces don't come from super class |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
348 Array<Klass*>* sti = (super_klass == NULL) ? NULL : |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
349 InstanceKlass::cast(super_klass)->transitive_interfaces(); |
|
12857
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
350 if (ti != sti && ti != NULL && !ti->is_shared()) { |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
351 MetadataFactory::free_array<Klass*>(loader_data, ti); |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
352 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
353 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
354 |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
355 // local interfaces can be empty |
|
12857
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
356 if (local_interfaces != Universe::the_empty_klass_array() && |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
357 local_interfaces != NULL && !local_interfaces->is_shared()) { |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
358 MetadataFactory::free_array<Klass*>(loader_data, local_interfaces); |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
359 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
360 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
361 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
362 // This function deallocates the metadata and C heap pointers that the |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
363 // InstanceKlass points to. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
364 void InstanceKlass::deallocate_contents(ClassLoaderData* loader_data) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
365 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
366 // Orphan the mirror first, CMS thinks it's still live. |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
367 if (java_mirror() != NULL) { |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
368 java_lang_Class::set_klass(java_mirror(), NULL); |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
369 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
370 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
371 // Need to take this class off the class loader data list. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
372 loader_data->remove_class(this); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
373 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
374 // The array_klass for this class is created later, after error handling. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
375 // For class redefinition, we keep the original class so this scratch class |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
376 // doesn't have an array class. Either way, assert that there is nothing |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
377 // to deallocate. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
378 assert(array_klasses() == NULL, "array classes shouldn't be created for this class yet"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
379 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
380 // Release C heap allocated data that this might point to, which includes |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
381 // reference counting symbol names. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
382 release_C_heap_structures(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
383 |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
384 deallocate_methods(loader_data, methods()); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
385 set_methods(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
386 |
|
12857
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
387 if (method_ordering() != NULL && |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
388 method_ordering() != Universe::the_empty_int_array() && |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
389 !method_ordering()->is_shared()) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
390 MetadataFactory::free_array<int>(loader_data, method_ordering()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
391 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
392 set_method_ordering(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
393 |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
394 // default methods can be empty |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
395 if (default_methods() != NULL && |
|
12857
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
396 default_methods() != Universe::the_empty_method_array() && |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
397 !default_methods()->is_shared()) { |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
398 MetadataFactory::free_array<Method*>(loader_data, default_methods()); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
399 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
400 // Do NOT deallocate the default methods, they are owned by superinterfaces. |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
401 set_default_methods(NULL); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
402 |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
403 // default methods vtable indices can be empty |
|
12857
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
404 if (default_vtable_indices() != NULL && |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
405 !default_vtable_indices()->is_shared()) { |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
406 MetadataFactory::free_array<int>(loader_data, default_vtable_indices()); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
407 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
408 set_default_vtable_indices(NULL); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
409 |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
410 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
411 // This array is in Klass, but remove it with the InstanceKlass since |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
412 // this place would be the only caller and it can share memory with transitive |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
413 // interfaces. |
|
12857
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
414 if (secondary_supers() != NULL && |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
415 secondary_supers() != Universe::the_empty_klass_array() && |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
416 secondary_supers() != transitive_interfaces() && |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
417 !secondary_supers()->is_shared()) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
418 MetadataFactory::free_array<Klass*>(loader_data, secondary_supers()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
419 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
420 set_secondary_supers(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
421 |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
422 deallocate_interfaces(loader_data, super(), local_interfaces(), transitive_interfaces()); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
423 set_transitive_interfaces(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
424 set_local_interfaces(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
425 |
|
12857
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
426 if (fields() != NULL && !fields()->is_shared()) { |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
427 MetadataFactory::free_array<jushort>(loader_data, fields()); |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
428 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
429 set_fields(NULL, 0); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
430 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
431 // If a method from a redefined class is using this constant pool, don't |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
432 // delete it, yet. The new class's previous version will point to this. |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
433 if (constants() != NULL) { |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
434 assert (!constants()->on_stack(), "shouldn't be called if anything is onstack"); |
|
12857
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
435 if (!constants()->is_shared()) { |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
436 MetadataFactory::free_metadata(loader_data, constants()); |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
437 } |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
438 set_constants(NULL); |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
439 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
440 |
|
12857
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
441 if (inner_classes() != NULL && |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
442 inner_classes() != Universe::the_empty_short_array() && |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
443 !inner_classes()->is_shared()) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
444 MetadataFactory::free_array<jushort>(loader_data, inner_classes()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
445 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
446 set_inner_classes(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
447 |
|
12857
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
448 // We should deallocate the Annotations instance if it's not in shared spaces. |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
449 if (annotations() != NULL && !annotations()->is_shared()) { |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
450 MetadataFactory::free_metadata(loader_data, annotations()); |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
451 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
452 set_annotations(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
453 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
454 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
455 bool InstanceKlass::should_be_initialized() const { |
| 0 | 456 return !is_initialized(); |
| 457 } | |
| 458 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
459 klassVtable* InstanceKlass::vtable() const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
460 return new klassVtable(this, start_of_vtable(), vtable_length() / vtableEntry::size()); |
| 0 | 461 } |
| 462 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
463 klassItable* InstanceKlass::itable() const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
464 return new klassItable(instanceKlassHandle(this)); |
| 0 | 465 } |
| 466 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
467 void InstanceKlass::eager_initialize(Thread *thread) { |
| 0 | 468 if (!EagerInitialization) return; |
| 469 | |
| 470 if (this->is_not_initialized()) { | |
| 471 // abort if the the class has a class initializer | |
| 472 if (this->class_initializer() != NULL) return; | |
| 473 | |
| 474 // abort if it is java.lang.Object (initialization is handled in genesis) | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
475 Klass* super = this->super(); |
| 0 | 476 if (super == NULL) return; |
| 477 | |
| 478 // abort if the super class should be initialized | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
479 if (!InstanceKlass::cast(super)->is_initialized()) return; |
| 0 | 480 |
| 481 // call body to expose the this pointer | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
482 instanceKlassHandle this_oop(thread, this); |
| 0 | 483 eager_initialize_impl(this_oop); |
| 484 } | |
| 485 } | |
| 486 | |
|
10343
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
487 // JVMTI spec thinks there are signers and protection domain in the |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
488 // instanceKlass. These accessors pretend these fields are there. |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
489 // The hprof specification also thinks these fields are in InstanceKlass. |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
490 oop InstanceKlass::protection_domain() const { |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
491 // return the protection_domain from the mirror |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
492 return java_lang_Class::protection_domain(java_mirror()); |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
493 } |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
494 |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
495 // To remove these from requires an incompatible change and CCC request. |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
496 objArrayOop InstanceKlass::signers() const { |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
497 // return the signers from the mirror |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
498 return java_lang_Class::signers(java_mirror()); |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
499 } |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
500 |
|
12811
3374b92de2d9
8025004: -XX:+CheckUnhandledOops asserts for JDK 8 Solaris fastdebug binaries
coleenp
parents:
12318
diff
changeset
|
501 oop InstanceKlass::init_lock() const { |
|
10343
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
502 // return the init lock from the mirror |
|
12946
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
503 oop lock = java_lang_Class::init_lock(java_mirror()); |
|
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
504 assert((oop)lock != NULL || !is_not_initialized(), // initialized or in_error state |
|
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
505 "only fully initialized state can have a null lock"); |
|
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
506 return lock; |
|
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
507 } |
|
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
508 |
|
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
509 // Set the initialization lock to null so the object can be GC'ed. Any racing |
|
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
510 // threads to get this lock will see a null lock and will not lock. |
|
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
511 // That's okay because they all check for initialized state after getting |
|
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
512 // the lock and return. |
|
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
513 void InstanceKlass::fence_and_clear_init_lock() { |
|
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
514 // make sure previous stores are all done, notably the init_state. |
|
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
515 OrderAccess::storestore(); |
|
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
516 java_lang_Class::set_init_lock(java_mirror(), NULL); |
|
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
517 assert(!is_not_initialized(), "class must be initialized now"); |
|
10343
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
518 } |
| 0 | 519 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
520 void InstanceKlass::eager_initialize_impl(instanceKlassHandle this_oop) { |
| 0 | 521 EXCEPTION_MARK; |
|
12811
3374b92de2d9
8025004: -XX:+CheckUnhandledOops asserts for JDK 8 Solaris fastdebug binaries
coleenp
parents:
12318
diff
changeset
|
522 oop init_lock = this_oop->init_lock(); |
|
12946
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
523 ObjectLocker ol(init_lock, THREAD, init_lock != NULL); |
| 0 | 524 |
| 525 // abort if someone beat us to the initialization | |
| 526 if (!this_oop->is_not_initialized()) return; // note: not equivalent to is_initialized() | |
| 527 | |
|
4739
52b5d32fbfaf
7117052: instanceKlass::_init_state can be u1 type
coleenp
parents:
4006
diff
changeset
|
528 ClassState old_state = this_oop->init_state(); |
| 0 | 529 link_class_impl(this_oop, true, THREAD); |
| 530 if (HAS_PENDING_EXCEPTION) { | |
| 531 CLEAR_PENDING_EXCEPTION; | |
| 532 // Abort if linking the class throws an exception. | |
| 533 | |
| 534 // Use a test to avoid redundantly resetting the state if there's | |
| 535 // no change. Set_init_state() asserts that state changes make | |
| 536 // progress, whereas here we might just be spinning in place. | |
| 537 if( old_state != this_oop->_init_state ) | |
| 538 this_oop->set_init_state (old_state); | |
| 539 } else { | |
| 540 // linking successfull, mark class as initialized | |
| 541 this_oop->set_init_state (fully_initialized); | |
|
12946
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
542 this_oop->fence_and_clear_init_lock(); |
| 0 | 543 // trace |
| 544 if (TraceClassInitialization) { | |
| 545 ResourceMark rm(THREAD); | |
| 546 tty->print_cr("[Initialized %s without side effects]", this_oop->external_name()); | |
| 547 } | |
| 548 } | |
| 549 } | |
| 550 | |
| 551 | |
| 552 // See "The Virtual Machine Specification" section 2.16.5 for a detailed explanation of the class initialization | |
| 553 // process. The step comments refers to the procedure described in that section. | |
| 554 // Note: implementation moved to static method to expose the this pointer. | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
555 void InstanceKlass::initialize(TRAPS) { |
| 0 | 556 if (this->should_be_initialized()) { |
| 557 HandleMark hm(THREAD); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
558 instanceKlassHandle this_oop(THREAD, this); |
| 0 | 559 initialize_impl(this_oop, CHECK); |
| 560 // Note: at this point the class may be initialized | |
| 561 // OR it may be in the state of being initialized | |
| 562 // in case of recursive initialization! | |
| 563 } else { | |
| 564 assert(is_initialized(), "sanity check"); | |
| 565 } | |
| 566 } | |
| 567 | |
| 568 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
569 bool InstanceKlass::verify_code( |
| 0 | 570 instanceKlassHandle this_oop, bool throw_verifyerror, TRAPS) { |
| 571 // 1) Verify the bytecodes | |
| 572 Verifier::Mode mode = | |
| 573 throw_verifyerror ? Verifier::ThrowException : Verifier::NoException; | |
|
973
ad6585fd4087
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
964
diff
changeset
|
574 return Verifier::verify(this_oop, mode, this_oop->should_verify_class(), CHECK_false); |
| 0 | 575 } |
| 576 | |
| 577 | |
| 578 // Used exclusively by the shared spaces dump mechanism to prevent | |
| 579 // classes mapped into the shared regions in new VMs from appearing linked. | |
| 580 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
581 void InstanceKlass::unlink_class() { |
| 0 | 582 assert(is_linked(), "must be linked"); |
| 583 _init_state = loaded; | |
| 584 } | |
| 585 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
586 void InstanceKlass::link_class(TRAPS) { |
| 0 | 587 assert(is_loaded(), "must be loaded"); |
| 588 if (!is_linked()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
589 HandleMark hm(THREAD); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
590 instanceKlassHandle this_oop(THREAD, this); |
| 0 | 591 link_class_impl(this_oop, true, CHECK); |
| 592 } | |
| 593 } | |
| 594 | |
| 595 // Called to verify that a class can link during initialization, without | |
| 596 // throwing a VerifyError. | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
597 bool InstanceKlass::link_class_or_fail(TRAPS) { |
| 0 | 598 assert(is_loaded(), "must be loaded"); |
| 599 if (!is_linked()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
600 HandleMark hm(THREAD); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
601 instanceKlassHandle this_oop(THREAD, this); |
| 0 | 602 link_class_impl(this_oop, false, CHECK_false); |
| 603 } | |
| 604 return is_linked(); | |
| 605 } | |
| 606 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
607 bool InstanceKlass::link_class_impl( |
| 0 | 608 instanceKlassHandle this_oop, bool throw_verifyerror, TRAPS) { |
| 609 // check for error state | |
| 610 if (this_oop->is_in_error_state()) { | |
| 611 ResourceMark rm(THREAD); | |
| 612 THROW_MSG_(vmSymbols::java_lang_NoClassDefFoundError(), | |
| 613 this_oop->external_name(), false); | |
| 614 } | |
| 615 // return if already verified | |
| 616 if (this_oop->is_linked()) { | |
| 617 return true; | |
| 618 } | |
| 619 | |
| 620 // Timing | |
| 621 // timer handles recursion | |
| 622 assert(THREAD->is_Java_thread(), "non-JavaThread in link_class_impl"); | |
| 623 JavaThread* jt = (JavaThread*)THREAD; | |
| 624 | |
| 625 // link super class before linking this class | |
| 626 instanceKlassHandle super(THREAD, this_oop->super()); | |
| 627 if (super.not_null()) { | |
| 628 if (super->is_interface()) { // check if super class is an interface | |
| 629 ResourceMark rm(THREAD); | |
| 630 Exceptions::fthrow( | |
| 631 THREAD_AND_LOCATION, | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
632 vmSymbols::java_lang_IncompatibleClassChangeError(), |
| 0 | 633 "class %s has interface %s as super class", |
| 634 this_oop->external_name(), | |
| 635 super->external_name() | |
| 636 ); | |
| 637 return false; | |
| 638 } | |
| 639 | |
| 640 link_class_impl(super, throw_verifyerror, CHECK_false); | |
| 641 } | |
| 642 | |
| 643 // link all interfaces implemented by this class before linking this class | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
644 Array<Klass*>* interfaces = this_oop->local_interfaces(); |
| 0 | 645 int num_interfaces = interfaces->length(); |
| 646 for (int index = 0; index < num_interfaces; index++) { | |
| 647 HandleMark hm(THREAD); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
648 instanceKlassHandle ih(THREAD, interfaces->at(index)); |
| 0 | 649 link_class_impl(ih, throw_verifyerror, CHECK_false); |
| 650 } | |
| 651 | |
| 652 // in case the class is linked in the process of linking its superclasses | |
| 653 if (this_oop->is_linked()) { | |
| 654 return true; | |
| 655 } | |
| 656 | |
|
875
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
657 // trace only the link time for this klass that includes |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
658 // the verification time |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
659 PerfClassTraceTime vmtimer(ClassLoader::perf_class_link_time(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
660 ClassLoader::perf_class_link_selftime(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
661 ClassLoader::perf_classes_linked(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
662 jt->get_thread_stat()->perf_recursion_counts_addr(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
663 jt->get_thread_stat()->perf_timers_addr(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
664 PerfClassTraceTime::CLASS_LINK); |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
665 |
| 0 | 666 // verification & rewriting |
| 667 { | |
|
12811
3374b92de2d9
8025004: -XX:+CheckUnhandledOops asserts for JDK 8 Solaris fastdebug binaries
coleenp
parents:
12318
diff
changeset
|
668 oop init_lock = this_oop->init_lock(); |
|
12946
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
669 ObjectLocker ol(init_lock, THREAD, init_lock != NULL); |
| 0 | 670 // rewritten will have been set if loader constraint error found |
| 671 // on an earlier link attempt | |
| 672 // don't verify or rewrite if already rewritten | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
673 |
| 0 | 674 if (!this_oop->is_linked()) { |
| 675 if (!this_oop->is_rewritten()) { | |
| 676 { | |
| 677 // Timer includes any side effects of class verification (resolution, | |
| 678 // etc), but not recursive entry into verify_code(). | |
|
875
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
679 PerfClassTraceTime timer(ClassLoader::perf_class_verify_time(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
680 ClassLoader::perf_class_verify_selftime(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
681 ClassLoader::perf_classes_verified(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
682 jt->get_thread_stat()->perf_recursion_counts_addr(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
683 jt->get_thread_stat()->perf_timers_addr(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
684 PerfClassTraceTime::CLASS_VERIFY); |
| 0 | 685 bool verify_ok = verify_code(this_oop, throw_verifyerror, THREAD); |
| 686 if (!verify_ok) { | |
| 687 return false; | |
| 688 } | |
| 689 } | |
| 690 | |
| 691 // Just in case a side-effect of verify linked this class already | |
| 692 // (which can sometimes happen since the verifier loads classes | |
| 693 // using custom class loaders, which are free to initialize things) | |
| 694 if (this_oop->is_linked()) { | |
| 695 return true; | |
| 696 } | |
| 697 | |
| 698 // also sets rewritten | |
| 699 this_oop->rewrite_class(CHECK_false); | |
| 700 } | |
| 701 | |
| 3748 | 702 // relocate jsrs and link methods after they are all rewritten |
|
7459
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
703 this_oop->link_methods(CHECK_false); |
| 3748 | 704 |
| 0 | 705 // Initialize the vtable and interface table after |
| 706 // methods have been rewritten since rewrite may | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
707 // fabricate new Method*s. |
| 0 | 708 // also does loader constraint checking |
| 709 if (!this_oop()->is_shared()) { | |
| 710 ResourceMark rm(THREAD); | |
| 711 this_oop->vtable()->initialize_vtable(true, CHECK_false); | |
| 712 this_oop->itable()->initialize_itable(true, CHECK_false); | |
| 713 } | |
| 714 #ifdef ASSERT | |
| 715 else { | |
| 716 ResourceMark rm(THREAD); | |
| 717 this_oop->vtable()->verify(tty, true); | |
| 718 // In case itable verification is ever added. | |
| 719 // this_oop->itable()->verify(tty, true); | |
| 720 } | |
| 721 #endif | |
| 722 this_oop->set_init_state(linked); | |
| 723 if (JvmtiExport::should_post_class_prepare()) { | |
| 724 Thread *thread = THREAD; | |
| 725 assert(thread->is_Java_thread(), "thread->is_Java_thread()"); | |
| 726 JvmtiExport::post_class_prepare((JavaThread *) thread, this_oop()); | |
| 727 } | |
| 728 } | |
| 729 } | |
| 730 return true; | |
| 731 } | |
| 732 | |
| 733 | |
| 734 // Rewrite the byte codes of all of the methods of a class. | |
| 735 // The rewriter must be called exactly once. Rewriting must happen after | |
| 736 // verification but before the first method of the class is executed. | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
737 void InstanceKlass::rewrite_class(TRAPS) { |
| 0 | 738 assert(is_loaded(), "must be loaded"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
739 instanceKlassHandle this_oop(THREAD, this); |
| 0 | 740 if (this_oop->is_rewritten()) { |
| 741 assert(this_oop()->is_shared(), "rewriting an unshared class?"); | |
| 742 return; | |
| 743 } | |
| 3748 | 744 Rewriter::rewrite(this_oop, CHECK); |
| 0 | 745 this_oop->set_rewritten(); |
| 746 } | |
| 747 | |
| 3748 | 748 // Now relocate and link method entry points after class is rewritten. |
| 749 // This is outside is_rewritten flag. In case of an exception, it can be | |
| 750 // executed more than once. | |
|
7459
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
751 void InstanceKlass::link_methods(TRAPS) { |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
752 int len = methods()->length(); |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
753 for (int i = len-1; i >= 0; i--) { |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
754 methodHandle m(THREAD, methods()->at(i)); |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
755 |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
756 // Set up method entry points for compiler and interpreter . |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
757 m->link_method(m, CHECK); |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
758 |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
759 // This is for JVMTI and unrelated to relocator but the last thing we do |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
760 #ifdef ASSERT |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
761 if (StressMethodComparator) { |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
762 ResourceMark rm(THREAD); |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
763 static int nmc = 0; |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
764 for (int j = i; j >= 0 && j >= i-4; j--) { |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
765 if ((++nmc % 1000) == 0) tty->print_cr("Have run MethodComparator %d times...", nmc); |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
766 bool z = MethodComparator::methods_EMCP(m(), |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
767 methods()->at(j)); |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
768 if (j == i && !z) { |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
769 tty->print("MethodComparator FAIL: "); m->print(); m->print_codes(); |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
770 assert(z, "method must compare equal to itself"); |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
771 } |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
772 } |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
773 } |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
774 #endif //ASSERT |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
775 } |
| 3748 | 776 } |
| 777 | |
| 0 | 778 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
779 void InstanceKlass::initialize_impl(instanceKlassHandle this_oop, TRAPS) { |
| 0 | 780 // Make sure klass is linked (verified) before initialization |
| 781 // A class could already be verified, since it has been reflected upon. | |
| 782 this_oop->link_class(CHECK); | |
| 783 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
784 DTRACE_CLASSINIT_PROBE(required, InstanceKlass::cast(this_oop()), -1); |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
785 |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
786 bool wait = false; |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
787 |
| 0 | 788 // refer to the JVM book page 47 for description of steps |
| 789 // Step 1 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
790 { |
|
12811
3374b92de2d9
8025004: -XX:+CheckUnhandledOops asserts for JDK 8 Solaris fastdebug binaries
coleenp
parents:
12318
diff
changeset
|
791 oop init_lock = this_oop->init_lock(); |
|
12946
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
792 ObjectLocker ol(init_lock, THREAD, init_lock != NULL); |
| 0 | 793 |
| 794 Thread *self = THREAD; // it's passed the current thread | |
| 795 | |
| 796 // Step 2 | |
| 797 // If we were to use wait() instead of waitInterruptibly() then | |
| 798 // we might end up throwing IE from link/symbol resolution sites | |
| 799 // that aren't expected to throw. This would wreak havoc. See 6320309. | |
| 800 while(this_oop->is_being_initialized() && !this_oop->is_reentrant_initialization(self)) { | |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
801 wait = true; |
| 0 | 802 ol.waitUninterruptibly(CHECK); |
| 803 } | |
| 804 | |
| 805 // Step 3 | |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
806 if (this_oop->is_being_initialized() && this_oop->is_reentrant_initialization(self)) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
807 DTRACE_CLASSINIT_PROBE_WAIT(recursive, InstanceKlass::cast(this_oop()), -1,wait); |
| 0 | 808 return; |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
809 } |
| 0 | 810 |
| 811 // Step 4 | |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
812 if (this_oop->is_initialized()) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
813 DTRACE_CLASSINIT_PROBE_WAIT(concurrent, InstanceKlass::cast(this_oop()), -1,wait); |
| 0 | 814 return; |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
815 } |
| 0 | 816 |
| 817 // Step 5 | |
| 818 if (this_oop->is_in_error_state()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
819 DTRACE_CLASSINIT_PROBE_WAIT(erroneous, InstanceKlass::cast(this_oop()), -1,wait); |
| 0 | 820 ResourceMark rm(THREAD); |
| 821 const char* desc = "Could not initialize class "; | |
| 822 const char* className = this_oop->external_name(); | |
| 823 size_t msglen = strlen(desc) + strlen(className) + 1; | |
|
1751
2528b5bd749c
6980262: Memory leak when exception is thrown in static initializer
kamg
parents:
1706
diff
changeset
|
824 char* message = NEW_RESOURCE_ARRAY(char, msglen); |
| 0 | 825 if (NULL == message) { |
| 826 // Out of memory: can't create detailed error message | |
| 827 THROW_MSG(vmSymbols::java_lang_NoClassDefFoundError(), className); | |
| 828 } else { | |
| 829 jio_snprintf(message, msglen, "%s%s", desc, className); | |
| 830 THROW_MSG(vmSymbols::java_lang_NoClassDefFoundError(), message); | |
| 831 } | |
| 832 } | |
| 833 | |
| 834 // Step 6 | |
| 835 this_oop->set_init_state(being_initialized); | |
| 836 this_oop->set_init_thread(self); | |
| 837 } | |
| 838 | |
| 839 // Step 7 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
840 Klass* super_klass = this_oop->super(); |
| 6983 | 841 if (super_klass != NULL && !this_oop->is_interface() && super_klass->should_be_initialized()) { |
| 842 super_klass->initialize(THREAD); | |
| 0 | 843 |
| 844 if (HAS_PENDING_EXCEPTION) { | |
| 845 Handle e(THREAD, PENDING_EXCEPTION); | |
| 846 CLEAR_PENDING_EXCEPTION; | |
| 847 { | |
| 848 EXCEPTION_MARK; | |
| 849 this_oop->set_initialization_state_and_notify(initialization_error, THREAD); // Locks object, set state, and notify all waiting threads | |
| 850 CLEAR_PENDING_EXCEPTION; // ignore any exception thrown, superclass initialization error is thrown below | |
| 851 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
852 DTRACE_CLASSINIT_PROBE_WAIT(super__failed, InstanceKlass::cast(this_oop()), -1,wait); |
| 0 | 853 THROW_OOP(e()); |
| 854 } | |
| 855 } | |
| 856 | |
| 6934 | 857 if (this_oop->has_default_methods()) { |
| 858 // Step 7.5: initialize any interfaces which have default methods | |
| 859 for (int i = 0; i < this_oop->local_interfaces()->length(); ++i) { | |
| 860 Klass* iface = this_oop->local_interfaces()->at(i); | |
| 861 InstanceKlass* ik = InstanceKlass::cast(iface); | |
| 862 if (ik->has_default_methods() && ik->should_be_initialized()) { | |
| 863 ik->initialize(THREAD); | |
| 864 | |
| 865 if (HAS_PENDING_EXCEPTION) { | |
| 866 Handle e(THREAD, PENDING_EXCEPTION); | |
| 867 CLEAR_PENDING_EXCEPTION; | |
| 868 { | |
| 869 EXCEPTION_MARK; | |
| 870 // Locks object, set state, and notify all waiting threads | |
| 871 this_oop->set_initialization_state_and_notify( | |
| 872 initialization_error, THREAD); | |
| 873 | |
| 874 // ignore any exception thrown, superclass initialization error is | |
| 875 // thrown below | |
| 876 CLEAR_PENDING_EXCEPTION; | |
| 877 } | |
| 878 DTRACE_CLASSINIT_PROBE_WAIT( | |
| 879 super__failed, InstanceKlass::cast(this_oop()), -1, wait); | |
| 880 THROW_OOP(e()); | |
| 881 } | |
| 882 } | |
| 883 } | |
| 884 } | |
| 885 | |
| 0 | 886 // Step 8 |
| 887 { | |
| 888 assert(THREAD->is_Java_thread(), "non-JavaThread in initialize_impl"); | |
| 889 JavaThread* jt = (JavaThread*)THREAD; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
890 DTRACE_CLASSINIT_PROBE_WAIT(clinit, InstanceKlass::cast(this_oop()), -1,wait); |
| 0 | 891 // Timer includes any side effects of class initialization (resolution, |
| 892 // etc), but not recursive entry into call_class_initializer(). | |
|
875
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
893 PerfClassTraceTime timer(ClassLoader::perf_class_init_time(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
894 ClassLoader::perf_class_init_selftime(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
895 ClassLoader::perf_classes_inited(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
896 jt->get_thread_stat()->perf_recursion_counts_addr(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
897 jt->get_thread_stat()->perf_timers_addr(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
898 PerfClassTraceTime::CLASS_CLINIT); |
| 0 | 899 this_oop->call_class_initializer(THREAD); |
| 900 } | |
| 901 | |
| 902 // Step 9 | |
| 903 if (!HAS_PENDING_EXCEPTION) { | |
| 904 this_oop->set_initialization_state_and_notify(fully_initialized, CHECK); | |
| 905 { ResourceMark rm(THREAD); | |
| 906 debug_only(this_oop->vtable()->verify(tty, true);) | |
| 907 } | |
| 908 } | |
| 909 else { | |
| 910 // Step 10 and 11 | |
| 911 Handle e(THREAD, PENDING_EXCEPTION); | |
| 912 CLEAR_PENDING_EXCEPTION; | |
| 913 { | |
| 914 EXCEPTION_MARK; | |
| 915 this_oop->set_initialization_state_and_notify(initialization_error, THREAD); | |
| 916 CLEAR_PENDING_EXCEPTION; // ignore any exception thrown, class initialization error is thrown below | |
| 917 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
918 DTRACE_CLASSINIT_PROBE_WAIT(error, InstanceKlass::cast(this_oop()), -1,wait); |
| 1142 | 919 if (e->is_a(SystemDictionary::Error_klass())) { |
| 0 | 920 THROW_OOP(e()); |
| 921 } else { | |
| 922 JavaCallArguments args(e); | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
923 THROW_ARG(vmSymbols::java_lang_ExceptionInInitializerError(), |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
924 vmSymbols::throwable_void_signature(), |
| 0 | 925 &args); |
| 926 } | |
| 927 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
928 DTRACE_CLASSINIT_PROBE_WAIT(end, InstanceKlass::cast(this_oop()), -1,wait); |
| 0 | 929 } |
| 930 | |
| 931 | |
| 932 // Note: implementation moved to static method to expose the this pointer. | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
933 void InstanceKlass::set_initialization_state_and_notify(ClassState state, TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
934 instanceKlassHandle kh(THREAD, this); |
| 0 | 935 set_initialization_state_and_notify_impl(kh, state, CHECK); |
| 936 } | |
| 937 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
938 void InstanceKlass::set_initialization_state_and_notify_impl(instanceKlassHandle this_oop, ClassState state, TRAPS) { |
|
12811
3374b92de2d9
8025004: -XX:+CheckUnhandledOops asserts for JDK 8 Solaris fastdebug binaries
coleenp
parents:
12318
diff
changeset
|
939 oop init_lock = this_oop->init_lock(); |
|
12946
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
940 ObjectLocker ol(init_lock, THREAD, init_lock != NULL); |
| 0 | 941 this_oop->set_init_state(state); |
|
12946
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
942 this_oop->fence_and_clear_init_lock(); |
| 0 | 943 ol.notify_all(CHECK); |
| 944 } | |
| 945 | |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
946 // The embedded _implementor field can only record one implementor. |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
947 // When there are more than one implementors, the _implementor field |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
948 // is set to the interface Klass* itself. Following are the possible |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
949 // values for the _implementor field: |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
950 // NULL - no implementor |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
951 // implementor Klass* - one implementor |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
952 // self - more than one implementor |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
953 // |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
954 // The _implementor field only exists for interfaces. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
955 void InstanceKlass::add_implementor(Klass* k) { |
| 0 | 956 assert(Compile_lock->owned_by_self(), ""); |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
957 assert(is_interface(), "not interface"); |
| 0 | 958 // Filter out my subinterfaces. |
| 959 // (Note: Interfaces are never on the subklass list.) | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
960 if (InstanceKlass::cast(k)->is_interface()) return; |
| 0 | 961 |
| 962 // Filter out subclasses whose supers already implement me. | |
| 963 // (Note: CHA must walk subclasses of direct implementors | |
| 964 // in order to locate indirect implementors.) | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
965 Klass* sk = InstanceKlass::cast(k)->super(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
966 if (sk != NULL && InstanceKlass::cast(sk)->implements_interface(this)) |
| 0 | 967 // We only need to check one immediate superclass, since the |
| 968 // implements_interface query looks at transitive_interfaces. | |
| 969 // Any supers of the super have the same (or fewer) transitive_interfaces. | |
| 970 return; | |
| 971 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
972 Klass* ik = implementor(); |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
973 if (ik == NULL) { |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
974 set_implementor(k); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
975 } else if (ik != this) { |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
976 // There is already an implementor. Use itself as an indicator of |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
977 // more than one implementors. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
978 set_implementor(this); |
| 0 | 979 } |
| 980 | |
| 981 // The implementor also implements the transitive_interfaces | |
| 982 for (int index = 0; index < local_interfaces()->length(); index++) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
983 InstanceKlass::cast(local_interfaces()->at(index))->add_implementor(k); |
| 0 | 984 } |
| 985 } | |
| 986 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
987 void InstanceKlass::init_implementor() { |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
988 if (is_interface()) { |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
989 set_implementor(NULL); |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
990 } |
| 0 | 991 } |
| 992 | |
| 993 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
994 void InstanceKlass::process_interfaces(Thread *thread) { |
| 0 | 995 // link this class into the implementors list of every interface it implements |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
996 Klass* this_as_klass_oop = this; |
| 0 | 997 for (int i = local_interfaces()->length() - 1; i >= 0; i--) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
998 assert(local_interfaces()->at(i)->is_klass(), "must be a klass"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
999 InstanceKlass* interf = InstanceKlass::cast(local_interfaces()->at(i)); |
| 0 | 1000 assert(interf->is_interface(), "expected interface"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1001 interf->add_implementor(this_as_klass_oop); |
| 0 | 1002 } |
| 1003 } | |
| 1004 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1005 bool InstanceKlass::can_be_primary_super_slow() const { |
| 0 | 1006 if (is_interface()) |
| 1007 return false; | |
| 1008 else | |
| 1009 return Klass::can_be_primary_super_slow(); | |
| 1010 } | |
| 1011 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1012 GrowableArray<Klass*>* InstanceKlass::compute_secondary_supers(int num_extra_slots) { |
| 0 | 1013 // The secondaries are the implemented interfaces. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1014 InstanceKlass* ik = InstanceKlass::cast(this); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1015 Array<Klass*>* interfaces = ik->transitive_interfaces(); |
| 0 | 1016 int num_secondaries = num_extra_slots + interfaces->length(); |
| 1017 if (num_secondaries == 0) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1018 // Must share this for correct bootstrapping! |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1019 set_secondary_supers(Universe::the_empty_klass_array()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1020 return NULL; |
| 0 | 1021 } else if (num_extra_slots == 0) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1022 // The secondary super list is exactly the same as the transitive interfaces. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1023 // Redefine classes has to be careful not to delete this! |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1024 set_secondary_supers(interfaces); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1025 return NULL; |
| 0 | 1026 } else { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1027 // Copy transitive interfaces to a temporary growable array to be constructed |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1028 // into the secondary super list with extra slots. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1029 GrowableArray<Klass*>* secondaries = new GrowableArray<Klass*>(interfaces->length()); |
| 0 | 1030 for (int i = 0; i < interfaces->length(); i++) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1031 secondaries->push(interfaces->at(i)); |
| 0 | 1032 } |
| 1033 return secondaries; | |
| 1034 } | |
| 1035 } | |
| 1036 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1037 bool InstanceKlass::compute_is_subtype_of(Klass* k) { |
| 6983 | 1038 if (k->is_interface()) { |
| 0 | 1039 return implements_interface(k); |
| 1040 } else { | |
| 1041 return Klass::compute_is_subtype_of(k); | |
| 1042 } | |
| 1043 } | |
| 1044 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1045 bool InstanceKlass::implements_interface(Klass* k) const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1046 if (this == k) return true; |
| 6983 | 1047 assert(k->is_interface(), "should be an interface class"); |
| 0 | 1048 for (int i = 0; i < transitive_interfaces()->length(); i++) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1049 if (transitive_interfaces()->at(i) == k) { |
| 0 | 1050 return true; |
| 1051 } | |
| 1052 } | |
| 1053 return false; | |
| 1054 } | |
| 1055 | |
|
13401
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1056 bool InstanceKlass::is_same_or_direct_interface(Klass *k) const { |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1057 // Verify direct super interface |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1058 if (this == k) return true; |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1059 assert(k->is_interface(), "should be an interface class"); |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1060 for (int i = 0; i < local_interfaces()->length(); i++) { |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1061 if (local_interfaces()->at(i) == k) { |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1062 return true; |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1063 } |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1064 } |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1065 return false; |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1066 } |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1067 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1068 objArrayOop InstanceKlass::allocate_objArray(int n, int length, TRAPS) { |
| 0 | 1069 if (length < 0) THROW_0(vmSymbols::java_lang_NegativeArraySizeException()); |
| 1070 if (length > arrayOopDesc::max_array_length(T_OBJECT)) { | |
|
876
1413494da700
6850957: Honor -XX:OnOutOfMemoryError when array size exceeds VM limit
martin
parents:
875
diff
changeset
|
1071 report_java_out_of_memory("Requested array size exceeds VM limit"); |
|
5935
a735aec54ea4
7123170: JCK vm/jvmti/ResourceExhausted/resexh001/resexh00101/ tests fails since 7u4 b02
sspitsyn
parents:
4739
diff
changeset
|
1072 JvmtiExport::post_array_size_exhausted(); |
| 0 | 1073 THROW_OOP_0(Universe::out_of_memory_error_array_size()); |
| 1074 } | |
| 1075 int size = objArrayOopDesc::object_size(length); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1076 Klass* ak = array_klass(n, CHECK_NULL); |
| 0 | 1077 KlassHandle h_ak (THREAD, ak); |
| 1078 objArrayOop o = | |
| 1079 (objArrayOop)CollectedHeap::array_allocate(h_ak, size, length, CHECK_NULL); | |
| 1080 return o; | |
| 1081 } | |
| 1082 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1083 instanceOop InstanceKlass::register_finalizer(instanceOop i, TRAPS) { |
| 0 | 1084 if (TraceFinalizerRegistration) { |
| 1085 tty->print("Registered "); | |
| 1086 i->print_value_on(tty); | |
| 1087 tty->print_cr(" (" INTPTR_FORMAT ") as finalizable", (address)i); | |
| 1088 } | |
| 1089 instanceHandle h_i(THREAD, i); | |
| 1090 // Pass the handle as argument, JavaCalls::call expects oop as jobjects | |
| 1091 JavaValue result(T_VOID); | |
| 1092 JavaCallArguments args(h_i); | |
| 1093 methodHandle mh (THREAD, Universe::finalizer_register_method()); | |
| 1094 JavaCalls::call(&result, mh, &args, CHECK_NULL); | |
| 1095 return h_i(); | |
| 1096 } | |
| 1097 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1098 instanceOop InstanceKlass::allocate_instance(TRAPS) { |
| 0 | 1099 bool has_finalizer_flag = has_finalizer(); // Query before possible GC |
| 1100 int size = size_helper(); // Query before forming handle. | |
| 1101 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1102 KlassHandle h_k(THREAD, this); |
| 0 | 1103 |
| 1104 instanceOop i; | |
| 1105 | |
| 1106 i = (instanceOop)CollectedHeap::obj_allocate(h_k, size, CHECK_NULL); | |
| 1107 if (has_finalizer_flag && !RegisterFinalizersAtInit) { | |
| 1108 i = register_finalizer(i, CHECK_NULL); | |
| 1109 } | |
| 1110 return i; | |
| 1111 } | |
| 1112 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1113 void InstanceKlass::check_valid_for_instantiation(bool throwError, TRAPS) { |
| 0 | 1114 if (is_interface() || is_abstract()) { |
| 1115 ResourceMark rm(THREAD); | |
| 1116 THROW_MSG(throwError ? vmSymbols::java_lang_InstantiationError() | |
| 1117 : vmSymbols::java_lang_InstantiationException(), external_name()); | |
| 1118 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1119 if (this == SystemDictionary::Class_klass()) { |
| 0 | 1120 ResourceMark rm(THREAD); |
| 1121 THROW_MSG(throwError ? vmSymbols::java_lang_IllegalAccessError() | |
| 1122 : vmSymbols::java_lang_IllegalAccessException(), external_name()); | |
| 1123 } | |
| 1124 } | |
| 1125 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1126 Klass* InstanceKlass::array_klass_impl(bool or_null, int n, TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1127 instanceKlassHandle this_oop(THREAD, this); |
| 0 | 1128 return array_klass_impl(this_oop, or_null, n, THREAD); |
| 1129 } | |
| 1130 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1131 Klass* InstanceKlass::array_klass_impl(instanceKlassHandle this_oop, bool or_null, int n, TRAPS) { |
| 0 | 1132 if (this_oop->array_klasses() == NULL) { |
| 1133 if (or_null) return NULL; | |
| 1134 | |
| 1135 ResourceMark rm; | |
| 1136 JavaThread *jt = (JavaThread *)THREAD; | |
| 1137 { | |
| 1138 // Atomic creation of array_klasses | |
| 1139 MutexLocker mc(Compile_lock, THREAD); // for vtables | |
| 1140 MutexLocker ma(MultiArray_lock, THREAD); | |
| 1141 | |
| 1142 // Check if update has already taken place | |
| 1143 if (this_oop->array_klasses() == NULL) { | |
|
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
1144 Klass* k = ObjArrayKlass::allocate_objArray_klass(this_oop->class_loader_data(), 1, this_oop, CHECK_NULL); |
| 0 | 1145 this_oop->set_array_klasses(k); |
| 1146 } | |
| 1147 } | |
| 1148 } | |
| 1149 // _this will always be set at this point | |
|
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
1150 ObjArrayKlass* oak = (ObjArrayKlass*)this_oop->array_klasses(); |
| 0 | 1151 if (or_null) { |
| 1152 return oak->array_klass_or_null(n); | |
| 1153 } | |
| 1154 return oak->array_klass(n, CHECK_NULL); | |
| 1155 } | |
| 1156 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1157 Klass* InstanceKlass::array_klass_impl(bool or_null, TRAPS) { |
| 0 | 1158 return array_klass_impl(or_null, 1, THREAD); |
| 1159 } | |
| 1160 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1161 void InstanceKlass::call_class_initializer(TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1162 instanceKlassHandle ik (THREAD, this); |
| 0 | 1163 call_class_initializer_impl(ik, THREAD); |
| 1164 } | |
| 1165 | |
| 1166 static int call_class_initializer_impl_counter = 0; // for debugging | |
| 1167 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1168 Method* InstanceKlass::class_initializer() { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1169 Method* clinit = find_method( |
|
2334
dbad0519a1c4
6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents:
2227
diff
changeset
|
1170 vmSymbols::class_initializer_name(), vmSymbols::void_method_signature()); |
|
dbad0519a1c4
6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents:
2227
diff
changeset
|
1171 if (clinit != NULL && clinit->has_valid_initializer_flags()) { |
|
dbad0519a1c4
6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents:
2227
diff
changeset
|
1172 return clinit; |
|
dbad0519a1c4
6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents:
2227
diff
changeset
|
1173 } |
|
dbad0519a1c4
6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents:
2227
diff
changeset
|
1174 return NULL; |
| 0 | 1175 } |
| 1176 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1177 void InstanceKlass::call_class_initializer_impl(instanceKlassHandle this_oop, TRAPS) { |
|
6972
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6934
diff
changeset
|
1178 if (ReplayCompiles && |
|
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6934
diff
changeset
|
1179 (ReplaySuppressInitializers == 1 || |
|
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6934
diff
changeset
|
1180 ReplaySuppressInitializers >= 2 && this_oop->class_loader() != NULL)) { |
|
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6934
diff
changeset
|
1181 // Hide the existence of the initializer for the purpose of replaying the compile |
|
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6934
diff
changeset
|
1182 return; |
|
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6934
diff
changeset
|
1183 } |
|
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6934
diff
changeset
|
1184 |
| 0 | 1185 methodHandle h_method(THREAD, this_oop->class_initializer()); |
| 1186 assert(!this_oop->is_initialized(), "we cannot initialize twice"); | |
| 1187 if (TraceClassInitialization) { | |
| 1188 tty->print("%d Initializing ", call_class_initializer_impl_counter++); | |
| 1189 this_oop->name()->print_value(); | |
| 1190 tty->print_cr("%s (" INTPTR_FORMAT ")", h_method() == NULL ? "(no method)" : "", (address)this_oop()); | |
| 1191 } | |
| 1192 if (h_method() != NULL) { | |
| 1193 JavaCallArguments args; // No arguments | |
| 1194 JavaValue result(T_VOID); | |
| 1195 JavaCalls::call(&result, h_method, &args, CHECK); // Static call (no args) | |
| 1196 } | |
| 1197 } | |
| 1198 | |
| 1199 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1200 void InstanceKlass::mask_for(methodHandle method, int bci, |
| 0 | 1201 InterpreterOopMap* entry_for) { |
| 1202 // Dirty read, then double-check under a lock. | |
| 1203 if (_oop_map_cache == NULL) { | |
| 1204 // Otherwise, allocate a new one. | |
| 1205 MutexLocker x(OopMapCacheAlloc_lock); | |
| 1206 // First time use. Allocate a cache in C heap | |
| 1207 if (_oop_map_cache == NULL) { | |
|
14443
3205e78d8193
8029396: PPC64 (part 212): Several memory ordering fixes in C-code.
goetz
parents:
13401
diff
changeset
|
1208 // Release stores from OopMapCache constructor before assignment |
|
3205e78d8193
8029396: PPC64 (part 212): Several memory ordering fixes in C-code.
goetz
parents:
13401
diff
changeset
|
1209 // to _oop_map_cache. C++ compilers on ppc do not emit the |
|
3205e78d8193
8029396: PPC64 (part 212): Several memory ordering fixes in C-code.
goetz
parents:
13401
diff
changeset
|
1210 // required memory barrier only because of the volatile |
|
3205e78d8193
8029396: PPC64 (part 212): Several memory ordering fixes in C-code.
goetz
parents:
13401
diff
changeset
|
1211 // qualifier of _oop_map_cache. |
|
3205e78d8193
8029396: PPC64 (part 212): Several memory ordering fixes in C-code.
goetz
parents:
13401
diff
changeset
|
1212 OrderAccess::release_store_ptr(&_oop_map_cache, new OopMapCache()); |
| 0 | 1213 } |
| 1214 } | |
| 1215 // _oop_map_cache is constant after init; lookup below does is own locking. | |
| 1216 _oop_map_cache->lookup(method, bci, entry_for); | |
| 1217 } | |
| 1218 | |
| 1219 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1220 bool InstanceKlass::find_local_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1221 for (JavaFieldStream fs(this); !fs.done(); fs.next()) { |
| 3938 | 1222 Symbol* f_name = fs.name(); |
| 1223 Symbol* f_sig = fs.signature(); | |
| 0 | 1224 if (f_name == name && f_sig == sig) { |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
1225 fd->reinitialize(const_cast<InstanceKlass*>(this), fs.index()); |
| 0 | 1226 return true; |
| 1227 } | |
| 1228 } | |
| 1229 return false; | |
| 1230 } | |
| 1231 | |
| 1232 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1233 Klass* InstanceKlass::find_interface_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const { |
| 0 | 1234 const int n = local_interfaces()->length(); |
| 1235 for (int i = 0; i < n; i++) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1236 Klass* intf1 = local_interfaces()->at(i); |
| 6983 | 1237 assert(intf1->is_interface(), "just checking type"); |
| 0 | 1238 // search for field in current interface |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1239 if (InstanceKlass::cast(intf1)->find_local_field(name, sig, fd)) { |
| 0 | 1240 assert(fd->is_static(), "interface field must be static"); |
| 1241 return intf1; | |
| 1242 } | |
| 1243 // search for field in direct superinterfaces | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1244 Klass* intf2 = InstanceKlass::cast(intf1)->find_interface_field(name, sig, fd); |
| 0 | 1245 if (intf2 != NULL) return intf2; |
| 1246 } | |
| 1247 // otherwise field lookup fails | |
| 1248 return NULL; | |
| 1249 } | |
| 1250 | |
| 1251 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1252 Klass* InstanceKlass::find_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const { |
| 0 | 1253 // search order according to newest JVM spec (5.4.3.2, p.167). |
| 1254 // 1) search for field in current klass | |
| 1255 if (find_local_field(name, sig, fd)) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1256 return const_cast<InstanceKlass*>(this); |
| 0 | 1257 } |
| 1258 // 2) search for field recursively in direct superinterfaces | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1259 { Klass* intf = find_interface_field(name, sig, fd); |
| 0 | 1260 if (intf != NULL) return intf; |
| 1261 } | |
| 1262 // 3) apply field lookup recursively if superclass exists | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1263 { Klass* supr = super(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1264 if (supr != NULL) return InstanceKlass::cast(supr)->find_field(name, sig, fd); |
| 0 | 1265 } |
| 1266 // 4) otherwise field lookup fails | |
| 1267 return NULL; | |
| 1268 } | |
| 1269 | |
| 1270 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1271 Klass* InstanceKlass::find_field(Symbol* name, Symbol* sig, bool is_static, fieldDescriptor* fd) const { |
| 0 | 1272 // search order according to newest JVM spec (5.4.3.2, p.167). |
| 1273 // 1) search for field in current klass | |
| 1274 if (find_local_field(name, sig, fd)) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1275 if (fd->is_static() == is_static) return const_cast<InstanceKlass*>(this); |
| 0 | 1276 } |
| 1277 // 2) search for field recursively in direct superinterfaces | |
| 1278 if (is_static) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1279 Klass* intf = find_interface_field(name, sig, fd); |
| 0 | 1280 if (intf != NULL) return intf; |
| 1281 } | |
| 1282 // 3) apply field lookup recursively if superclass exists | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1283 { Klass* supr = super(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1284 if (supr != NULL) return InstanceKlass::cast(supr)->find_field(name, sig, is_static, fd); |
| 0 | 1285 } |
| 1286 // 4) otherwise field lookup fails | |
| 1287 return NULL; | |
| 1288 } | |
| 1289 | |
| 1290 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1291 bool InstanceKlass::find_local_field_from_offset(int offset, bool is_static, fieldDescriptor* fd) const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1292 for (JavaFieldStream fs(this); !fs.done(); fs.next()) { |
| 3938 | 1293 if (fs.offset() == offset) { |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
1294 fd->reinitialize(const_cast<InstanceKlass*>(this), fs.index()); |
| 0 | 1295 if (fd->is_static() == is_static) return true; |
| 1296 } | |
| 1297 } | |
| 1298 return false; | |
| 1299 } | |
| 1300 | |
| 1301 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1302 bool InstanceKlass::find_field_from_offset(int offset, bool is_static, fieldDescriptor* fd) const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1303 Klass* klass = const_cast<InstanceKlass*>(this); |
| 0 | 1304 while (klass != NULL) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1305 if (InstanceKlass::cast(klass)->find_local_field_from_offset(offset, is_static, fd)) { |
| 0 | 1306 return true; |
| 1307 } | |
| 6983 | 1308 klass = klass->super(); |
| 0 | 1309 } |
| 1310 return false; | |
| 1311 } | |
| 1312 | |
| 1313 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1314 void InstanceKlass::methods_do(void f(Method* method)) { |
| 0 | 1315 int len = methods()->length(); |
| 1316 for (int index = 0; index < len; index++) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1317 Method* m = methods()->at(index); |
| 0 | 1318 assert(m->is_method(), "must be method"); |
| 1319 f(m); | |
| 1320 } | |
| 1321 } | |
| 1322 | |
|
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
1323 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1324 void InstanceKlass::do_local_static_fields(FieldClosure* cl) { |
| 3938 | 1325 for (JavaFieldStream fs(this); !fs.done(); fs.next()) { |
| 1326 if (fs.access_flags().is_static()) { | |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
1327 fieldDescriptor& fd = fs.field_descriptor(); |
| 3938 | 1328 cl->do_field(&fd); |
| 1329 } | |
| 0 | 1330 } |
| 1331 } | |
| 1332 | |
| 1333 | |
|
17883
9428a0b94204
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
17810
diff
changeset
|
1334 void InstanceKlass::do_local_static_fields(void f(fieldDescriptor*, Handle, TRAPS), Handle mirror, TRAPS) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1335 instanceKlassHandle h_this(THREAD, this); |
|
17883
9428a0b94204
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
17810
diff
changeset
|
1336 do_local_static_fields_impl(h_this, f, mirror, CHECK); |
| 0 | 1337 } |
| 1338 | |
| 1339 | |
|
17883
9428a0b94204
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
17810
diff
changeset
|
1340 void InstanceKlass::do_local_static_fields_impl(instanceKlassHandle this_k, |
|
9428a0b94204
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
17810
diff
changeset
|
1341 void f(fieldDescriptor* fd, Handle mirror, TRAPS), Handle mirror, TRAPS) { |
|
9428a0b94204
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
17810
diff
changeset
|
1342 for (JavaFieldStream fs(this_k()); !fs.done(); fs.next()) { |
| 3938 | 1343 if (fs.access_flags().is_static()) { |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
1344 fieldDescriptor& fd = fs.field_descriptor(); |
|
17883
9428a0b94204
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
17810
diff
changeset
|
1345 f(&fd, mirror, CHECK); |
| 3938 | 1346 } |
| 0 | 1347 } |
| 1348 } | |
| 1349 | |
| 1350 | |
|
44
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1351 static int compare_fields_by_offset(int* a, int* b) { |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1352 return a[0] - b[0]; |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1353 } |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1354 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1355 void InstanceKlass::do_nonstatic_fields(FieldClosure* cl) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1356 InstanceKlass* super = superklass(); |
| 0 | 1357 if (super != NULL) { |
| 1358 super->do_nonstatic_fields(cl); | |
| 1359 } | |
|
44
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1360 fieldDescriptor fd; |
| 3938 | 1361 int length = java_fields_count(); |
|
44
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1362 // In DebugInfo nonstatic fields are sorted by offset. |
| 6197 | 1363 int* fields_sorted = NEW_C_HEAP_ARRAY(int, 2*(length+1), mtClass); |
|
44
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1364 int j = 0; |
| 3938 | 1365 for (int i = 0; i < length; i += 1) { |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
1366 fd.reinitialize(this, i); |
|
44
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1367 if (!fd.is_static()) { |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1368 fields_sorted[j + 0] = fd.offset(); |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1369 fields_sorted[j + 1] = i; |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1370 j += 2; |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1371 } |
| 0 | 1372 } |
|
44
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1373 if (j > 0) { |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1374 length = j; |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1375 // _sort_Fn is defined in growableArray.hpp. |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1376 qsort(fields_sorted, length/2, 2*sizeof(int), (_sort_Fn)compare_fields_by_offset); |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1377 for (int i = 0; i < length; i += 2) { |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
1378 fd.reinitialize(this, fields_sorted[i + 1]); |
|
44
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1379 assert(!fd.is_static() && fd.offset() == fields_sorted[i], "only nonstatic fields"); |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1380 cl->do_field(&fd); |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1381 } |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1382 } |
| 6197 | 1383 FREE_C_HEAP_ARRAY(int, fields_sorted, mtClass); |
| 0 | 1384 } |
| 1385 | |
| 1386 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1387 void InstanceKlass::array_klasses_do(void f(Klass* k, TRAPS), TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1388 if (array_klasses() != NULL) |
|
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
1389 ArrayKlass::cast(array_klasses())->array_klasses_do(f, THREAD); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1390 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1391 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1392 void InstanceKlass::array_klasses_do(void f(Klass* k)) { |
| 0 | 1393 if (array_klasses() != NULL) |
|
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
1394 ArrayKlass::cast(array_klasses())->array_klasses_do(f); |
| 0 | 1395 } |
| 1396 | |
| 1397 #ifdef ASSERT | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1398 static int linear_search(Array<Method*>* methods, Symbol* name, Symbol* signature) { |
| 0 | 1399 int len = methods->length(); |
| 1400 for (int index = 0; index < len; index++) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1401 Method* m = methods->at(index); |
| 0 | 1402 assert(m->is_method(), "must be method"); |
| 1403 if (m->signature() == signature && m->name() == name) { | |
| 1404 return index; | |
| 1405 } | |
| 1406 } | |
| 1407 return -1; | |
| 1408 } | |
| 1409 #endif | |
| 1410 | |
| 6934 | 1411 static int binary_search(Array<Method*>* methods, Symbol* name) { |
| 0 | 1412 int len = methods->length(); |
| 1413 // methods are sorted, so do binary search | |
| 1414 int l = 0; | |
| 1415 int h = len - 1; | |
| 1416 while (l <= h) { | |
| 1417 int mid = (l + h) >> 1; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1418 Method* m = methods->at(mid); |
| 0 | 1419 assert(m->is_method(), "must be method"); |
| 1420 int res = m->name()->fast_compare(name); | |
| 1421 if (res == 0) { | |
| 6934 | 1422 return mid; |
| 0 | 1423 } else if (res < 0) { |
| 1424 l = mid + 1; | |
| 1425 } else { | |
| 1426 h = mid - 1; | |
| 1427 } | |
| 1428 } | |
| 6934 | 1429 return -1; |
| 1430 } | |
| 1431 | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1432 // find_method looks up the name/signature in the local methods array |
| 6934 | 1433 Method* InstanceKlass::find_method(Symbol* name, Symbol* signature) const { |
|
17889
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1434 return find_method_impl(name, signature, false); |
|
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1435 } |
|
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1436 |
|
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1437 Method* InstanceKlass::find_method_impl(Symbol* name, Symbol* signature, bool skipping_overpass) const { |
| 20785 | 1438 return InstanceKlass::find_method_impl(methods(), name, signature, skipping_overpass, false); |
| 6934 | 1439 } |
| 1440 | |
|
13414
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13401
diff
changeset
|
1441 // find_instance_method looks up the name/signature in the local methods array |
|
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13401
diff
changeset
|
1442 // and skips over static methods |
|
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13401
diff
changeset
|
1443 Method* InstanceKlass::find_instance_method( |
|
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13401
diff
changeset
|
1444 Array<Method*>* methods, Symbol* name, Symbol* signature) { |
| 20785 | 1445 Method* meth = InstanceKlass::find_method_impl(methods, name, signature, false, true); |
|
13414
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13401
diff
changeset
|
1446 return meth; |
|
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13401
diff
changeset
|
1447 } |
|
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13401
diff
changeset
|
1448 |
| 20785 | 1449 // find_instance_method looks up the name/signature in the local methods array |
| 1450 // and skips over static methods | |
| 1451 Method* InstanceKlass::find_instance_method(Symbol* name, Symbol* signature) { | |
| 1452 return InstanceKlass::find_instance_method(methods(), name, signature); | |
| 1453 } | |
| 1454 | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1455 // find_method looks up the name/signature in the local methods array |
| 6934 | 1456 Method* InstanceKlass::find_method( |
| 1457 Array<Method*>* methods, Symbol* name, Symbol* signature) { | |
| 20785 | 1458 return InstanceKlass::find_method_impl(methods, name, signature, false, false); |
|
17889
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1459 } |
|
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1460 |
|
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1461 Method* InstanceKlass::find_method_impl( |
| 20785 | 1462 Array<Method*>* methods, Symbol* name, Symbol* signature, bool skipping_overpass, bool skipping_static) { |
| 1463 int hit = find_method_index(methods, name, signature, skipping_overpass, skipping_static); | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1464 return hit >= 0 ? methods->at(hit): NULL; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1465 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1466 |
| 20785 | 1467 bool InstanceKlass::method_matches(Method* m, Symbol* signature, bool skipping_overpass, bool skipping_static) { |
| 1468 return (m->signature() == signature) && | |
| 1469 (!skipping_overpass || !m->is_overpass()) && | |
| 1470 (!skipping_static || !m->is_static()); | |
| 1471 } | |
| 1472 | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1473 // Used directly for default_methods to find the index into the |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1474 // default_vtable_indices, and indirectly by find_method |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1475 // find_method_index looks in the local methods array to return the index |
|
17889
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1476 // of the matching name/signature. If, overpass methods are being ignored, |
|
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1477 // the search continues to find a potential non-overpass match. This capability |
|
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1478 // is important during method resolution to prefer a static method, for example, |
|
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1479 // over an overpass method. |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1480 int InstanceKlass::find_method_index( |
| 20785 | 1481 Array<Method*>* methods, Symbol* name, Symbol* signature, bool skipping_overpass, bool skipping_static) { |
| 6934 | 1482 int hit = binary_search(methods, name); |
| 1483 if (hit != -1) { | |
| 1484 Method* m = methods->at(hit); | |
| 20785 | 1485 |
| 6934 | 1486 // Do linear search to find matching signature. First, quick check |
|
17889
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1487 // for common case, ignoring overpasses if requested. |
| 20785 | 1488 if (method_matches(m, signature, skipping_overpass, skipping_static)) return hit; |
|
17889
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1489 |
| 6934 | 1490 // search downwards through overloaded methods |
| 1491 int i; | |
| 1492 for (i = hit - 1; i >= 0; --i) { | |
| 1493 Method* m = methods->at(i); | |
| 1494 assert(m->is_method(), "must be method"); | |
| 1495 if (m->name() != name) break; | |
| 20785 | 1496 if (method_matches(m, signature, skipping_overpass, skipping_static)) return i; |
| 6934 | 1497 } |
| 1498 // search upwards | |
| 1499 for (i = hit + 1; i < methods->length(); ++i) { | |
| 1500 Method* m = methods->at(i); | |
| 1501 assert(m->is_method(), "must be method"); | |
| 1502 if (m->name() != name) break; | |
| 20785 | 1503 if (method_matches(m, signature, skipping_overpass, skipping_static)) return i; |
| 6934 | 1504 } |
| 1505 // not found | |
| 0 | 1506 #ifdef ASSERT |
| 20785 | 1507 int index = skipping_overpass || skipping_static ? -1 : linear_search(methods, name, signature); |
| 6934 | 1508 assert(index == -1, err_msg("binary search should have found entry %d", index)); |
| 0 | 1509 #endif |
| 6934 | 1510 } |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1511 return -1; |
| 0 | 1512 } |
| 6934 | 1513 int InstanceKlass::find_method_by_name(Symbol* name, int* end) { |
| 1514 return find_method_by_name(methods(), name, end); | |
| 1515 } | |
| 1516 | |
| 1517 int InstanceKlass::find_method_by_name( | |
| 1518 Array<Method*>* methods, Symbol* name, int* end_ptr) { | |
| 1519 assert(end_ptr != NULL, "just checking"); | |
| 1520 int start = binary_search(methods, name); | |
| 1521 int end = start + 1; | |
| 1522 if (start != -1) { | |
| 1523 while (start - 1 >= 0 && (methods->at(start - 1))->name() == name) --start; | |
| 1524 while (end < methods->length() && (methods->at(end))->name() == name) ++end; | |
| 1525 *end_ptr = end; | |
| 1526 return start; | |
| 1527 } | |
| 1528 return -1; | |
| 1529 } | |
| 1530 | |
|
17464
5832cdaf89c6
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
13438
diff
changeset
|
1531 // uncached_lookup_method searches both the local class methods array and all |
|
5832cdaf89c6
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
13438
diff
changeset
|
1532 // superclasses methods arrays, skipping any overpass methods in superclasses. |
|
17889
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1533 Method* InstanceKlass::uncached_lookup_method(Symbol* name, Symbol* signature, MethodLookupMode mode) const { |
|
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1534 MethodLookupMode lookup_mode = mode; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1535 Klass* klass = const_cast<InstanceKlass*>(this); |
| 0 | 1536 while (klass != NULL) { |
|
17889
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1537 Method* method = InstanceKlass::cast(klass)->find_method_impl(name, signature, (lookup_mode == skip_overpass)); |
|
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1538 if (method != NULL) { |
|
17464
5832cdaf89c6
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
13438
diff
changeset
|
1539 return method; |
|
5832cdaf89c6
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
13438
diff
changeset
|
1540 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1541 klass = InstanceKlass::cast(klass)->super(); |
|
17889
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1542 lookup_mode = skip_overpass; // Always ignore overpass methods in superclasses |
| 0 | 1543 } |
| 1544 return NULL; | |
| 1545 } | |
| 1546 | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1547 // lookup a method in the default methods list then in all transitive interfaces |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1548 // Do NOT return private or static methods |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1549 Method* InstanceKlass::lookup_method_in_ordered_interfaces(Symbol* name, |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1550 Symbol* signature) const { |
|
12828
d25557d03ec0
8026185: nsk/jvmit/GetMethodDeclaringClass/declcls001 failed
acorn
parents:
12823
diff
changeset
|
1551 Method* m = NULL; |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1552 if (default_methods() != NULL) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1553 m = find_method(default_methods(), name, signature); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1554 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1555 // Look up interfaces |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1556 if (m == NULL) { |
|
17889
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1557 m = lookup_method_in_all_interfaces(name, signature, normal); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1558 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1559 return m; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1560 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1561 |
| 0 | 1562 // lookup a method in all the interfaces that this class implements |
|
12318
36b97be47bde
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
12316
diff
changeset
|
1563 // Do NOT return private or static methods, new in JDK8 which are not externally visible |
|
36b97be47bde
8011311: Private interface methods. Default conflicts:ICCE. no erased_super_default.
acorn
parents:
12316
diff
changeset
|
1564 // They should only be found in the initial InterfaceMethodRef |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1565 Method* InstanceKlass::lookup_method_in_all_interfaces(Symbol* name, |
|
17464
5832cdaf89c6
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
13438
diff
changeset
|
1566 Symbol* signature, |
|
17889
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1567 MethodLookupMode mode) const { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1568 Array<Klass*>* all_ifs = transitive_interfaces(); |
| 0 | 1569 int num_ifs = all_ifs->length(); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1570 InstanceKlass *ik = NULL; |
| 0 | 1571 for (int i = 0; i < num_ifs; i++) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1572 ik = InstanceKlass::cast(all_ifs->at(i)); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1573 Method* m = ik->lookup_method(name, signature); |
|
17464
5832cdaf89c6
8027804: JCK resolveMethod test fails expecting AbstractMethodError
hseigel
parents:
13438
diff
changeset
|
1574 if (m != NULL && m->is_public() && !m->is_static() && |
|
17889
386dd1c71858
8033150: invokestatic: IncompatibleClassChangeError trying to invoke static method from a parent in presence of conflicting defaults.
lfoltan
parents:
17883
diff
changeset
|
1575 ((mode != skip_defaults) || !m->is_default_method())) { |
| 0 | 1576 return m; |
| 1577 } | |
| 1578 } | |
| 1579 return NULL; | |
| 1580 } | |
| 1581 | |
| 1582 /* jni_id_for_impl for jfieldIds only */ | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1583 JNIid* InstanceKlass::jni_id_for_impl(instanceKlassHandle this_oop, int offset) { |
| 0 | 1584 MutexLocker ml(JfieldIdCreation_lock); |
| 1585 // Retry lookup after we got the lock | |
| 1586 JNIid* probe = this_oop->jni_ids() == NULL ? NULL : this_oop->jni_ids()->find(offset); | |
| 1587 if (probe == NULL) { | |
| 1588 // Slow case, allocate new static field identifier | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1589 probe = new JNIid(this_oop(), offset, this_oop->jni_ids()); |
| 0 | 1590 this_oop->set_jni_ids(probe); |
| 1591 } | |
| 1592 return probe; | |
| 1593 } | |
| 1594 | |
| 1595 | |
| 1596 /* jni_id_for for jfieldIds only */ | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1597 JNIid* InstanceKlass::jni_id_for(int offset) { |
| 0 | 1598 JNIid* probe = jni_ids() == NULL ? NULL : jni_ids()->find(offset); |
| 1599 if (probe == NULL) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1600 probe = jni_id_for_impl(this, offset); |
| 0 | 1601 } |
| 1602 return probe; | |
| 1603 } | |
| 1604 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1605 u2 InstanceKlass::enclosing_method_data(int offset) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1606 Array<jushort>* inner_class_list = inner_classes(); |
|
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1607 if (inner_class_list == NULL) { |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1608 return 0; |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1609 } |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1610 int length = inner_class_list->length(); |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1611 if (length % inner_class_next_offset == 0) { |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1612 return 0; |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1613 } else { |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1614 int index = length - enclosing_method_attribute_size; |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1615 assert(offset < enclosing_method_attribute_size, "invalid offset"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1616 return inner_class_list->at(index + offset); |
|
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1617 } |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1618 } |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1619 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1620 void InstanceKlass::set_enclosing_method_indices(u2 class_index, |
|
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1621 u2 method_index) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1622 Array<jushort>* inner_class_list = inner_classes(); |
|
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1623 assert (inner_class_list != NULL, "_inner_classes list is not set up"); |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1624 int length = inner_class_list->length(); |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1625 if (length % inner_class_next_offset == enclosing_method_attribute_size) { |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1626 int index = length - enclosing_method_attribute_size; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1627 inner_class_list->at_put( |
|
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1628 index + enclosing_method_class_index_offset, class_index); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1629 inner_class_list->at_put( |
|
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1630 index + enclosing_method_method_index_offset, method_index); |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1631 } |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
1632 } |
| 0 | 1633 |
| 1634 // Lookup or create a jmethodID. | |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1635 // This code is called by the VMThread and JavaThreads so the |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1636 // locking has to be done very carefully to avoid deadlocks |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1637 // and/or other cache consistency problems. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1638 // |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1639 jmethodID InstanceKlass::get_jmethod_id(instanceKlassHandle ik_h, methodHandle method_h) { |
| 0 | 1640 size_t idnum = (size_t)method_h->method_idnum(); |
| 1641 jmethodID* jmeths = ik_h->methods_jmethod_ids_acquire(); | |
| 1642 size_t length = 0; | |
| 1643 jmethodID id = NULL; | |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1644 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1645 // We use a double-check locking idiom here because this cache is |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1646 // performance sensitive. In the normal system, this cache only |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1647 // transitions from NULL to non-NULL which is safe because we use |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1648 // release_set_methods_jmethod_ids() to advertise the new cache. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1649 // A partially constructed cache should never be seen by a racing |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1650 // thread. We also use release_store_ptr() to save a new jmethodID |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1651 // in the cache so a partially constructed jmethodID should never be |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1652 // seen either. Cache reads of existing jmethodIDs proceed without a |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1653 // lock, but cache writes of a new jmethodID requires uniqueness and |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1654 // creation of the cache itself requires no leaks so a lock is |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1655 // generally acquired in those two cases. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1656 // |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1657 // If the RedefineClasses() API has been used, then this cache can |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1658 // grow and we'll have transitions from non-NULL to bigger non-NULL. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1659 // Cache creation requires no leaks and we require safety between all |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1660 // cache accesses and freeing of the old cache so a lock is generally |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1661 // acquired when the RedefineClasses() API has been used. |
| 0 | 1662 |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1663 if (jmeths != NULL) { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1664 // the cache already exists |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1665 if (!ik_h->idnum_can_increment()) { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1666 // the cache can't grow so we can just get the current values |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1667 get_jmethod_id_length_value(jmeths, idnum, &length, &id); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1668 } else { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1669 // cache can grow so we have to be more careful |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1670 if (Threads::number_of_threads() == 0 || |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1671 SafepointSynchronize::is_at_safepoint()) { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1672 // we're single threaded or at a safepoint - no locking needed |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1673 get_jmethod_id_length_value(jmeths, idnum, &length, &id); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1674 } else { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1675 MutexLocker ml(JmethodIdCreation_lock); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1676 get_jmethod_id_length_value(jmeths, idnum, &length, &id); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1677 } |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1678 } |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1679 } |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1680 // implied else: |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1681 // we need to allocate a cache so default length and id values are good |
| 0 | 1682 |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1683 if (jmeths == NULL || // no cache yet |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1684 length <= idnum || // cache is too short |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1685 id == NULL) { // cache doesn't contain entry |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1686 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1687 // This function can be called by the VMThread so we have to do all |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1688 // things that might block on a safepoint before grabbing the lock. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1689 // Otherwise, we can deadlock with the VMThread or have a cache |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1690 // consistency issue. These vars keep track of what we might have |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1691 // to free after the lock is dropped. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1692 jmethodID to_dealloc_id = NULL; |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1693 jmethodID* to_dealloc_jmeths = NULL; |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1694 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1695 // may not allocate new_jmeths or use it if we allocate it |
| 0 | 1696 jmethodID* new_jmeths = NULL; |
| 1697 if (length <= idnum) { | |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1698 // allocate a new cache that might be used |
| 0 | 1699 size_t size = MAX2(idnum+1, (size_t)ik_h->idnum_allocated_count()); |
| 6197 | 1700 new_jmeths = NEW_C_HEAP_ARRAY(jmethodID, size+1, mtClass); |
| 0 | 1701 memset(new_jmeths, 0, (size+1)*sizeof(jmethodID)); |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1702 // cache size is stored in element[0], other elements offset by one |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1703 new_jmeths[0] = (jmethodID)size; |
| 0 | 1704 } |
| 1705 | |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1706 // allocate a new jmethodID that might be used |
| 0 | 1707 jmethodID new_id = NULL; |
| 1708 if (method_h->is_old() && !method_h->is_obsolete()) { | |
| 1709 // The method passed in is old (but not obsolete), we need to use the current version | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1710 Method* current_method = ik_h->method_with_idnum((int)idnum); |
| 0 | 1711 assert(current_method != NULL, "old and but not obsolete, so should exist"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1712 new_id = Method::make_jmethod_id(ik_h->class_loader_data(), current_method); |
| 0 | 1713 } else { |
| 1714 // It is the current version of the method or an obsolete method, | |
| 1715 // use the version passed in | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1716 new_id = Method::make_jmethod_id(ik_h->class_loader_data(), method_h()); |
| 0 | 1717 } |
| 1718 | |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1719 if (Threads::number_of_threads() == 0 || |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1720 SafepointSynchronize::is_at_safepoint()) { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1721 // we're single threaded or at a safepoint - no locking needed |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1722 id = get_jmethod_id_fetch_or_update(ik_h, idnum, new_id, new_jmeths, |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1723 &to_dealloc_id, &to_dealloc_jmeths); |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1724 } else { |
| 0 | 1725 MutexLocker ml(JmethodIdCreation_lock); |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1726 id = get_jmethod_id_fetch_or_update(ik_h, idnum, new_id, new_jmeths, |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1727 &to_dealloc_id, &to_dealloc_jmeths); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1728 } |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1729 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1730 // The lock has been dropped so we can free resources. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1731 // Free up either the old cache or the new cache if we allocated one. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1732 if (to_dealloc_jmeths != NULL) { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1733 FreeHeap(to_dealloc_jmeths); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1734 } |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1735 // free up the new ID since it wasn't needed |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1736 if (to_dealloc_id != NULL) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1737 Method::destroy_jmethod_id(ik_h->class_loader_data(), to_dealloc_id); |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1738 } |
|
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1739 } |
|
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1740 return id; |
|
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1741 } |
| 0 | 1742 |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1743 |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1744 // Common code to fetch the jmethodID from the cache or update the |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1745 // cache with the new jmethodID. This function should never do anything |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1746 // that causes the caller to go to a safepoint or we can deadlock with |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1747 // the VMThread or have cache consistency issues. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1748 // |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1749 jmethodID InstanceKlass::get_jmethod_id_fetch_or_update( |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1750 instanceKlassHandle ik_h, size_t idnum, jmethodID new_id, |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1751 jmethodID* new_jmeths, jmethodID* to_dealloc_id_p, |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1752 jmethodID** to_dealloc_jmeths_p) { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1753 assert(new_id != NULL, "sanity check"); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1754 assert(to_dealloc_id_p != NULL, "sanity check"); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1755 assert(to_dealloc_jmeths_p != NULL, "sanity check"); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1756 assert(Threads::number_of_threads() == 0 || |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1757 SafepointSynchronize::is_at_safepoint() || |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1758 JmethodIdCreation_lock->owned_by_self(), "sanity check"); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1759 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1760 // reacquire the cache - we are locked, single threaded or at a safepoint |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1761 jmethodID* jmeths = ik_h->methods_jmethod_ids_acquire(); |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1762 jmethodID id = NULL; |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1763 size_t length = 0; |
| 0 | 1764 |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1765 if (jmeths == NULL || // no cache yet |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1766 (length = (size_t)jmeths[0]) <= idnum) { // cache is too short |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1767 if (jmeths != NULL) { |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1768 // copy any existing entries from the old cache |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1769 for (size_t index = 0; index < length; index++) { |
|
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1770 new_jmeths[index+1] = jmeths[index+1]; |
| 0 | 1771 } |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1772 *to_dealloc_jmeths_p = jmeths; // save old cache for later delete |
| 0 | 1773 } |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1774 ik_h->release_set_methods_jmethod_ids(jmeths = new_jmeths); |
|
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1775 } else { |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1776 // fetch jmethodID (if any) from the existing cache |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1777 id = jmeths[idnum+1]; |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1778 *to_dealloc_jmeths_p = new_jmeths; // save new cache for later delete |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1779 } |
|
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1780 if (id == NULL) { |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1781 // No matching jmethodID in the existing cache or we have a new |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1782 // cache or we just grew the cache. This cache write is done here |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1783 // by the first thread to win the foot race because a jmethodID |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1784 // needs to be unique once it is generally available. |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1785 id = new_id; |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1786 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1787 // The jmethodID cache can be read while unlocked so we have to |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1788 // make sure the new jmethodID is complete before installing it |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1789 // in the cache. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1790 OrderAccess::release_store_ptr(&jmeths[idnum+1], id); |
|
49
31000d79ec71
6453355: 4/4 new No_Safepoint_Verifier uses fail during GC
dcubed
parents:
47
diff
changeset
|
1791 } else { |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1792 *to_dealloc_id_p = new_id; // save new id for later delete |
| 0 | 1793 } |
| 1794 return id; | |
| 1795 } | |
| 1796 | |
| 1797 | |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1798 // Common code to get the jmethodID cache length and the jmethodID |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1799 // value at index idnum if there is one. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1800 // |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1801 void InstanceKlass::get_jmethod_id_length_value(jmethodID* cache, |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1802 size_t idnum, size_t *length_p, jmethodID* id_p) { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1803 assert(cache != NULL, "sanity check"); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1804 assert(length_p != NULL, "sanity check"); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1805 assert(id_p != NULL, "sanity check"); |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1806 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1807 // cache size is stored in element[0], other elements offset by one |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1808 *length_p = (size_t)cache[0]; |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1809 if (*length_p <= idnum) { // cache is too short |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1810 *id_p = NULL; |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1811 } else { |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1812 *id_p = cache[idnum+1]; // fetch jmethodID (if any) |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1813 } |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1814 } |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1815 |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1816 |
| 0 | 1817 // Lookup a jmethodID, NULL if not found. Do no blocking, no allocations, no handles |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1818 jmethodID InstanceKlass::jmethod_id_or_null(Method* method) { |
| 0 | 1819 size_t idnum = (size_t)method->method_idnum(); |
| 1820 jmethodID* jmeths = methods_jmethod_ids_acquire(); | |
| 1821 size_t length; // length assigned as debugging crumb | |
| 1822 jmethodID id = NULL; | |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
1823 if (jmeths != NULL && // If there is a cache |
| 0 | 1824 (length = (size_t)jmeths[0]) > idnum) { // and if it is long enough, |
| 1825 id = jmeths[idnum+1]; // Look up the id (may be NULL) | |
| 1826 } | |
| 1827 return id; | |
| 1828 } | |
| 1829 | |
| 1830 | |
| 1831 // | |
| 1832 // Walk the list of dependent nmethods searching for nmethods which | |
|
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
3748
diff
changeset
|
1833 // are dependent on the changes that were passed in and mark them for |
| 0 | 1834 // deoptimization. Returns the number of nmethods found. |
| 1835 // | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1836 int InstanceKlass::mark_dependent_nmethods(DepChange& changes) { |
| 0 | 1837 assert_locked_or_safepoint(CodeCache_lock); |
| 1838 int found = 0; | |
| 1839 nmethodBucket* b = _dependencies; | |
| 1840 while (b != NULL) { | |
| 1841 nmethod* nm = b->get_nmethod(); | |
| 1842 // since dependencies aren't removed until an nmethod becomes a zombie, | |
| 1843 // the dependency list may contain nmethods which aren't alive. | |
| 1844 if (nm->is_alive() && !nm->is_marked_for_deoptimization() && nm->check_dependency_on(changes)) { | |
| 1845 if (TraceDependencies) { | |
| 1846 ResourceMark rm; | |
| 1847 tty->print_cr("Marked for deoptimization"); | |
| 1848 tty->print_cr(" context = %s", this->external_name()); | |
| 1849 changes.print(); | |
| 1850 nm->print(); | |
| 1851 nm->print_dependencies(); | |
| 1852 } | |
| 1853 nm->mark_for_deoptimization(); | |
| 1854 found++; | |
| 1855 } | |
| 1856 b = b->next(); | |
| 1857 } | |
| 1858 return found; | |
| 1859 } | |
| 1860 | |
| 1861 | |
| 1862 // | |
| 1863 // Add an nmethodBucket to the list of dependencies for this nmethod. | |
| 1864 // It's possible that an nmethod has multiple dependencies on this klass | |
| 1865 // so a count is kept for each bucket to guarantee that creation and | |
| 1866 // deletion of dependencies is consistent. | |
| 1867 // | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1868 void InstanceKlass::add_dependent_nmethod(nmethod* nm) { |
| 0 | 1869 assert_locked_or_safepoint(CodeCache_lock); |
| 1870 nmethodBucket* b = _dependencies; | |
| 1871 nmethodBucket* last = NULL; | |
| 1872 while (b != NULL) { | |
| 1873 if (nm == b->get_nmethod()) { | |
| 1874 b->increment(); | |
| 1875 return; | |
| 1876 } | |
| 1877 b = b->next(); | |
| 1878 } | |
| 1879 _dependencies = new nmethodBucket(nm, _dependencies); | |
| 1880 } | |
| 1881 | |
| 1882 | |
| 1883 // | |
| 1884 // Decrement count of the nmethod in the dependency list and remove | |
| 1885 // the bucket competely when the count goes to 0. This method must | |
| 1886 // find a corresponding bucket otherwise there's a bug in the | |
| 1887 // recording of dependecies. | |
| 1888 // | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1889 void InstanceKlass::remove_dependent_nmethod(nmethod* nm) { |
| 0 | 1890 assert_locked_or_safepoint(CodeCache_lock); |
| 1891 nmethodBucket* b = _dependencies; | |
| 1892 nmethodBucket* last = NULL; | |
| 1893 while (b != NULL) { | |
| 1894 if (nm == b->get_nmethod()) { | |
| 1895 if (b->decrement() == 0) { | |
| 1896 if (last == NULL) { | |
| 1897 _dependencies = b->next(); | |
| 1898 } else { | |
| 1899 last->set_next(b->next()); | |
| 1900 } | |
| 1901 delete b; | |
| 1902 } | |
| 1903 return; | |
| 1904 } | |
| 1905 last = b; | |
| 1906 b = b->next(); | |
| 1907 } | |
| 1908 #ifdef ASSERT | |
| 1909 tty->print_cr("### %s can't find dependent nmethod:", this->external_name()); | |
| 1910 nm->print(); | |
| 1911 #endif // ASSERT | |
| 1912 ShouldNotReachHere(); | |
| 1913 } | |
| 1914 | |
| 1915 | |
| 1916 #ifndef PRODUCT | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1917 void InstanceKlass::print_dependent_nmethods(bool verbose) { |
| 0 | 1918 nmethodBucket* b = _dependencies; |
| 1919 int idx = 0; | |
| 1920 while (b != NULL) { | |
| 1921 nmethod* nm = b->get_nmethod(); | |
| 1922 tty->print("[%d] count=%d { ", idx++, b->count()); | |
| 1923 if (!verbose) { | |
| 1924 nm->print_on(tty, "nmethod"); | |
| 1925 tty->print_cr(" } "); | |
| 1926 } else { | |
| 1927 nm->print(); | |
| 1928 nm->print_dependencies(); | |
| 1929 tty->print_cr("--- } "); | |
| 1930 } | |
| 1931 b = b->next(); | |
| 1932 } | |
| 1933 } | |
| 1934 | |
| 1935 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1936 bool InstanceKlass::is_dependent_nmethod(nmethod* nm) { |
| 0 | 1937 nmethodBucket* b = _dependencies; |
| 1938 while (b != NULL) { | |
| 1939 if (nm == b->get_nmethod()) { | |
| 1940 return true; | |
| 1941 } | |
| 1942 b = b->next(); | |
| 1943 } | |
| 1944 return false; | |
| 1945 } | |
| 1946 #endif //PRODUCT | |
| 1947 | |
| 1948 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1949 // Garbage collection |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1950 |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1951 #ifdef ASSERT |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1952 template <class T> void assert_is_in(T *p) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1953 T heap_oop = oopDesc::load_heap_oop(p); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1954 if (!oopDesc::is_null(heap_oop)) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1955 oop o = oopDesc::decode_heap_oop_not_null(heap_oop); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1956 assert(Universe::heap()->is_in(o), "should be in heap"); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1957 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1958 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1959 template <class T> void assert_is_in_closed_subset(T *p) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1960 T heap_oop = oopDesc::load_heap_oop(p); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1961 if (!oopDesc::is_null(heap_oop)) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1962 oop o = oopDesc::decode_heap_oop_not_null(heap_oop); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1963 assert(Universe::heap()->is_in_closed_subset(o), |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1964 err_msg("should be in closed *p " INTPTR_FORMAT " " INTPTR_FORMAT, (address)p, (address)o)); |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1965 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1966 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1967 template <class T> void assert_is_in_reserved(T *p) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1968 T heap_oop = oopDesc::load_heap_oop(p); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1969 if (!oopDesc::is_null(heap_oop)) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1970 oop o = oopDesc::decode_heap_oop_not_null(heap_oop); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1971 assert(Universe::heap()->is_in_reserved(o), "should be in reserved"); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1972 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1973 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1974 template <class T> void assert_nothing(T *p) {} |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1975 |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1976 #else |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1977 template <class T> void assert_is_in(T *p) {} |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1978 template <class T> void assert_is_in_closed_subset(T *p) {} |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1979 template <class T> void assert_is_in_reserved(T *p) {} |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1980 template <class T> void assert_nothing(T *p) {} |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1981 #endif // ASSERT |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1982 |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1983 // |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1984 // Macros that iterate over areas of oops which are specialized on type of |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1985 // oop pointer either narrow or wide, depending on UseCompressedOops |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1986 // |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1987 // Parameters are: |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1988 // T - type of oop to point to (either oop or narrowOop) |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1989 // start_p - starting pointer for region to iterate over |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1990 // count - number of oops or narrowOops to iterate over |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1991 // do_oop - action to perform on each oop (it's arbitrary C code which |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1992 // makes it more efficient to put in a macro rather than making |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1993 // it a template function) |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1994 // assert_fn - assert function which is template function because performance |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1995 // doesn't matter when enabled. |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1996 #define InstanceKlass_SPECIALIZED_OOP_ITERATE( \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1997 T, start_p, count, do_oop, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1998 assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
1999 { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2000 T* p = (T*)(start_p); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2001 T* const end = p + (count); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2002 while (p < end) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2003 (assert_fn)(p); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2004 do_oop; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2005 ++p; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2006 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2007 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2008 |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2009 #define InstanceKlass_SPECIALIZED_OOP_REVERSE_ITERATE( \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2010 T, start_p, count, do_oop, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2011 assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2012 { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2013 T* const start = (T*)(start_p); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2014 T* p = start + (count); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2015 while (start < p) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2016 --p; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2017 (assert_fn)(p); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2018 do_oop; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2019 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2020 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2021 |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2022 #define InstanceKlass_SPECIALIZED_BOUNDED_OOP_ITERATE( \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2023 T, start_p, count, low, high, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2024 do_oop, assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2025 { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2026 T* const l = (T*)(low); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2027 T* const h = (T*)(high); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2028 assert(mask_bits((intptr_t)l, sizeof(T)-1) == 0 && \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2029 mask_bits((intptr_t)h, sizeof(T)-1) == 0, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2030 "bounded region must be properly aligned"); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2031 T* p = (T*)(start_p); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2032 T* end = p + (count); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2033 if (p < l) p = l; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2034 if (end > h) end = h; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2035 while (p < end) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2036 (assert_fn)(p); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2037 do_oop; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2038 ++p; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2039 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2040 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2041 |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2042 |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2043 // The following macros call specialized macros, passing either oop or |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2044 // narrowOop as the specialization type. These test the UseCompressedOops |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2045 // flag. |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2046 #define InstanceKlass_OOP_MAP_ITERATE(obj, do_oop, assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2047 { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2048 /* Compute oopmap block range. The common case \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2049 is nonstatic_oop_map_size == 1. */ \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2050 OopMapBlock* map = start_of_nonstatic_oop_maps(); \ |
| 938 | 2051 OopMapBlock* const end_map = map + nonstatic_oop_map_count(); \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2052 if (UseCompressedOops) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2053 while (map < end_map) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2054 InstanceKlass_SPECIALIZED_OOP_ITERATE(narrowOop, \ |
| 938 | 2055 obj->obj_field_addr<narrowOop>(map->offset()), map->count(), \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2056 do_oop, assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2057 ++map; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2058 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2059 } else { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2060 while (map < end_map) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2061 InstanceKlass_SPECIALIZED_OOP_ITERATE(oop, \ |
| 938 | 2062 obj->obj_field_addr<oop>(map->offset()), map->count(), \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2063 do_oop, assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2064 ++map; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2065 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2066 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2067 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2068 |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2069 #define InstanceKlass_OOP_MAP_REVERSE_ITERATE(obj, do_oop, assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2070 { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2071 OopMapBlock* const start_map = start_of_nonstatic_oop_maps(); \ |
| 938 | 2072 OopMapBlock* map = start_map + nonstatic_oop_map_count(); \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2073 if (UseCompressedOops) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2074 while (start_map < map) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2075 --map; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2076 InstanceKlass_SPECIALIZED_OOP_REVERSE_ITERATE(narrowOop, \ |
| 938 | 2077 obj->obj_field_addr<narrowOop>(map->offset()), map->count(), \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2078 do_oop, assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2079 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2080 } else { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2081 while (start_map < map) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2082 --map; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2083 InstanceKlass_SPECIALIZED_OOP_REVERSE_ITERATE(oop, \ |
| 938 | 2084 obj->obj_field_addr<oop>(map->offset()), map->count(), \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2085 do_oop, assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2086 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2087 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2088 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2089 |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2090 #define InstanceKlass_BOUNDED_OOP_MAP_ITERATE(obj, low, high, do_oop, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2091 assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2092 { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2093 /* Compute oopmap block range. The common case is \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2094 nonstatic_oop_map_size == 1, so we accept the \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2095 usually non-existent extra overhead of examining \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2096 all the maps. */ \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2097 OopMapBlock* map = start_of_nonstatic_oop_maps(); \ |
| 938 | 2098 OopMapBlock* const end_map = map + nonstatic_oop_map_count(); \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2099 if (UseCompressedOops) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2100 while (map < end_map) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2101 InstanceKlass_SPECIALIZED_BOUNDED_OOP_ITERATE(narrowOop, \ |
| 938 | 2102 obj->obj_field_addr<narrowOop>(map->offset()), map->count(), \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2103 low, high, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2104 do_oop, assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2105 ++map; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2106 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2107 } else { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2108 while (map < end_map) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2109 InstanceKlass_SPECIALIZED_BOUNDED_OOP_ITERATE(oop, \ |
| 938 | 2110 obj->obj_field_addr<oop>(map->offset()), map->count(), \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2111 low, high, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2112 do_oop, assert_fn) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2113 ++map; \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2114 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2115 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2116 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2117 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2118 void InstanceKlass::oop_follow_contents(oop obj) { |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2119 assert(obj != NULL, "can't follow the content of NULL object"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2120 MarkSweep::follow_klass(obj->klass()); |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2121 InstanceKlass_OOP_MAP_ITERATE( \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2122 obj, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2123 MarkSweep::mark_and_push(p), \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2124 assert_is_in_closed_subset) |
| 0 | 2125 } |
| 2126 | |
|
8001
db9981fd3124
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS
jprovino
parents:
7610
diff
changeset
|
2127 #if INCLUDE_ALL_GCS |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2128 void InstanceKlass::oop_follow_contents(ParCompactionManager* cm, |
| 0 | 2129 oop obj) { |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2130 assert(obj != NULL, "can't follow the content of NULL object"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2131 PSParallelCompact::follow_klass(cm, obj->klass()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2132 // Only mark the header and let the scan of the meta-data mark |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2133 // everything else. |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2134 InstanceKlass_OOP_MAP_ITERATE( \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2135 obj, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2136 PSParallelCompact::mark_and_push(cm, p), \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2137 assert_is_in) |
| 0 | 2138 } |
|
8001
db9981fd3124
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS
jprovino
parents:
7610
diff
changeset
|
2139 #endif // INCLUDE_ALL_GCS |
| 0 | 2140 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2141 // closure's do_metadata() method dictates whether the given closure should be |
| 0 | 2142 // applied to the klass ptr in the object header. |
| 2143 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2144 #define if_do_metadata_checked(closure, nv_suffix) \ |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2145 /* Make sure the non-virtual and the virtual versions match. */ \ |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2146 assert(closure->do_metadata##nv_suffix() == closure->do_metadata(), \ |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2147 "Inconsistency in do_metadata"); \ |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2148 if (closure->do_metadata##nv_suffix()) |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2149 |
|
342
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2150 #define InstanceKlass_OOP_OOP_ITERATE_DEFN(OopClosureType, nv_suffix) \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2151 \ |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2152 int InstanceKlass::oop_oop_iterate##nv_suffix(oop obj, OopClosureType* closure) { \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2153 SpecializationStats::record_iterate_call##nv_suffix(SpecializationStats::ik);\ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2154 /* header */ \ |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2155 if_do_metadata_checked(closure, nv_suffix) { \ |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2156 closure->do_klass##nv_suffix(obj->klass()); \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2157 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2158 InstanceKlass_OOP_MAP_ITERATE( \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2159 obj, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2160 SpecializationStats:: \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2161 record_do_oop_call##nv_suffix(SpecializationStats::ik); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2162 (closure)->do_oop##nv_suffix(p), \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2163 assert_is_in_closed_subset) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2164 return size_helper(); \ |
| 0 | 2165 } |
| 2166 | |
|
8001
db9981fd3124
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS
jprovino
parents:
7610
diff
changeset
|
2167 #if INCLUDE_ALL_GCS |
|
342
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2168 #define InstanceKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN(OopClosureType, nv_suffix) \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2169 \ |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2170 int InstanceKlass::oop_oop_iterate_backwards##nv_suffix(oop obj, \ |
|
342
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2171 OopClosureType* closure) { \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2172 SpecializationStats::record_iterate_call##nv_suffix(SpecializationStats::ik); \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2173 /* header */ \ |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2174 if_do_metadata_checked(closure, nv_suffix) { \ |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2175 closure->do_klass##nv_suffix(obj->klass()); \ |
|
342
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2176 } \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2177 /* instance variables */ \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2178 InstanceKlass_OOP_MAP_REVERSE_ITERATE( \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2179 obj, \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2180 SpecializationStats::record_do_oop_call##nv_suffix(SpecializationStats::ik);\ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2181 (closure)->do_oop##nv_suffix(p), \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2182 assert_is_in_closed_subset) \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2183 return size_helper(); \ |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2184 } |
|
8001
db9981fd3124
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS
jprovino
parents:
7610
diff
changeset
|
2185 #endif // INCLUDE_ALL_GCS |
|
342
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2186 |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2187 #define InstanceKlass_OOP_OOP_ITERATE_DEFN_m(OopClosureType, nv_suffix) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2188 \ |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2189 int InstanceKlass::oop_oop_iterate##nv_suffix##_m(oop obj, \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2190 OopClosureType* closure, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2191 MemRegion mr) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2192 SpecializationStats::record_iterate_call##nv_suffix(SpecializationStats::ik);\ |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2193 if_do_metadata_checked(closure, nv_suffix) { \ |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2194 if (mr.contains(obj)) { \ |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2195 closure->do_klass##nv_suffix(obj->klass()); \ |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2196 } \ |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2197 } \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2198 InstanceKlass_BOUNDED_OOP_MAP_ITERATE( \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2199 obj, mr.start(), mr.end(), \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2200 (closure)->do_oop##nv_suffix(p), \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2201 assert_is_in_closed_subset) \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2202 return size_helper(); \ |
| 0 | 2203 } |
| 2204 | |
| 2205 ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceKlass_OOP_OOP_ITERATE_DEFN) | |
|
342
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2206 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceKlass_OOP_OOP_ITERATE_DEFN) |
| 0 | 2207 ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceKlass_OOP_OOP_ITERATE_DEFN_m) |
|
342
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2208 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceKlass_OOP_OOP_ITERATE_DEFN_m) |
|
8001
db9981fd3124
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS
jprovino
parents:
7610
diff
changeset
|
2209 #if INCLUDE_ALL_GCS |
|
342
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2210 ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN) |
|
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
2211 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN) |
|
8001
db9981fd3124
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS
jprovino
parents:
7610
diff
changeset
|
2212 #endif // INCLUDE_ALL_GCS |
| 0 | 2213 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2214 int InstanceKlass::oop_adjust_pointers(oop obj) { |
| 0 | 2215 int size = size_helper(); |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2216 InstanceKlass_OOP_MAP_ITERATE( \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2217 obj, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2218 MarkSweep::adjust_pointer(p), \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2219 assert_is_in) |
| 0 | 2220 return size; |
| 2221 } | |
| 2222 | |
|
8001
db9981fd3124
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS
jprovino
parents:
7610
diff
changeset
|
2223 #if INCLUDE_ALL_GCS |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2224 void InstanceKlass::oop_push_contents(PSPromotionManager* pm, oop obj) { |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2225 InstanceKlass_OOP_MAP_REVERSE_ITERATE( \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2226 obj, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2227 if (PSScavenge::should_scavenge(p)) { \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2228 pm->claim_or_forward_depth(p); \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2229 }, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2230 assert_nothing ) |
| 0 | 2231 } |
| 2232 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2233 int InstanceKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2234 int size = size_helper(); |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2235 InstanceKlass_OOP_MAP_ITERATE( \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2236 obj, \ |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
2237 PSParallelCompact::adjust_pointer(p), \ |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2238 assert_is_in) |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2239 return size; |
| 0 | 2240 } |
| 2241 | |
|
8001
db9981fd3124
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS
jprovino
parents:
7610
diff
changeset
|
2242 #endif // INCLUDE_ALL_GCS |
| 0 | 2243 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2244 void InstanceKlass::clean_implementors_list(BoolObjectClosure* is_alive) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2245 assert(is_loader_alive(is_alive), "this klass should be live"); |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
2246 if (is_interface()) { |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
2247 if (ClassUnloading) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2248 Klass* impl = implementor(); |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
2249 if (impl != NULL) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2250 if (!impl->is_loader_alive(is_alive)) { |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
2251 // remove this guy |
|
8693
872b3feace55
8008750: [partfait] Null pointer deference in hotspot/src/share/vm/oops/instanceKlass.hpp
morris
parents:
8031
diff
changeset
|
2252 Klass** klass = adr_implementor(); |
|
872b3feace55
8008750: [partfait] Null pointer deference in hotspot/src/share/vm/oops/instanceKlass.hpp
morris
parents:
8031
diff
changeset
|
2253 assert(klass != NULL, "null klass"); |
|
872b3feace55
8008750: [partfait] Null pointer deference in hotspot/src/share/vm/oops/instanceKlass.hpp
morris
parents:
8031
diff
changeset
|
2254 if (klass != NULL) { |
|
872b3feace55
8008750: [partfait] Null pointer deference in hotspot/src/share/vm/oops/instanceKlass.hpp
morris
parents:
8031
diff
changeset
|
2255 *klass = NULL; |
|
872b3feace55
8008750: [partfait] Null pointer deference in hotspot/src/share/vm/oops/instanceKlass.hpp
morris
parents:
8031
diff
changeset
|
2256 } |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
2257 } |
| 0 | 2258 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2259 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2260 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2261 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2262 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2263 void InstanceKlass::clean_method_data(BoolObjectClosure* is_alive) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2264 for (int m = 0; m < methods()->length(); m++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2265 MethodData* mdo = methods()->at(m)->method_data(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2266 if (mdo != NULL) { |
|
17728
b8413a9cbb84
8031752: Failed speculative optimizations should be reattempted when root of compilation is different
roland
parents:
17674
diff
changeset
|
2267 mdo->clean_method_data(is_alive); |
| 0 | 2268 } |
| 2269 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2270 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2271 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2272 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2273 static void remove_unshareable_in_class(Klass* k) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2274 // remove klass's unshareable info |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2275 k->remove_unshareable_info(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2276 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2277 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2278 void InstanceKlass::remove_unshareable_info() { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2279 Klass::remove_unshareable_info(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2280 // Unlink the class |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2281 if (is_linked()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2282 unlink_class(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2283 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2284 init_implementor(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2285 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2286 constants()->remove_unshareable_info(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2287 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2288 for (int i = 0; i < methods()->length(); i++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2289 Method* m = methods()->at(i); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2290 m->remove_unshareable_info(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2291 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2292 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2293 // do array classes also. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2294 array_klasses_do(remove_unshareable_in_class); |
| 0 | 2295 } |
| 2296 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2297 void restore_unshareable_in_class(Klass* k, TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2298 k->restore_unshareable_info(CHECK); |
| 0 | 2299 } |
| 2300 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2301 void InstanceKlass::restore_unshareable_info(TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2302 Klass::restore_unshareable_info(CHECK); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2303 instanceKlassHandle ik(THREAD, this); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2304 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2305 Array<Method*>* methods = ik->methods(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2306 int num_methods = methods->length(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2307 for (int index2 = 0; index2 < num_methods; ++index2) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2308 methodHandle m(THREAD, methods->at(index2)); |
|
17883
9428a0b94204
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
17810
diff
changeset
|
2309 m->restore_unshareable_info(CHECK); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2310 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2311 if (JvmtiExport::has_redefined_a_class()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2312 // Reinitialize vtable because RedefineClasses may have changed some |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2313 // entries in this vtable for super classes so the CDS vtable might |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2314 // point to old or obsolete entries. RedefineClasses doesn't fix up |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2315 // vtables in the shared system dictionary, only the main one. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2316 // It also redefines the itable too so fix that too. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2317 ResourceMark rm(THREAD); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2318 ik->vtable()->initialize_vtable(false, CHECK); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2319 ik->itable()->initialize_itable(false, CHECK); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2320 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2321 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2322 // restore constant pool resolved references |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2323 ik->constants()->restore_unshareable_info(CHECK); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2324 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2325 ik->array_klasses_do(restore_unshareable_in_class, CHECK); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2326 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2327 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2328 static void clear_all_breakpoints(Method* m) { |
| 0 | 2329 m->clear_all_breakpoints(); |
| 2330 } | |
| 2331 | |
|
10149
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2332 |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2333 void InstanceKlass::notify_unload_class(InstanceKlass* ik) { |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2334 // notify the debugger |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2335 if (JvmtiExport::should_post_class_unload()) { |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2336 JvmtiExport::post_class_unload(ik); |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2337 } |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2338 |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2339 // notify ClassLoadingService of class unload |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2340 ClassLoadingService::notify_class_unloaded(ik); |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2341 } |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2342 |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2343 void InstanceKlass::release_C_heap_structures(InstanceKlass* ik) { |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2344 // Clean up C heap |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2345 ik->release_C_heap_structures(); |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2346 ik->constants()->release_C_heap_structures(); |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2347 } |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2348 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2349 void InstanceKlass::release_C_heap_structures() { |
|
10149
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2350 |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2351 // Can't release the constant pool here because the constant pool can be |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2352 // deallocated separately from the InstanceKlass for default methods and |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2353 // redefine classes. |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2354 |
| 0 | 2355 // Deallocate oop map cache |
| 2356 if (_oop_map_cache != NULL) { | |
| 2357 delete _oop_map_cache; | |
| 2358 _oop_map_cache = NULL; | |
| 2359 } | |
| 2360 | |
| 2361 // Deallocate JNI identifiers for jfieldIDs | |
| 2362 JNIid::deallocate(jni_ids()); | |
| 2363 set_jni_ids(NULL); | |
| 2364 | |
| 2365 jmethodID* jmeths = methods_jmethod_ids_acquire(); | |
| 2366 if (jmeths != (jmethodID*)NULL) { | |
| 2367 release_set_methods_jmethod_ids(NULL); | |
| 2368 FreeHeap(jmeths); | |
| 2369 } | |
| 2370 | |
|
10347
6c138b9851fb
8013945: CMS fatal error: must own lock MemberNameTable_lock
sspitsyn
parents:
10345
diff
changeset
|
2371 // Deallocate MemberNameTable |
|
6c138b9851fb
8013945: CMS fatal error: must own lock MemberNameTable_lock
sspitsyn
parents:
10345
diff
changeset
|
2372 { |
|
6c138b9851fb
8013945: CMS fatal error: must own lock MemberNameTable_lock
sspitsyn
parents:
10345
diff
changeset
|
2373 Mutex* lock_or_null = SafepointSynchronize::is_at_safepoint() ? NULL : MemberNameTable_lock; |
|
6c138b9851fb
8013945: CMS fatal error: must own lock MemberNameTable_lock
sspitsyn
parents:
10345
diff
changeset
|
2374 MutexLockerEx ml(lock_or_null, Mutex::_no_safepoint_check_flag); |
|
6c138b9851fb
8013945: CMS fatal error: must own lock MemberNameTable_lock
sspitsyn
parents:
10345
diff
changeset
|
2375 MemberNameTable* mnt = member_names(); |
|
6c138b9851fb
8013945: CMS fatal error: must own lock MemberNameTable_lock
sspitsyn
parents:
10345
diff
changeset
|
2376 if (mnt != NULL) { |
|
6c138b9851fb
8013945: CMS fatal error: must own lock MemberNameTable_lock
sspitsyn
parents:
10345
diff
changeset
|
2377 delete mnt; |
|
6c138b9851fb
8013945: CMS fatal error: must own lock MemberNameTable_lock
sspitsyn
parents:
10345
diff
changeset
|
2378 set_member_names(NULL); |
|
6c138b9851fb
8013945: CMS fatal error: must own lock MemberNameTable_lock
sspitsyn
parents:
10345
diff
changeset
|
2379 } |
|
10133
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
9062
diff
changeset
|
2380 } |
|
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
9062
diff
changeset
|
2381 |
| 0 | 2382 // release dependencies |
| 2383 nmethodBucket* b = _dependencies; | |
| 2384 _dependencies = NULL; | |
| 2385 while (b != NULL) { | |
| 2386 nmethodBucket* next = b->next(); | |
| 2387 delete b; | |
| 2388 b = next; | |
| 2389 } | |
| 2390 | |
| 2391 // Deallocate breakpoint records | |
| 2392 if (breakpoints() != 0x0) { | |
| 2393 methods_do(clear_all_breakpoints); | |
| 2394 assert(breakpoints() == 0x0, "should have cleared breakpoints"); | |
| 2395 } | |
| 2396 | |
| 2397 // deallocate information about previous versions | |
| 2398 if (_previous_versions != NULL) { | |
| 2399 for (int i = _previous_versions->length() - 1; i >= 0; i--) { | |
| 2400 PreviousVersionNode * pv_node = _previous_versions->at(i); | |
| 2401 delete pv_node; | |
| 2402 } | |
| 2403 delete _previous_versions; | |
| 2404 _previous_versions = NULL; | |
| 2405 } | |
| 2406 | |
| 2407 // deallocate the cached class file | |
|
11148
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
2408 if (_cached_class_file != NULL) { |
|
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
2409 os::free(_cached_class_file, mtClass); |
|
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
2410 _cached_class_file = NULL; |
| 0 | 2411 } |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2412 |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2413 // Decrement symbol reference counts associated with the unloaded class. |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2414 if (_name != NULL) _name->decrement_refcount(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2415 // unreference array name derived from this class name (arrays of an unloaded |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2416 // class can't be referenced anymore). |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2417 if (_array_name != NULL) _array_name->decrement_refcount(); |
|
6203
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2418 if (_source_debug_extension != NULL) FREE_C_HEAP_ARRAY(char, _source_debug_extension, mtClass); |
|
7464
ecd24264898b
8005048: NMT: #loaded classes needs to just show the # defined classes
zgu
parents:
7180
diff
changeset
|
2419 |
|
ecd24264898b
8005048: NMT: #loaded classes needs to just show the # defined classes
zgu
parents:
7180
diff
changeset
|
2420 assert(_total_instanceKlass_count >= 1, "Sanity check"); |
|
ecd24264898b
8005048: NMT: #loaded classes needs to just show the # defined classes
zgu
parents:
7180
diff
changeset
|
2421 Atomic::dec(&_total_instanceKlass_count); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2422 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2423 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2424 void InstanceKlass::set_source_debug_extension(char* array, int length) { |
|
6203
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2425 if (array == NULL) { |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2426 _source_debug_extension = NULL; |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2427 } else { |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2428 // Adding one to the attribute length in order to store a null terminator |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2429 // character could cause an overflow because the attribute length is |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2430 // already coded with an u4 in the classfile, but in practice, it's |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2431 // unlikely to happen. |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2432 assert((length+1) > length, "Overflow checking"); |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2433 char* sde = NEW_C_HEAP_ARRAY(char, (length + 1), mtClass); |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2434 for (int i = 0; i < length; i++) { |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2435 sde[i] = array[i]; |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2436 } |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2437 sde[length] = '\0'; |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2438 _source_debug_extension = sde; |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2439 } |
| 0 | 2440 } |
| 2441 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2442 address InstanceKlass::static_field_addr(int offset) { |
|
12316
190899198332
7195622: CheckUnhandledOops has limited usefulness now
hseigel
parents:
12287
diff
changeset
|
2443 return (address)(offset + InstanceMirrorKlass::offset_of_static_fields() + cast_from_oop<intptr_t>(java_mirror())); |
|
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2444 } |
|
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2445 |
|
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2446 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2447 const char* InstanceKlass::signature_name() const { |
|
12995
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2448 int hash_len = 0; |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2449 char hash_buf[40]; |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2450 |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2451 // If this is an anonymous class, append a hash to make the name unique |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2452 if (is_anonymous()) { |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2453 assert(EnableInvokeDynamic, "EnableInvokeDynamic was not set."); |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2454 intptr_t hash = (java_mirror() != NULL) ? java_mirror()->identity_hash() : 0; |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2455 sprintf(hash_buf, "/" UINTX_FORMAT, (uintx)hash); |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2456 hash_len = (int)strlen(hash_buf); |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2457 } |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2458 |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2459 // Get the internal name as a c string |
| 0 | 2460 const char* src = (const char*) (name()->as_C_string()); |
| 2461 const int src_length = (int)strlen(src); | |
|
12995
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2462 |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2463 char* dest = NEW_RESOURCE_ARRAY(char, src_length + hash_len + 3); |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2464 |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2465 // Add L as type indicator |
| 0 | 2466 int dest_index = 0; |
| 2467 dest[dest_index++] = 'L'; | |
|
12995
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2468 |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2469 // Add the actual class name |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2470 for (int src_index = 0; src_index < src_length; ) { |
| 0 | 2471 dest[dest_index++] = src[src_index++]; |
| 2472 } | |
|
12995
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2473 |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2474 // If we have a hash, append it |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2475 for (int hash_index = 0; hash_index < hash_len; ) { |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2476 dest[dest_index++] = hash_buf[hash_index++]; |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2477 } |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2478 |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2479 // Add the semicolon and the NULL |
| 0 | 2480 dest[dest_index++] = ';'; |
| 2481 dest[dest_index] = '\0'; | |
| 2482 return dest; | |
| 2483 } | |
| 2484 | |
| 2485 // different verisons of is_same_class_package | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2486 bool InstanceKlass::is_same_class_package(Klass* class2) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2487 Klass* class1 = this; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2488 oop classloader1 = InstanceKlass::cast(class1)->class_loader(); |
| 6983 | 2489 Symbol* classname1 = class1->name(); |
| 2490 | |
| 2491 if (class2->oop_is_objArray()) { | |
|
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
2492 class2 = ObjArrayKlass::cast(class2)->bottom_klass(); |
| 0 | 2493 } |
| 2494 oop classloader2; | |
| 6983 | 2495 if (class2->oop_is_instance()) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2496 classloader2 = InstanceKlass::cast(class2)->class_loader(); |
| 0 | 2497 } else { |
| 6983 | 2498 assert(class2->oop_is_typeArray(), "should be type array"); |
| 0 | 2499 classloader2 = NULL; |
| 2500 } | |
| 6983 | 2501 Symbol* classname2 = class2->name(); |
| 0 | 2502 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2503 return InstanceKlass::is_same_class_package(classloader1, classname1, |
| 0 | 2504 classloader2, classname2); |
| 2505 } | |
| 2506 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2507 bool InstanceKlass::is_same_class_package(oop classloader2, Symbol* classname2) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2508 Klass* class1 = this; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2509 oop classloader1 = InstanceKlass::cast(class1)->class_loader(); |
| 6983 | 2510 Symbol* classname1 = class1->name(); |
| 0 | 2511 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2512 return InstanceKlass::is_same_class_package(classloader1, classname1, |
| 0 | 2513 classloader2, classname2); |
| 2514 } | |
| 2515 | |
| 2516 // return true if two classes are in the same package, classloader | |
| 2517 // and classname information is enough to determine a class's package | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2518 bool InstanceKlass::is_same_class_package(oop class_loader1, Symbol* class_name1, |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2519 oop class_loader2, Symbol* class_name2) { |
| 0 | 2520 if (class_loader1 != class_loader2) { |
| 2521 return false; | |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2522 } else if (class_name1 == class_name2) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2523 return true; // skip painful bytewise comparison |
| 0 | 2524 } else { |
| 2525 ResourceMark rm; | |
| 2526 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2527 // The Symbol*'s are in UTF8 encoding. Since we only need to check explicitly |
| 0 | 2528 // for ASCII characters ('/', 'L', '['), we can keep them in UTF8 encoding. |
| 2529 // Otherwise, we just compare jbyte values between the strings. | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2530 const jbyte *name1 = class_name1->base(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2531 const jbyte *name2 = class_name2->base(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2532 |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2533 const jbyte *last_slash1 = UTF8::strrchr(name1, class_name1->utf8_length(), '/'); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2534 const jbyte *last_slash2 = UTF8::strrchr(name2, class_name2->utf8_length(), '/'); |
| 0 | 2535 |
| 2536 if ((last_slash1 == NULL) || (last_slash2 == NULL)) { | |
| 2537 // One of the two doesn't have a package. Only return true | |
| 2538 // if the other one also doesn't have a package. | |
| 2539 return last_slash1 == last_slash2; | |
| 2540 } else { | |
| 2541 // Skip over '['s | |
| 2542 if (*name1 == '[') { | |
| 2543 do { | |
| 2544 name1++; | |
| 2545 } while (*name1 == '['); | |
| 2546 if (*name1 != 'L') { | |
| 2547 // Something is terribly wrong. Shouldn't be here. | |
| 2548 return false; | |
| 2549 } | |
| 2550 } | |
| 2551 if (*name2 == '[') { | |
| 2552 do { | |
| 2553 name2++; | |
| 2554 } while (*name2 == '['); | |
| 2555 if (*name2 != 'L') { | |
| 2556 // Something is terribly wrong. Shouldn't be here. | |
| 2557 return false; | |
| 2558 } | |
| 2559 } | |
| 2560 | |
| 2561 // Check that package part is identical | |
| 2562 int length1 = last_slash1 - name1; | |
| 2563 int length2 = last_slash2 - name2; | |
| 2564 | |
| 2565 return UTF8::equal(name1, length1, name2, length2); | |
| 2566 } | |
| 2567 } | |
| 2568 } | |
| 2569 | |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2570 // Returns true iff super_method can be overridden by a method in targetclassname |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2571 // See JSL 3rd edition 8.4.6.1 |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2572 // Assumes name-signature match |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2573 // "this" is InstanceKlass of super_method which must exist |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2574 // note that the InstanceKlass of the method in the targetclassname has not always been created yet |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2575 bool InstanceKlass::is_override(methodHandle super_method, Handle targetclassloader, Symbol* targetclassname, TRAPS) { |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2576 // Private methods can not be overridden |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2577 if (super_method->is_private()) { |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2578 return false; |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2579 } |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2580 // If super method is accessible, then override |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2581 if ((super_method->is_protected()) || |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2582 (super_method->is_public())) { |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2583 return true; |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2584 } |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2585 // Package-private methods are not inherited outside of package |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2586 assert(super_method->is_package_private(), "must be package private"); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2587 return(is_same_class_package(targetclassloader(), targetclassname)); |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2588 } |
| 0 | 2589 |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2590 /* defined for now in jvm.cpp, for historical reasons *-- |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2591 Klass* InstanceKlass::compute_enclosing_class_impl(instanceKlassHandle self, |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2592 Symbol*& simple_name_result, TRAPS) { |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2593 ... |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2594 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2595 */ |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2596 |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2597 // tell if two classes have the same enclosing class (at package level) |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2598 bool InstanceKlass::is_same_package_member_impl(instanceKlassHandle class1, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2599 Klass* class2_oop, TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2600 if (class2_oop == class1()) return true; |
| 6983 | 2601 if (!class2_oop->oop_is_instance()) return false; |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2602 instanceKlassHandle class2(THREAD, class2_oop); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2603 |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2604 // must be in same package before we try anything else |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2605 if (!class1->is_same_class_package(class2->class_loader(), class2->name())) |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2606 return false; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2607 |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2608 // As long as there is an outer1.getEnclosingClass, |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2609 // shift the search outward. |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2610 instanceKlassHandle outer1 = class1; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2611 for (;;) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2612 // As we walk along, look for equalities between outer1 and class2. |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2613 // Eventually, the walks will terminate as outer1 stops |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2614 // at the top-level class around the original class. |
|
1126
933a3e806ce6
6895168: JCK api/signaturetest/sigtest.basic.html#basic test fails for jdk 5.0 with HS 16 in nightly build
xlu
parents:
1039
diff
changeset
|
2615 bool ignore_inner_is_member; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2616 Klass* next = outer1->compute_enclosing_class(&ignore_inner_is_member, |
|
1126
933a3e806ce6
6895168: JCK api/signaturetest/sigtest.basic.html#basic test fails for jdk 5.0 with HS 16 in nightly build
xlu
parents:
1039
diff
changeset
|
2617 CHECK_false); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2618 if (next == NULL) break; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2619 if (next == class2()) return true; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2620 outer1 = instanceKlassHandle(THREAD, next); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2621 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2622 |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2623 // Now do the same for class2. |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2624 instanceKlassHandle outer2 = class2; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2625 for (;;) { |
|
1126
933a3e806ce6
6895168: JCK api/signaturetest/sigtest.basic.html#basic test fails for jdk 5.0 with HS 16 in nightly build
xlu
parents:
1039
diff
changeset
|
2626 bool ignore_inner_is_member; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2627 Klass* next = outer2->compute_enclosing_class(&ignore_inner_is_member, |
|
1126
933a3e806ce6
6895168: JCK api/signaturetest/sigtest.basic.html#basic test fails for jdk 5.0 with HS 16 in nightly build
xlu
parents:
1039
diff
changeset
|
2628 CHECK_false); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2629 if (next == NULL) break; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2630 // Might as well check the new outer against all available values. |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2631 if (next == class1()) return true; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2632 if (next == outer1()) return true; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2633 outer2 = instanceKlassHandle(THREAD, next); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2634 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2635 |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2636 // If by this point we have not found an equality between the |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2637 // two classes, we know they are in separate package members. |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2638 return false; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2639 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2640 |
| 0 | 2641 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2642 jint InstanceKlass::compute_modifier_flags(TRAPS) const { |
| 0 | 2643 jint access = access_flags().as_int(); |
| 2644 | |
| 2645 // But check if it happens to be member class. | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2646 instanceKlassHandle ik(THREAD, this); |
|
5967
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2647 InnerClassesIterator iter(ik); |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2648 for (; !iter.done(); iter.next()) { |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2649 int ioff = iter.inner_class_info_index(); |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2650 // Inner class attribute can be zero, skip it. |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2651 // Strange but true: JVM spec. allows null inner class refs. |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2652 if (ioff == 0) continue; |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2653 |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2654 // only look at classes that are already loaded |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2655 // since we are looking for the flags for our self. |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2656 Symbol* inner_name = ik->constants()->klass_name_at(ioff); |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2657 if ((ik->name() == inner_name)) { |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2658 // This is really a member class. |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2659 access = iter.inner_access_flags(); |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2660 break; |
| 0 | 2661 } |
| 2662 } | |
| 2663 // Remember to strip ACC_SUPER bit | |
| 2664 return (access & (~JVM_ACC_SUPER)) & JVM_ACC_WRITTEN_FLAGS; | |
| 2665 } | |
| 2666 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2667 jint InstanceKlass::jvmti_class_status() const { |
| 0 | 2668 jint result = 0; |
| 2669 | |
| 2670 if (is_linked()) { | |
| 2671 result |= JVMTI_CLASS_STATUS_VERIFIED | JVMTI_CLASS_STATUS_PREPARED; | |
| 2672 } | |
| 2673 | |
| 2674 if (is_initialized()) { | |
| 2675 assert(is_linked(), "Class status is not consistent"); | |
| 2676 result |= JVMTI_CLASS_STATUS_INITIALIZED; | |
| 2677 } | |
| 2678 if (is_in_error_state()) { | |
| 2679 result |= JVMTI_CLASS_STATUS_ERROR; | |
| 2680 } | |
| 2681 return result; | |
| 2682 } | |
| 2683 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2684 Method* InstanceKlass::method_at_itable(Klass* holder, int index, TRAPS) { |
| 0 | 2685 itableOffsetEntry* ioe = (itableOffsetEntry*)start_of_itable(); |
| 2686 int method_table_offset_in_words = ioe->offset()/wordSize; | |
| 2687 int nof_interfaces = (method_table_offset_in_words - itable_offset_in_words()) | |
| 2688 / itableOffsetEntry::size(); | |
| 2689 | |
| 2690 for (int cnt = 0 ; ; cnt ++, ioe ++) { | |
| 605 | 2691 // If the interface isn't implemented by the receiver class, |
| 0 | 2692 // the VM should throw IncompatibleClassChangeError. |
| 2693 if (cnt >= nof_interfaces) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2694 THROW_NULL(vmSymbols::java_lang_IncompatibleClassChangeError()); |
| 0 | 2695 } |
| 2696 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2697 Klass* ik = ioe->interface_klass(); |
| 0 | 2698 if (ik == holder) break; |
| 2699 } | |
| 2700 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2701 itableMethodEntry* ime = ioe->first_method_entry(this); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2702 Method* m = ime[index].method(); |
| 0 | 2703 if (m == NULL) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2704 THROW_NULL(vmSymbols::java_lang_AbstractMethodError()); |
| 0 | 2705 } |
| 2706 return m; | |
| 2707 } | |
| 2708 | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2709 |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2710 #if INCLUDE_JVMTI |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2711 // update default_methods for redefineclasses for methods that are |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2712 // not yet in the vtable due to concurrent subclass define and superinterface |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2713 // redefinition |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2714 // Note: those in the vtable, should have been updated via adjust_method_entries |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2715 void InstanceKlass::adjust_default_methods(Method** old_methods, Method** new_methods, |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2716 int methods_length, bool* trace_name_printed) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2717 // search the default_methods for uses of either obsolete or EMCP methods |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2718 if (default_methods() != NULL) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2719 for (int j = 0; j < methods_length; j++) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2720 Method* old_method = old_methods[j]; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2721 Method* new_method = new_methods[j]; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2722 |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2723 for (int index = 0; index < default_methods()->length(); index ++) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2724 if (default_methods()->at(index) == old_method) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2725 default_methods()->at_put(index, new_method); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2726 if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2727 if (!(*trace_name_printed)) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2728 // RC_TRACE_MESG macro has an embedded ResourceMark |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2729 RC_TRACE_MESG(("adjust: klassname=%s default methods from name=%s", |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2730 external_name(), |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2731 old_method->method_holder()->external_name())); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2732 *trace_name_printed = true; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2733 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2734 RC_TRACE(0x00100000, ("default method update: %s(%s) ", |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2735 new_method->name()->as_C_string(), |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2736 new_method->signature()->as_C_string())); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2737 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2738 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2739 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2740 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2741 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2742 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2743 #endif // INCLUDE_JVMTI |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2744 |
| 0 | 2745 // On-stack replacement stuff |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2746 void InstanceKlass::add_osr_nmethod(nmethod* n) { |
| 0 | 2747 // only one compilation can be active |
| 2748 NEEDS_CLEANUP | |
| 2749 // This is a short non-blocking critical region, so the no safepoint check is ok. | |
| 2750 OsrList_lock->lock_without_safepoint_check(); | |
| 2751 assert(n->is_osr_method(), "wrong kind of nmethod"); | |
|
989
148e5441d916
6863023: need non-perm oops in code cache for JSR 292
jrose
parents:
876
diff
changeset
|
2752 n->set_osr_link(osr_nmethods_head()); |
| 0 | 2753 set_osr_nmethods_head(n); |
| 1783 | 2754 // Raise the highest osr level if necessary |
| 2755 if (TieredCompilation) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2756 Method* m = n->method(); |
| 1783 | 2757 m->set_highest_osr_comp_level(MAX2(m->highest_osr_comp_level(), n->comp_level())); |
| 2758 } | |
| 0 | 2759 // Remember to unlock again |
| 2760 OsrList_lock->unlock(); | |
| 1783 | 2761 |
| 2762 // Get rid of the osr methods for the same bci that have lower levels. | |
| 2763 if (TieredCompilation) { | |
| 2764 for (int l = CompLevel_limited_profile; l < n->comp_level(); l++) { | |
| 2765 nmethod *inv = lookup_osr_nmethod(n->method(), n->osr_entry_bci(), l, true); | |
| 2766 if (inv != NULL && inv->is_in_use()) { | |
| 2767 inv->make_not_entrant(); | |
| 2768 } | |
| 2769 } | |
| 2770 } | |
| 0 | 2771 } |
| 2772 | |
| 2773 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2774 void InstanceKlass::remove_osr_nmethod(nmethod* n) { |
| 0 | 2775 // This is a short non-blocking critical region, so the no safepoint check is ok. |
| 2776 OsrList_lock->lock_without_safepoint_check(); | |
| 2777 assert(n->is_osr_method(), "wrong kind of nmethod"); | |
| 2778 nmethod* last = NULL; | |
| 2779 nmethod* cur = osr_nmethods_head(); | |
| 1783 | 2780 int max_level = CompLevel_none; // Find the max comp level excluding n |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2781 Method* m = n->method(); |
| 0 | 2782 // Search for match |
| 2783 while(cur != NULL && cur != n) { | |
|
17975
bd4d69d9cb7d
8034188: OSR methods may not be recompiled at proper compilation level
neliasso
parents:
17937
diff
changeset
|
2784 if (TieredCompilation && m == cur->method()) { |
| 1783 | 2785 // Find max level before n |
| 2786 max_level = MAX2(max_level, cur->comp_level()); | |
| 2787 } | |
| 0 | 2788 last = cur; |
|
989
148e5441d916
6863023: need non-perm oops in code cache for JSR 292
jrose
parents:
876
diff
changeset
|
2789 cur = cur->osr_link(); |
| 0 | 2790 } |
| 1783 | 2791 nmethod* next = NULL; |
| 0 | 2792 if (cur == n) { |
| 1783 | 2793 next = cur->osr_link(); |
| 0 | 2794 if (last == NULL) { |
| 2795 // Remove first element | |
| 1783 | 2796 set_osr_nmethods_head(next); |
| 0 | 2797 } else { |
| 1783 | 2798 last->set_osr_link(next); |
| 0 | 2799 } |
| 2800 } | |
|
989
148e5441d916
6863023: need non-perm oops in code cache for JSR 292
jrose
parents:
876
diff
changeset
|
2801 n->set_osr_link(NULL); |
| 1783 | 2802 if (TieredCompilation) { |
| 2803 cur = next; | |
| 2804 while (cur != NULL) { | |
| 2805 // Find max level after n | |
|
17975
bd4d69d9cb7d
8034188: OSR methods may not be recompiled at proper compilation level
neliasso
parents:
17937
diff
changeset
|
2806 if (m == cur->method()) { |
|
bd4d69d9cb7d
8034188: OSR methods may not be recompiled at proper compilation level
neliasso
parents:
17937
diff
changeset
|
2807 max_level = MAX2(max_level, cur->comp_level()); |
|
bd4d69d9cb7d
8034188: OSR methods may not be recompiled at proper compilation level
neliasso
parents:
17937
diff
changeset
|
2808 } |
| 1783 | 2809 cur = cur->osr_link(); |
| 2810 } | |
| 2811 m->set_highest_osr_comp_level(max_level); | |
| 2812 } | |
| 0 | 2813 // Remember to unlock again |
| 2814 OsrList_lock->unlock(); | |
| 2815 } | |
| 2816 | |
|
10265
92ef81e2f571
8003557: NPG: Klass* const k should be const Klass* k.
minqi
parents:
10152
diff
changeset
|
2817 nmethod* InstanceKlass::lookup_osr_nmethod(const Method* m, int bci, int comp_level, bool match_level) const { |
| 0 | 2818 // This is a short non-blocking critical region, so the no safepoint check is ok. |
| 2819 OsrList_lock->lock_without_safepoint_check(); | |
| 2820 nmethod* osr = osr_nmethods_head(); | |
| 1783 | 2821 nmethod* best = NULL; |
| 0 | 2822 while (osr != NULL) { |
| 2823 assert(osr->is_osr_method(), "wrong kind of nmethod found in chain"); | |
| 1783 | 2824 // There can be a time when a c1 osr method exists but we are waiting |
| 2825 // for a c2 version. When c2 completes its osr nmethod we will trash | |
| 2826 // the c1 version and only be able to find the c2 version. However | |
| 2827 // while we overflow in the c1 code at back branches we don't want to | |
| 2828 // try and switch to the same code as we are already running | |
| 2829 | |
| 0 | 2830 if (osr->method() == m && |
| 2831 (bci == InvocationEntryBci || osr->osr_entry_bci() == bci)) { | |
| 1783 | 2832 if (match_level) { |
| 2833 if (osr->comp_level() == comp_level) { | |
| 2834 // Found a match - return it. | |
| 2835 OsrList_lock->unlock(); | |
| 2836 return osr; | |
| 2837 } | |
| 2838 } else { | |
| 2839 if (best == NULL || (osr->comp_level() > best->comp_level())) { | |
| 2840 if (osr->comp_level() == CompLevel_highest_tier) { | |
| 2841 // Found the best possible - return it. | |
| 2842 OsrList_lock->unlock(); | |
| 2843 return osr; | |
| 2844 } | |
| 2845 best = osr; | |
| 2846 } | |
| 2847 } | |
| 0 | 2848 } |
|
989
148e5441d916
6863023: need non-perm oops in code cache for JSR 292
jrose
parents:
876
diff
changeset
|
2849 osr = osr->osr_link(); |
| 0 | 2850 } |
| 2851 OsrList_lock->unlock(); | |
| 1783 | 2852 if (best != NULL && best->comp_level() >= comp_level && match_level == false) { |
| 2853 return best; | |
| 2854 } | |
| 0 | 2855 return NULL; |
| 2856 } | |
| 2857 | |
|
10345
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2858 void InstanceKlass::add_member_name(int index, Handle mem_name) { |
|
10133
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
9062
diff
changeset
|
2859 jweak mem_name_wref = JNIHandles::make_weak_global(mem_name); |
|
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
9062
diff
changeset
|
2860 MutexLocker ml(MemberNameTable_lock); |
|
10345
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2861 assert(0 <= index && index < idnum_allocated_count(), "index is out of bounds"); |
|
10133
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
9062
diff
changeset
|
2862 DEBUG_ONLY(No_Safepoint_Verifier nsv); |
|
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
9062
diff
changeset
|
2863 |
|
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
9062
diff
changeset
|
2864 if (_member_names == NULL) { |
|
10345
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2865 _member_names = new (ResourceObj::C_HEAP, mtClass) MemberNameTable(idnum_allocated_count()); |
|
10133
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
9062
diff
changeset
|
2866 } |
|
10345
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2867 _member_names->add_member_name(index, mem_name_wref); |
|
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2868 } |
|
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2869 |
|
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2870 oop InstanceKlass::get_member_name(int index) { |
|
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2871 MutexLocker ml(MemberNameTable_lock); |
|
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2872 assert(0 <= index && index < idnum_allocated_count(), "index is out of bounds"); |
|
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2873 DEBUG_ONLY(No_Safepoint_Verifier nsv); |
|
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2874 |
|
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2875 if (_member_names == NULL) { |
|
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2876 return NULL; |
|
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2877 } |
|
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2878 oop mem_name =_member_names->get_member_name(index); |
|
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2879 return mem_name; |
|
10133
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
9062
diff
changeset
|
2880 } |
|
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
9062
diff
changeset
|
2881 |
| 0 | 2882 // ----------------------------------------------------------------------------------------------------- |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2883 // Printing |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2884 |
| 0 | 2885 #ifndef PRODUCT |
| 2886 | |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2887 #define BULLET " - " |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2888 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2889 static const char* state_names[] = { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2890 "allocated", "loaded", "linked", "being_initialized", "fully_initialized", "initialization_error" |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2891 }; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2892 |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
2893 static void print_vtable(intptr_t* start, int len, outputStream* st) { |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
2894 for (int i = 0; i < len; i++) { |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
2895 intptr_t e = start[i]; |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
2896 st->print("%d : " INTPTR_FORMAT, i, e); |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
2897 if (e != 0 && ((Metadata*)e)->is_metaspace_object()) { |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
2898 st->print(" "); |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
2899 ((Metadata*)e)->print_value_on(st); |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
2900 } |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
2901 st->cr(); |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
2902 } |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
2903 } |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
2904 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2905 void InstanceKlass::print_on(outputStream* st) const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2906 assert(is_klass(), "must be klass"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2907 Klass::print_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2908 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2909 st->print(BULLET"instance size: %d", size_helper()); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2910 st->print(BULLET"klass size: %d", size()); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2911 st->print(BULLET"access: "); access_flags().print_on(st); st->cr(); |
|
17937
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17889
diff
changeset
|
2912 st->print(BULLET"state: "); st->print_cr("%s", state_names[_init_state]); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2913 st->print(BULLET"name: "); name()->print_value_on(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2914 st->print(BULLET"super: "); super()->print_value_on_maybe_null(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2915 st->print(BULLET"sub: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2916 Klass* sub = subklass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2917 int n; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2918 for (n = 0; sub != NULL; n++, sub = sub->next_sibling()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2919 if (n < MaxSubklassPrintSize) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2920 sub->print_value_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2921 st->print(" "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2922 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2923 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2924 if (n >= MaxSubklassPrintSize) st->print("(%d more klasses...)", n - MaxSubklassPrintSize); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2925 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2926 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2927 if (is_interface()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2928 st->print_cr(BULLET"nof implementors: %d", nof_implementors()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2929 if (nof_implementors() == 1) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2930 st->print_cr(BULLET"implementor: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2931 st->print(" "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2932 implementor()->print_value_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2933 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2934 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2935 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2936 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2937 st->print(BULLET"arrays: "); array_klasses()->print_value_on_maybe_null(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2938 st->print(BULLET"methods: "); methods()->print_value_on(st); st->cr(); |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
2939 if (Verbose || WizardMode) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2940 Array<Method*>* method_array = methods(); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2941 for (int i = 0; i < method_array->length(); i++) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2942 st->print("%d : ", i); method_array->at(i)->print_value(); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2943 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2944 } |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2945 st->print(BULLET"method ordering: "); method_ordering()->print_value_on(st); st->cr(); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2946 st->print(BULLET"default_methods: "); default_methods()->print_value_on(st); st->cr(); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2947 if (Verbose && default_methods() != NULL) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2948 Array<Method*>* method_array = default_methods(); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2949 for (int i = 0; i < method_array->length(); i++) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2950 st->print("%d : ", i); method_array->at(i)->print_value(); st->cr(); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2951 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2952 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2953 if (default_vtable_indices() != NULL) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2954 st->print(BULLET"default vtable indices: "); default_vtable_indices()->print_value_on(st); st->cr(); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2955 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2956 st->print(BULLET"local interfaces: "); local_interfaces()->print_value_on(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2957 st->print(BULLET"trans. interfaces: "); transitive_interfaces()->print_value_on(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2958 st->print(BULLET"constants: "); constants()->print_value_on(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2959 if (class_loader_data() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2960 st->print(BULLET"class loader data: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2961 class_loader_data()->print_value_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2962 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2963 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2964 st->print(BULLET"host class: "); host_klass()->print_value_on_maybe_null(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2965 if (source_file_name() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2966 st->print(BULLET"source file: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2967 source_file_name()->print_value_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2968 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2969 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2970 if (source_debug_extension() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2971 st->print(BULLET"source debug extension: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2972 st->print("%s", source_debug_extension()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2973 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2974 } |
| 8031 | 2975 st->print(BULLET"class annotations: "); class_annotations()->print_value_on(st); st->cr(); |
| 2976 st->print(BULLET"class type annotations: "); class_type_annotations()->print_value_on(st); st->cr(); | |
| 2977 st->print(BULLET"field annotations: "); fields_annotations()->print_value_on(st); st->cr(); | |
| 2978 st->print(BULLET"field type annotations: "); fields_type_annotations()->print_value_on(st); st->cr(); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2979 { |
|
12281
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
2980 bool have_pv = false; |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
2981 PreviousVersionWalker pvw(Thread::current(), (InstanceKlass*)this); |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
2982 for (PreviousVersionNode * pv_node = pvw.next_previous_version(); |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
2983 pv_node != NULL; pv_node = pvw.next_previous_version()) { |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
2984 if (!have_pv) |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
2985 st->print(BULLET"previous version: "); |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
2986 have_pv = true; |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
2987 pv_node->prev_constant_pool()->print_value_on(st); |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
2988 } |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
2989 if (have_pv) st->cr(); |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
2990 } // pvw is cleaned up |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2991 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2992 if (generic_signature() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2993 st->print(BULLET"generic signature: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2994 generic_signature()->print_value_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2995 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2996 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2997 st->print(BULLET"inner classes: "); inner_classes()->print_value_on(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2998 st->print(BULLET"java mirror: "); java_mirror()->print_value_on(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2999 st->print(BULLET"vtable length %d (start addr: " INTPTR_FORMAT ")", vtable_length(), start_of_vtable()); st->cr(); |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
3000 if (vtable_length() > 0 && (Verbose || WizardMode)) print_vtable(start_of_vtable(), vtable_length(), st); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3001 st->print(BULLET"itable length %d (start addr: " INTPTR_FORMAT ")", itable_length(), start_of_itable()); st->cr(); |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
3002 if (itable_length() > 0 && (Verbose || WizardMode)) print_vtable(start_of_itable(), itable_length(), st); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3003 st->print_cr(BULLET"---- static fields (%d words):", static_field_size()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3004 FieldPrinter print_static_field(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3005 ((InstanceKlass*)this)->do_local_static_fields(&print_static_field); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3006 st->print_cr(BULLET"---- non-static fields (%d words):", nonstatic_field_size()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3007 FieldPrinter print_nonstatic_field(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3008 ((InstanceKlass*)this)->do_nonstatic_fields(&print_nonstatic_field); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3009 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3010 st->print(BULLET"non-static oop maps: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3011 OopMapBlock* map = start_of_nonstatic_oop_maps(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3012 OopMapBlock* end_map = map + nonstatic_oop_map_count(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3013 while (map < end_map) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3014 st->print("%d-%d ", map->offset(), map->offset() + heapOopSize*(map->count() - 1)); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3015 map++; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3016 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3017 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3018 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3019 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3020 #endif //PRODUCT |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3021 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3022 void InstanceKlass::print_value_on(outputStream* st) const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3023 assert(is_klass(), "must be klass"); |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
3024 if (Verbose || WizardMode) access_flags().print_on(st); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3025 name()->print_value_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3026 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3027 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3028 #ifndef PRODUCT |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3029 |
| 0 | 3030 void FieldPrinter::do_field(fieldDescriptor* fd) { |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3031 _st->print(BULLET); |
|
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
3032 if (_obj == NULL) { |
| 0 | 3033 fd->print_on(_st); |
| 3034 _st->cr(); | |
| 3035 } else { | |
| 3036 fd->print_on_for(_st, _obj); | |
| 3037 _st->cr(); | |
| 3038 } | |
| 3039 } | |
| 3040 | |
| 3041 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3042 void InstanceKlass::oop_print_on(oop obj, outputStream* st) { |
| 0 | 3043 Klass::oop_print_on(obj, st); |
| 3044 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3045 if (this == SystemDictionary::String_klass()) { |
| 0 | 3046 typeArrayOop value = java_lang_String::value(obj); |
| 3047 juint offset = java_lang_String::offset(obj); | |
| 3048 juint length = java_lang_String::length(obj); | |
| 3049 if (value != NULL && | |
| 3050 value->is_typeArray() && | |
| 3051 offset <= (juint) value->length() && | |
| 3052 offset + length <= (juint) value->length()) { | |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3053 st->print(BULLET"string: "); |
| 0 | 3054 Handle h_obj(obj); |
| 3055 java_lang_String::print(h_obj, st); | |
| 3056 st->cr(); | |
| 3057 if (!WizardMode) return; // that is enough | |
| 3058 } | |
| 3059 } | |
| 3060 | |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3061 st->print_cr(BULLET"---- fields (total size %d words):", oop_size(obj)); |
|
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
3062 FieldPrinter print_field(st, obj); |
|
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
3063 do_nonstatic_fields(&print_field); |
| 0 | 3064 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3065 if (this == SystemDictionary::Class_klass()) { |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3066 st->print(BULLET"signature: "); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3067 java_lang_Class::print_signature(obj, st); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3068 st->cr(); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3069 Klass* mirrored_klass = java_lang_Class::as_Klass(obj); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3070 st->print(BULLET"fake entry for mirror: "); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3071 mirrored_klass->print_value_on_maybe_null(st); |
| 0 | 3072 st->cr(); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3073 Klass* array_klass = java_lang_Class::array_klass(obj); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3074 st->print(BULLET"fake entry for array: "); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3075 array_klass->print_value_on_maybe_null(st); |
| 0 | 3076 st->cr(); |
|
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
3077 st->print_cr(BULLET"fake entry for oop_size: %d", java_lang_Class::oop_size(obj)); |
|
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
3078 st->print_cr(BULLET"fake entry for static_oop_field_count: %d", java_lang_Class::static_oop_field_count(obj)); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3079 Klass* real_klass = java_lang_Class::as_Klass(obj); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3080 if (real_klass != NULL && real_klass->oop_is_instance()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3081 InstanceKlass::cast(real_klass)->do_local_static_fields(&print_field); |
|
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
3082 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3083 } else if (this == SystemDictionary::MethodType_klass()) { |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
997
diff
changeset
|
3084 st->print(BULLET"signature: "); |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2334
diff
changeset
|
3085 java_lang_invoke_MethodType::print_signature(obj, st); |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
997
diff
changeset
|
3086 st->cr(); |
| 0 | 3087 } |
| 3088 } | |
| 3089 | |
|
1155
4e6abf09f540
6912062: disassembler plugin needs to produce symbolic information in product mode
jrose
parents:
1144
diff
changeset
|
3090 #endif //PRODUCT |
|
4e6abf09f540
6912062: disassembler plugin needs to produce symbolic information in product mode
jrose
parents:
1144
diff
changeset
|
3091 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3092 void InstanceKlass::oop_print_value_on(oop obj, outputStream* st) { |
| 0 | 3093 st->print("a "); |
| 3094 name()->print_value_on(st); | |
| 3095 obj->print_address_on(st); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3096 if (this == SystemDictionary::String_klass() |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3097 && java_lang_String::value(obj) != NULL) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3098 ResourceMark rm; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3099 int len = java_lang_String::length(obj); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3100 int plen = (len < 24 ? len : 12); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3101 char* str = java_lang_String::as_utf8_string(obj, 0, plen); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3102 st->print(" = \"%s\"", str); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3103 if (len > plen) |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3104 st->print("...[%d]", len); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3105 } else if (this == SystemDictionary::Class_klass()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3106 Klass* k = java_lang_Class::as_Klass(obj); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3107 st->print(" = "); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3108 if (k != NULL) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3109 k->print_value_on(st); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3110 } else { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3111 const char* tname = type2name(java_lang_Class::primitive_type(obj)); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3112 st->print("%s", tname ? tname : "type?"); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3113 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3114 } else if (this == SystemDictionary::MethodType_klass()) { |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
997
diff
changeset
|
3115 st->print(" = "); |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2334
diff
changeset
|
3116 java_lang_invoke_MethodType::print_signature(obj, st); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3117 } else if (java_lang_boxing_object::is_instance(obj)) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3118 st->print(" = "); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3119 java_lang_boxing_object::print(obj, st); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3120 } else if (this == SystemDictionary::LambdaForm_klass()) { |
|
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3121 oop vmentry = java_lang_invoke_LambdaForm::vmentry(obj); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3122 if (vmentry != NULL) { |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3123 st->print(" => "); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3124 vmentry->print_value_on(st); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3125 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3126 } else if (this == SystemDictionary::MemberName_klass()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3127 Metadata* vmtarget = java_lang_invoke_MemberName::vmtarget(obj); |
|
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3128 if (vmtarget != NULL) { |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3129 st->print(" = "); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3130 vmtarget->print_value_on(st); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3131 } else { |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3132 java_lang_invoke_MemberName::clazz(obj)->print_value_on(st); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3133 st->print("."); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3134 java_lang_invoke_MemberName::name(obj)->print_value_on(st); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3135 } |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3136 } |
| 0 | 3137 } |
| 3138 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3139 const char* InstanceKlass::internal_name() const { |
| 0 | 3140 return external_name(); |
| 3141 } | |
| 3142 | |
| 7956 | 3143 #if INCLUDE_SERVICES |
| 3144 // Size Statistics | |
| 3145 void InstanceKlass::collect_statistics(KlassSizeStats *sz) const { | |
| 3146 Klass::collect_statistics(sz); | |
| 3147 | |
| 3148 sz->_inst_size = HeapWordSize * size_helper(); | |
| 3149 sz->_vtab_bytes = HeapWordSize * align_object_offset(vtable_length()); | |
| 3150 sz->_itab_bytes = HeapWordSize * align_object_offset(itable_length()); | |
| 3151 sz->_nonstatic_oopmap_bytes = HeapWordSize * | |
| 3152 ((is_interface() || is_anonymous()) ? | |
| 3153 align_object_offset(nonstatic_oop_map_size()) : | |
| 3154 nonstatic_oop_map_size()); | |
| 3155 | |
| 3156 int n = 0; | |
| 3157 n += (sz->_methods_array_bytes = sz->count_array(methods())); | |
| 3158 n += (sz->_method_ordering_bytes = sz->count_array(method_ordering())); | |
| 3159 n += (sz->_local_interfaces_bytes = sz->count_array(local_interfaces())); | |
| 3160 n += (sz->_transitive_interfaces_bytes = sz->count_array(transitive_interfaces())); | |
| 3161 n += (sz->_fields_bytes = sz->count_array(fields())); | |
| 3162 n += (sz->_inner_classes_bytes = sz->count_array(inner_classes())); | |
| 3163 sz->_ro_bytes += n; | |
| 3164 | |
| 3165 const ConstantPool* cp = constants(); | |
| 3166 if (cp) { | |
| 3167 cp->collect_statistics(sz); | |
| 3168 } | |
| 3169 | |
| 3170 const Annotations* anno = annotations(); | |
| 3171 if (anno) { | |
| 3172 anno->collect_statistics(sz); | |
| 3173 } | |
| 3174 | |
| 3175 const Array<Method*>* methods_array = methods(); | |
| 3176 if (methods()) { | |
| 3177 for (int i = 0; i < methods_array->length(); i++) { | |
| 3178 Method* method = methods_array->at(i); | |
| 3179 if (method) { | |
| 3180 sz->_method_count ++; | |
| 3181 method->collect_statistics(sz); | |
| 3182 } | |
| 3183 } | |
| 3184 } | |
| 3185 } | |
| 3186 #endif // INCLUDE_SERVICES | |
| 3187 | |
| 0 | 3188 // Verification |
| 3189 | |
| 3190 class VerifyFieldClosure: public OopClosure { | |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3191 protected: |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3192 template <class T> void do_oop_work(T* p) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3193 oop obj = oopDesc::load_decode_heap_oop(p); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3194 if (!obj->is_oop_or_null()) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3195 tty->print_cr("Failed: " PTR_FORMAT " -> " PTR_FORMAT, p, (address)obj); |
| 0 | 3196 Universe::print(); |
| 3197 guarantee(false, "boom"); | |
| 3198 } | |
| 3199 } | |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3200 public: |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3201 virtual void do_oop(oop* p) { VerifyFieldClosure::do_oop_work(p); } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3202 virtual void do_oop(narrowOop* p) { VerifyFieldClosure::do_oop_work(p); } |
| 0 | 3203 }; |
| 3204 | |
|
17674
85318d1fe8fe
8027146: Class loading verification failure if GC occurs in Universe::flush_dependents_on
coleenp
parents:
17464
diff
changeset
|
3205 void InstanceKlass::verify_on(outputStream* st) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3206 #ifndef PRODUCT |
| 11034 | 3207 // Avoid redundant verifies, this really should be in product. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3208 if (_verify_count == Universe::verify_count()) return; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3209 _verify_count = Universe::verify_count(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3210 #endif |
| 11034 | 3211 |
| 3212 // Verify Klass | |
|
17674
85318d1fe8fe
8027146: Class loading verification failure if GC occurs in Universe::flush_dependents_on
coleenp
parents:
17464
diff
changeset
|
3213 Klass::verify_on(st); |
|
85318d1fe8fe
8027146: Class loading verification failure if GC occurs in Universe::flush_dependents_on
coleenp
parents:
17464
diff
changeset
|
3214 |
|
85318d1fe8fe
8027146: Class loading verification failure if GC occurs in Universe::flush_dependents_on
coleenp
parents:
17464
diff
changeset
|
3215 // Verify that klass is present in ClassLoaderData |
|
85318d1fe8fe
8027146: Class loading verification failure if GC occurs in Universe::flush_dependents_on
coleenp
parents:
17464
diff
changeset
|
3216 guarantee(class_loader_data()->contains_klass(this), |
|
85318d1fe8fe
8027146: Class loading verification failure if GC occurs in Universe::flush_dependents_on
coleenp
parents:
17464
diff
changeset
|
3217 "this class isn't found in class loader data"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3218 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3219 // Verify vtables |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3220 if (is_linked()) { |
| 11034 | 3221 ResourceMark rm; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3222 // $$$ This used to be done only for m/s collections. Doing it |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3223 // always seemed a valid generalization. (DLD -- 6/00) |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3224 vtable()->verify(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3225 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3226 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3227 // Verify first subklass |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3228 if (subklass_oop() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3229 guarantee(subklass_oop()->is_klass(), "should be klass"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3230 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3231 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3232 // Verify siblings |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3233 Klass* super = this->super(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3234 Klass* sib = next_sibling(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3235 if (sib != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3236 if (sib == this) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3237 fatal(err_msg("subclass points to itself " PTR_FORMAT, sib)); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3238 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3239 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3240 guarantee(sib->is_klass(), "should be klass"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3241 guarantee(sib->super() == super, "siblings should have same superklass"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3242 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3243 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3244 // Verify implementor fields |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3245 Klass* im = implementor(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3246 if (im != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3247 guarantee(is_interface(), "only interfaces should have implementor set"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3248 guarantee(im->is_klass(), "should be klass"); |
| 6983 | 3249 guarantee(!im->is_interface() || im == this, |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3250 "implementors cannot be interfaces"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3251 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3252 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3253 // Verify local interfaces |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3254 if (local_interfaces()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3255 Array<Klass*>* local_interfaces = this->local_interfaces(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3256 for (int j = 0; j < local_interfaces->length(); j++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3257 Klass* e = local_interfaces->at(j); |
| 6983 | 3258 guarantee(e->is_klass() && e->is_interface(), "invalid local interface"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3259 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3260 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3261 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3262 // Verify transitive interfaces |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3263 if (transitive_interfaces() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3264 Array<Klass*>* transitive_interfaces = this->transitive_interfaces(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3265 for (int j = 0; j < transitive_interfaces->length(); j++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3266 Klass* e = transitive_interfaces->at(j); |
| 6983 | 3267 guarantee(e->is_klass() && e->is_interface(), "invalid transitive interface"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3268 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3269 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3270 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3271 // Verify methods |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3272 if (methods() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3273 Array<Method*>* methods = this->methods(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3274 for (int j = 0; j < methods->length(); j++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3275 guarantee(methods->at(j)->is_method(), "non-method in methods array"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3276 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3277 for (int j = 0; j < methods->length() - 1; j++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3278 Method* m1 = methods->at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3279 Method* m2 = methods->at(j + 1); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3280 guarantee(m1->name()->fast_compare(m2->name()) <= 0, "methods not sorted correctly"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3281 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3282 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3283 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3284 // Verify method ordering |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3285 if (method_ordering() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3286 Array<int>* method_ordering = this->method_ordering(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3287 int length = method_ordering->length(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3288 if (JvmtiExport::can_maintain_original_method_order() || |
|
9057
8554c55669b0
8010943: guarantee(length == 0) failed: invalid method ordering length
hseigel
parents:
8719
diff
changeset
|
3289 ((UseSharedSpaces || DumpSharedSpaces) && length != 0)) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3290 guarantee(length == methods()->length(), "invalid method ordering length"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3291 jlong sum = 0; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3292 for (int j = 0; j < length; j++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3293 int original_index = method_ordering->at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3294 guarantee(original_index >= 0, "invalid method ordering index"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3295 guarantee(original_index < length, "invalid method ordering index"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3296 sum += original_index; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3297 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3298 // Verify sum of indices 0,1,...,length-1 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3299 guarantee(sum == ((jlong)length*(length-1))/2, "invalid method ordering sum"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3300 } else { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3301 guarantee(length == 0, "invalid method ordering length"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3302 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3303 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3304 |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3305 // Verify default methods |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3306 if (default_methods() != NULL) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3307 Array<Method*>* methods = this->default_methods(); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3308 for (int j = 0; j < methods->length(); j++) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3309 guarantee(methods->at(j)->is_method(), "non-method in methods array"); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3310 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3311 for (int j = 0; j < methods->length() - 1; j++) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3312 Method* m1 = methods->at(j); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3313 Method* m2 = methods->at(j + 1); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3314 guarantee(m1->name()->fast_compare(m2->name()) <= 0, "methods not sorted correctly"); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3315 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3316 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3317 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3318 // Verify JNI static field identifiers |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3319 if (jni_ids() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3320 jni_ids()->verify(this); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3321 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3322 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3323 // Verify other fields |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3324 if (array_klasses() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3325 guarantee(array_klasses()->is_klass(), "should be klass"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3326 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3327 if (constants() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3328 guarantee(constants()->is_constantPool(), "should be constant pool"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3329 } |
|
8693
872b3feace55
8008750: [partfait] Null pointer deference in hotspot/src/share/vm/oops/instanceKlass.hpp
morris
parents:
8031
diff
changeset
|
3330 const Klass* host = host_klass(); |
|
872b3feace55
8008750: [partfait] Null pointer deference in hotspot/src/share/vm/oops/instanceKlass.hpp
morris
parents:
8031
diff
changeset
|
3331 if (host != NULL) { |
|
872b3feace55
8008750: [partfait] Null pointer deference in hotspot/src/share/vm/oops/instanceKlass.hpp
morris
parents:
8031
diff
changeset
|
3332 guarantee(host->is_klass(), "should be klass"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3333 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3334 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3335 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3336 void InstanceKlass::oop_verify_on(oop obj, outputStream* st) { |
| 0 | 3337 Klass::oop_verify_on(obj, st); |
| 3338 VerifyFieldClosure blk; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3339 obj->oop_iterate_no_header(&blk); |
| 0 | 3340 } |
| 3341 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3342 |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3343 // JNIid class for jfieldIDs only |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3344 // Note to reviewers: |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3345 // These JNI functions are just moved over to column 1 and not changed |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3346 // in the compressed oops workspace. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3347 JNIid::JNIid(Klass* holder, int offset, JNIid* next) { |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3348 _holder = holder; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3349 _offset = offset; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3350 _next = next; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3351 debug_only(_is_static_field_id = false;) |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3352 } |
| 0 | 3353 |
| 3354 | |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3355 JNIid* JNIid::find(int offset) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3356 JNIid* current = this; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3357 while (current != NULL) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3358 if (current->offset() == offset) return current; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3359 current = current->next(); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3360 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3361 return NULL; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3362 } |
| 0 | 3363 |
| 3364 void JNIid::deallocate(JNIid* current) { | |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3365 while (current != NULL) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3366 JNIid* next = current->next(); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3367 delete current; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3368 current = next; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3369 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3370 } |
| 0 | 3371 |
| 3372 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3373 void JNIid::verify(Klass* holder) { |
|
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6733
diff
changeset
|
3374 int first_field_offset = InstanceMirrorKlass::offset_of_static_fields(); |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3375 int end_field_offset; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3376 end_field_offset = first_field_offset + (InstanceKlass::cast(holder)->static_field_size() * wordSize); |
| 0 | 3377 |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3378 JNIid* current = this; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3379 while (current != NULL) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3380 guarantee(current->holder() == holder, "Invalid klass in JNIid"); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3381 #ifdef ASSERT |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3382 int o = current->offset(); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3383 if (current->is_static_field_id()) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3384 guarantee(o >= first_field_offset && o < end_field_offset, "Invalid static field offset in JNIid"); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3385 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3386 #endif |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3387 current = current->next(); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3388 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3389 } |
| 0 | 3390 |
| 3391 | |
| 3392 #ifdef ASSERT | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3393 void InstanceKlass::set_init_state(ClassState state) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3394 bool good_state = is_shared() ? (_init_state <= state) |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3395 : (_init_state < state); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3396 assert(good_state || state == allocated, "illegal state transition"); |
|
4739
52b5d32fbfaf
7117052: instanceKlass::_init_state can be u1 type
coleenp
parents:
4006
diff
changeset
|
3397 _init_state = (u1)state; |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3398 } |
| 0 | 3399 #endif |
| 3400 | |
| 3401 | |
| 3402 // RedefineClasses() support for previous versions: | |
| 3403 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3404 // Purge previous versions |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3405 static void purge_previous_versions_internal(InstanceKlass* ik, int emcp_method_count) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3406 if (ik->previous_versions() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3407 // This klass has previous versions so see what we can cleanup |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3408 // while it is safe to do so. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3409 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3410 int deleted_count = 0; // leave debugging breadcrumbs |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3411 int live_count = 0; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3412 ClassLoaderData* loader_data = ik->class_loader_data() == NULL ? |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3413 ClassLoaderData::the_null_class_loader_data() : |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3414 ik->class_loader_data(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3415 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3416 // RC_TRACE macro has an embedded ResourceMark |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3417 RC_TRACE(0x00000200, ("purge: %s: previous version length=%d", |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3418 ik->external_name(), ik->previous_versions()->length())); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3419 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3420 for (int i = ik->previous_versions()->length() - 1; i >= 0; i--) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3421 // check the previous versions array |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3422 PreviousVersionNode * pv_node = ik->previous_versions()->at(i); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3423 ConstantPool* cp_ref = pv_node->prev_constant_pool(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3424 assert(cp_ref != NULL, "cp ref was unexpectedly cleared"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3425 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3426 ConstantPool* pvcp = cp_ref; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3427 if (!pvcp->on_stack()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3428 // If the constant pool isn't on stack, none of the methods |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3429 // are executing. Delete all the methods, the constant pool and |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3430 // and this previous version node. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3431 GrowableArray<Method*>* method_refs = pv_node->prev_EMCP_methods(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3432 if (method_refs != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3433 for (int j = method_refs->length() - 1; j >= 0; j--) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3434 Method* method = method_refs->at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3435 assert(method != NULL, "method ref was unexpectedly cleared"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3436 method_refs->remove_at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3437 // method will be freed with associated class. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3438 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3439 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3440 // Remove the constant pool |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3441 delete pv_node; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3442 // Since we are traversing the array backwards, we don't have to |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3443 // do anything special with the index. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3444 ik->previous_versions()->remove_at(i); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3445 deleted_count++; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3446 continue; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3447 } else { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3448 RC_TRACE(0x00000200, ("purge: previous version @%d is alive", i)); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3449 assert(pvcp->pool_holder() != NULL, "Constant pool with no holder"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3450 guarantee (!loader_data->is_unloading(), "unloaded classes can't be on the stack"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3451 live_count++; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3452 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3453 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3454 // At least one method is live in this previous version, clean out |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3455 // the others or mark them as obsolete. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3456 GrowableArray<Method*>* method_refs = pv_node->prev_EMCP_methods(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3457 if (method_refs != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3458 RC_TRACE(0x00000200, ("purge: previous methods length=%d", |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3459 method_refs->length())); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3460 for (int j = method_refs->length() - 1; j >= 0; j--) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3461 Method* method = method_refs->at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3462 assert(method != NULL, "method ref was unexpectedly cleared"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3463 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3464 // Remove the emcp method if it's not executing |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3465 // If it's been made obsolete by a redefinition of a non-emcp |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3466 // method, mark it as obsolete but leave it to clean up later. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3467 if (!method->on_stack()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3468 method_refs->remove_at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3469 } else if (emcp_method_count == 0) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3470 method->set_is_obsolete(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3471 } else { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3472 // RC_TRACE macro has an embedded ResourceMark |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3473 RC_TRACE(0x00000200, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3474 ("purge: %s(%s): prev method @%d in version @%d is alive", |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3475 method->name()->as_C_string(), |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3476 method->signature()->as_C_string(), j, i)); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3477 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3478 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3479 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3480 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3481 assert(ik->previous_versions()->length() == live_count, "sanity check"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3482 RC_TRACE(0x00000200, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3483 ("purge: previous version stats: live=%d, deleted=%d", live_count, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3484 deleted_count)); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3485 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3486 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3487 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3488 // External interface for use during class unloading. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3489 void InstanceKlass::purge_previous_versions(InstanceKlass* ik) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3490 // Call with >0 emcp methods since they are not currently being redefined. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3491 purge_previous_versions_internal(ik, 1); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3492 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3493 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3494 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3495 // Potentially add an information node that contains pointers to the |
| 0 | 3496 // interesting parts of the previous version of the_class. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3497 // This is also where we clean out any unused references. |
|
977
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
3498 // Note that while we delete nodes from the _previous_versions |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
3499 // array, we never delete the array itself until the klass is |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
3500 // unloaded. The has_been_redefined() query depends on that fact. |
|
74a5db69c1fe
6419370: 4/4 new jmethodID code has tiny holes in synchronization
dcubed
parents:
974
diff
changeset
|
3501 // |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3502 void InstanceKlass::add_previous_version(instanceKlassHandle ikh, |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3503 BitMap* emcp_methods, int emcp_method_count) { |
| 0 | 3504 assert(Thread::current()->is_VM_thread(), |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3505 "only VMThread can add previous versions"); |
| 0 | 3506 |
| 3507 if (_previous_versions == NULL) { | |
| 3508 // This is the first previous version so make some space. | |
| 3509 // Start with 2 elements under the assumption that the class | |
| 3510 // won't be redefined much. | |
| 6197 | 3511 _previous_versions = new (ResourceObj::C_HEAP, mtClass) |
| 0 | 3512 GrowableArray<PreviousVersionNode *>(2, true); |
| 3513 } | |
| 3514 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3515 ConstantPool* cp_ref = ikh->constants(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3516 |
| 0 | 3517 // RC_TRACE macro has an embedded ResourceMark |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3518 RC_TRACE(0x00000400, ("adding previous version ref for %s @%d, EMCP_cnt=%d " |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3519 "on_stack=%d", |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3520 ikh->external_name(), _previous_versions->length(), emcp_method_count, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3521 cp_ref->on_stack())); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3522 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3523 // If the constant pool for this previous version of the class |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3524 // is not marked as being on the stack, then none of the methods |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3525 // in this previous version of the class are on the stack so |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3526 // we don't need to create a new PreviousVersionNode. However, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3527 // we still need to examine older previous versions below. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3528 Array<Method*>* old_methods = ikh->methods(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3529 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3530 if (cp_ref->on_stack()) { |
|
12281
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3531 PreviousVersionNode * pv_node = NULL; |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3532 if (emcp_method_count == 0) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3533 // non-shared ConstantPool gets a reference |
|
12281
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3534 pv_node = new PreviousVersionNode(cp_ref, NULL); |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3535 RC_TRACE(0x00000400, |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3536 ("add: all methods are obsolete; flushing any EMCP refs")); |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3537 } else { |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3538 int local_count = 0; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3539 GrowableArray<Method*>* method_refs = new (ResourceObj::C_HEAP, mtClass) |
|
12281
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3540 GrowableArray<Method*>(emcp_method_count, true); |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3541 for (int i = 0; i < old_methods->length(); i++) { |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3542 if (emcp_methods->at(i)) { |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3543 // this old method is EMCP. Save it only if it's on the stack |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3544 Method* old_method = old_methods->at(i); |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3545 if (old_method->on_stack()) { |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3546 method_refs->append(old_method); |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3547 } |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3548 if (++local_count >= emcp_method_count) { |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3549 // no more EMCP methods so bail out now |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3550 break; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3551 } |
| 0 | 3552 } |
| 3553 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3554 // non-shared ConstantPool gets a reference |
|
12281
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3555 pv_node = new PreviousVersionNode(cp_ref, method_refs); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3556 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3557 // append new previous version. |
|
12281
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3558 _previous_versions->append(pv_node); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3559 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3560 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3561 // Since the caller is the VMThread and we are at a safepoint, this |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3562 // is a good time to clear out unused references. |
| 0 | 3563 |
| 3564 RC_TRACE(0x00000400, ("add: previous version length=%d", | |
| 3565 _previous_versions->length())); | |
| 3566 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3567 // Purge previous versions not executing on the stack |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3568 purge_previous_versions_internal(this, emcp_method_count); |
| 0 | 3569 |
| 3570 int obsolete_method_count = old_methods->length() - emcp_method_count; | |
| 3571 | |
| 3572 if (emcp_method_count != 0 && obsolete_method_count != 0 && | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3573 _previous_versions->length() > 0) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3574 // We have a mix of obsolete and EMCP methods so we have to |
| 0 | 3575 // clear out any matching EMCP method entries the hard way. |
| 3576 int local_count = 0; | |
| 3577 for (int i = 0; i < old_methods->length(); i++) { | |
| 3578 if (!emcp_methods->at(i)) { | |
| 3579 // only obsolete methods are interesting | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3580 Method* old_method = old_methods->at(i); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
3581 Symbol* m_name = old_method->name(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
3582 Symbol* m_signature = old_method->signature(); |
| 0 | 3583 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3584 // we might not have added the last entry |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3585 for (int j = _previous_versions->length() - 1; j >= 0; j--) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3586 // check the previous versions array for non executing obsolete methods |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3587 PreviousVersionNode * pv_node = _previous_versions->at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3588 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3589 GrowableArray<Method*>* method_refs = pv_node->prev_EMCP_methods(); |
| 0 | 3590 if (method_refs == NULL) { |
| 3591 // We have run into a PreviousVersion generation where | |
| 3592 // all methods were made obsolete during that generation's | |
| 3593 // RedefineClasses() operation. At the time of that | |
| 3594 // operation, all EMCP methods were flushed so we don't | |
| 3595 // have to go back any further. | |
| 3596 // | |
| 3597 // A NULL method_refs is different than an empty method_refs. | |
| 3598 // We cannot infer any optimizations about older generations | |
| 3599 // from an empty method_refs for the current generation. | |
| 3600 break; | |
| 3601 } | |
| 3602 | |
| 3603 for (int k = method_refs->length() - 1; k >= 0; k--) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3604 Method* method = method_refs->at(k); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3605 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3606 if (!method->is_obsolete() && |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3607 method->name() == m_name && |
| 0 | 3608 method->signature() == m_signature) { |
| 3609 // The current RedefineClasses() call has made all EMCP | |
| 3610 // versions of this method obsolete so mark it as obsolete | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3611 // and remove the reference. |
| 0 | 3612 RC_TRACE(0x00000400, |
| 3613 ("add: %s(%s): flush obsolete method @%d in version @%d", | |
| 3614 m_name->as_C_string(), m_signature->as_C_string(), k, j)); | |
| 3615 | |
| 3616 method->set_is_obsolete(); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3617 // Leave obsolete methods on the previous version list to |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3618 // clean up later. |
| 0 | 3619 break; |
| 3620 } | |
| 3621 } | |
| 3622 | |
| 3623 // The previous loop may not find a matching EMCP method, but | |
| 3624 // that doesn't mean that we can optimize and not go any | |
| 3625 // further back in the PreviousVersion generations. The EMCP | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3626 // method for this generation could have already been deleted, |
| 0 | 3627 // but there still may be an older EMCP method that has not |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3628 // been deleted. |
| 0 | 3629 } |
| 3630 | |
| 3631 if (++local_count >= obsolete_method_count) { | |
| 3632 // no more obsolete methods so bail out now | |
| 3633 break; | |
| 3634 } | |
| 3635 } | |
| 3636 } | |
| 3637 } | |
| 3638 } // end add_previous_version() | |
| 3639 | |
| 3640 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3641 // Determine if InstanceKlass has a previous version. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3642 bool InstanceKlass::has_previous_version() const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3643 return (_previous_versions != NULL && _previous_versions->length() > 0); |
| 0 | 3644 } // end has_previous_version() |
| 3645 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3646 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3647 Method* InstanceKlass::method_with_idnum(int idnum) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3648 Method* m = NULL; |
| 0 | 3649 if (idnum < methods()->length()) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3650 m = methods()->at(idnum); |
| 0 | 3651 } |
| 3652 if (m == NULL || m->method_idnum() != idnum) { | |
| 3653 for (int index = 0; index < methods()->length(); ++index) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3654 m = methods()->at(index); |
| 0 | 3655 if (m->method_idnum() == idnum) { |
| 3656 return m; | |
| 3657 } | |
| 3658 } | |
|
12281
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3659 // None found, return null for the caller to handle. |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3660 return NULL; |
| 0 | 3661 } |
| 3662 return m; | |
| 3663 } | |
| 3664 | |
|
11148
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
3665 jint InstanceKlass::get_cached_class_file_len() { |
|
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
3666 return VM_RedefineClasses::get_cached_class_file_len(_cached_class_file); |
|
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
3667 } |
|
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
3668 |
|
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
3669 unsigned char * InstanceKlass::get_cached_class_file_bytes() { |
|
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
3670 return VM_RedefineClasses::get_cached_class_file_bytes(_cached_class_file); |
|
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
3671 } |
|
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
3672 |
| 0 | 3673 |
| 3674 // Construct a PreviousVersionNode entry for the array hung off | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3675 // the InstanceKlass. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3676 PreviousVersionNode::PreviousVersionNode(ConstantPool* prev_constant_pool, |
|
12281
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3677 GrowableArray<Method*>* prev_EMCP_methods) { |
| 0 | 3678 |
| 3679 _prev_constant_pool = prev_constant_pool; | |
| 3680 _prev_EMCP_methods = prev_EMCP_methods; | |
| 3681 } | |
| 3682 | |
| 3683 | |
| 3684 // Destroy a PreviousVersionNode | |
| 3685 PreviousVersionNode::~PreviousVersionNode() { | |
| 3686 if (_prev_constant_pool != NULL) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3687 _prev_constant_pool = NULL; |
| 0 | 3688 } |
| 3689 | |
| 3690 if (_prev_EMCP_methods != NULL) { | |
| 3691 delete _prev_EMCP_methods; | |
| 3692 } | |
| 3693 } | |
| 3694 | |
| 3695 // Construct a helper for walking the previous versions array | |
|
12281
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3696 PreviousVersionWalker::PreviousVersionWalker(Thread* thread, InstanceKlass *ik) { |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3697 _thread = thread; |
| 0 | 3698 _previous_versions = ik->previous_versions(); |
| 3699 _current_index = 0; | |
| 3700 _current_p = NULL; | |
|
12281
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3701 _current_constant_pool_handle = constantPoolHandle(thread, ik->constants()); |
| 0 | 3702 } |
| 3703 | |
| 3704 | |
| 3705 // Return the interesting information for the next previous version | |
| 3706 // of the klass. Returns NULL if there are no more previous versions. | |
|
12281
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3707 PreviousVersionNode* PreviousVersionWalker::next_previous_version() { |
| 0 | 3708 if (_previous_versions == NULL) { |
| 3709 // no previous versions so nothing to return | |
| 3710 return NULL; | |
| 3711 } | |
| 3712 | |
|
12281
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3713 _current_p = NULL; // reset to NULL |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3714 _current_constant_pool_handle = NULL; |
| 0 | 3715 |
| 3716 int length = _previous_versions->length(); | |
| 3717 | |
| 3718 while (_current_index < length) { | |
| 3719 PreviousVersionNode * pv_node = _previous_versions->at(_current_index++); | |
|
12281
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3720 |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3721 // Save a handle to the constant pool for this previous version, |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3722 // which keeps all the methods from being deallocated. |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3723 _current_constant_pool_handle = constantPoolHandle(_thread, pv_node->prev_constant_pool()); |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3724 _current_p = pv_node; |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3725 return pv_node; |
| 0 | 3726 } |
| 3727 | |
| 3728 return NULL; | |
| 3729 } // end next_previous_version() |