Mercurial > hg > truffle
annotate src/share/vm/oops/instanceKlass.cpp @ 15926:af0e42dad358
reduced time to initialize ForeignCallProviders by avoiding triggering class initialization of Node subclasses as well as making annotation parsing lazy in SnippetInfo
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Tue, 27 May 2014 15:43:36 +0200 |
| parents | bd4c7b669bd8 |
| children | 66a9286203a2 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 14909 | 2 * Copyright (c) 1997, 2013, 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" |
|
15926
af0e42dad358
reduced time to initialize ForeignCallProviders by avoiding triggering class initialization of Node subclasses as well as making annotation parsing lazy in SnippetInfo
Doug Simon <doug.simon@oracle.com>
parents:
15126
diff
changeset
|
62 #ifdef GRAAL |
|
af0e42dad358
reduced time to initialize ForeignCallProviders by avoiding triggering class initialization of Node subclasses as well as making annotation parsing lazy in SnippetInfo
Doug Simon <doug.simon@oracle.com>
parents:
15126
diff
changeset
|
63 #include "classfile/javaAssertions.hpp" |
|
af0e42dad358
reduced time to initialize ForeignCallProviders by avoiding triggering class initialization of Node subclasses as well as making annotation parsing lazy in SnippetInfo
Doug Simon <doug.simon@oracle.com>
parents:
15126
diff
changeset
|
64 #include "graal/graalVMToCompiler.hpp" |
|
af0e42dad358
reduced time to initialize ForeignCallProviders by avoiding triggering class initialization of Node subclasses as well as making annotation parsing lazy in SnippetInfo
Doug Simon <doug.simon@oracle.com>
parents:
15126
diff
changeset
|
65 #endif |
|
8001
db9981fd3124
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS
jprovino
parents:
7610
diff
changeset
|
66 #if INCLUDE_ALL_GCS |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
67 #include "gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp" |
| 1972 | 68 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" |
| 69 #include "gc_implementation/g1/g1OopClosures.inline.hpp" | |
| 70 #include "gc_implementation/g1/g1RemSet.inline.hpp" | |
| 71 #include "gc_implementation/g1/heapRegionSeq.inline.hpp" | |
| 72 #include "gc_implementation/parNew/parOopClosures.inline.hpp" | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
73 #include "gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp" |
| 1972 | 74 #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp" |
| 75 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp" | |
| 76 #include "oops/oop.pcgc.inline.hpp" | |
|
8001
db9981fd3124
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS
jprovino
parents:
7610
diff
changeset
|
77 #endif // INCLUDE_ALL_GCS |
| 1972 | 78 #ifdef COMPILER1 |
| 79 #include "c1/c1_Compiler.hpp" | |
| 80 #endif | |
| 0 | 81 |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
82 #ifdef DTRACE_ENABLED |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
83 |
| 14909 | 84 #ifndef USDT2 |
| 85 | |
| 86 HS_DTRACE_PROBE_DECL4(hotspot, class__initialization__required, | |
| 87 char*, intptr_t, oop, intptr_t); | |
| 88 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__recursive, | |
| 89 char*, intptr_t, oop, intptr_t, int); | |
| 90 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__concurrent, | |
| 91 char*, intptr_t, oop, intptr_t, int); | |
| 92 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__erroneous, | |
| 93 char*, intptr_t, oop, intptr_t, int); | |
| 94 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__super__failed, | |
| 95 char*, intptr_t, oop, intptr_t, int); | |
| 96 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__clinit, | |
| 97 char*, intptr_t, oop, intptr_t, int); | |
| 98 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__error, | |
| 99 char*, intptr_t, oop, intptr_t, int); | |
| 100 HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__end, | |
| 101 char*, intptr_t, oop, intptr_t, int); | |
| 102 | |
| 103 #define DTRACE_CLASSINIT_PROBE(type, clss, thread_type) \ | |
| 104 { \ | |
| 105 char* data = NULL; \ | |
| 106 int len = 0; \ | |
| 107 Symbol* name = (clss)->name(); \ | |
| 108 if (name != NULL) { \ | |
| 109 data = (char*)name->bytes(); \ | |
| 110 len = name->utf8_length(); \ | |
| 111 } \ | |
| 112 HS_DTRACE_PROBE4(hotspot, class__initialization__##type, \ | |
| 113 data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), thread_type); \ | |
| 114 } | |
| 115 | |
| 116 #define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) \ | |
| 117 { \ | |
| 118 char* data = NULL; \ | |
| 119 int len = 0; \ | |
| 120 Symbol* name = (clss)->name(); \ | |
| 121 if (name != NULL) { \ | |
| 122 data = (char*)name->bytes(); \ | |
| 123 len = name->utf8_length(); \ | |
| 124 } \ | |
| 125 HS_DTRACE_PROBE5(hotspot, class__initialization__##type, \ | |
| 126 data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), thread_type, wait); \ | |
| 127 } | |
| 128 #else /* USDT2 */ | |
| 4006 | 129 |
| 130 #define HOTSPOT_CLASS_INITIALIZATION_required HOTSPOT_CLASS_INITIALIZATION_REQUIRED | |
| 131 #define HOTSPOT_CLASS_INITIALIZATION_recursive HOTSPOT_CLASS_INITIALIZATION_RECURSIVE | |
| 132 #define HOTSPOT_CLASS_INITIALIZATION_concurrent HOTSPOT_CLASS_INITIALIZATION_CONCURRENT | |
| 133 #define HOTSPOT_CLASS_INITIALIZATION_erroneous HOTSPOT_CLASS_INITIALIZATION_ERRONEOUS | |
| 134 #define HOTSPOT_CLASS_INITIALIZATION_super__failed HOTSPOT_CLASS_INITIALIZATION_SUPER_FAILED | |
| 135 #define HOTSPOT_CLASS_INITIALIZATION_clinit HOTSPOT_CLASS_INITIALIZATION_CLINIT | |
| 136 #define HOTSPOT_CLASS_INITIALIZATION_error HOTSPOT_CLASS_INITIALIZATION_ERROR | |
| 137 #define HOTSPOT_CLASS_INITIALIZATION_end HOTSPOT_CLASS_INITIALIZATION_END | |
| 138 #define DTRACE_CLASSINIT_PROBE(type, clss, thread_type) \ | |
| 139 { \ | |
| 140 char* data = NULL; \ | |
| 141 int len = 0; \ | |
| 142 Symbol* name = (clss)->name(); \ | |
| 143 if (name != NULL) { \ | |
| 144 data = (char*)name->bytes(); \ | |
| 145 len = name->utf8_length(); \ | |
| 146 } \ | |
| 147 HOTSPOT_CLASS_INITIALIZATION_##type( \ | |
| 148 data, len, (clss)->class_loader(), thread_type); \ | |
| 149 } | |
| 150 | |
| 151 #define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) \ | |
| 152 { \ | |
| 153 char* data = NULL; \ | |
| 154 int len = 0; \ | |
| 155 Symbol* name = (clss)->name(); \ | |
| 156 if (name != NULL) { \ | |
| 157 data = (char*)name->bytes(); \ | |
| 158 len = name->utf8_length(); \ | |
| 159 } \ | |
| 160 HOTSPOT_CLASS_INITIALIZATION_##type( \ | |
| 161 data, len, (clss)->class_loader(), thread_type, wait); \ | |
| 162 } | |
| 14909 | 163 #endif /* USDT2 */ |
|
1324
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 #else // ndef DTRACE_ENABLED |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
166 |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
167 #define DTRACE_CLASSINIT_PROBE(type, clss, thread_type) |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
168 #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
|
169 |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
170 #endif // ndef DTRACE_ENABLED |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
171 |
|
7464
ecd24264898b
8005048: NMT: #loaded classes needs to just show the # defined classes
zgu
parents:
7180
diff
changeset
|
172 volatile int InstanceKlass::_total_instanceKlass_count = 0; |
|
ecd24264898b
8005048: NMT: #loaded classes needs to just show the # defined classes
zgu
parents:
7180
diff
changeset
|
173 |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
174 InstanceKlass* InstanceKlass::allocate_instance_klass( |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
175 ClassLoaderData* loader_data, |
| 8031 | 176 int vtable_len, |
| 177 int itable_len, | |
| 178 int static_field_size, | |
| 179 int nonstatic_oop_map_size, | |
| 180 ReferenceType rt, | |
| 181 AccessFlags access_flags, | |
| 182 Symbol* name, | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
183 Klass* super_klass, |
| 8031 | 184 bool is_anonymous, |
| 185 TRAPS) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
186 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
187 int size = InstanceKlass::size(vtable_len, itable_len, nonstatic_oop_map_size, |
| 8031 | 188 access_flags.is_interface(), is_anonymous); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
189 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
190 // Allocation |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
191 InstanceKlass* ik; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
192 if (rt == REF_NONE) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
193 if (name == vmSymbols::java_lang_Class()) { |
|
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6733
diff
changeset
|
194 ik = new (loader_data, size, THREAD) InstanceMirrorKlass( |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
195 vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt, |
| 8031 | 196 access_flags, is_anonymous); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
197 } else if (name == vmSymbols::java_lang_ClassLoader() || |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
198 (SystemDictionary::ClassLoader_klass_loaded() && |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
199 super_klass != NULL && |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
200 super_klass->is_subtype_of(SystemDictionary::ClassLoader_klass()))) { |
|
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6733
diff
changeset
|
201 ik = new (loader_data, size, THREAD) InstanceClassLoaderKlass( |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
202 vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt, |
| 8031 | 203 access_flags, is_anonymous); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
204 } else { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
205 // normal class |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
206 ik = new (loader_data, size, THREAD) InstanceKlass( |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
207 vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt, |
| 8031 | 208 access_flags, is_anonymous); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
209 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
210 } else { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
211 // reference klass |
|
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6733
diff
changeset
|
212 ik = new (loader_data, size, THREAD) InstanceRefKlass( |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
213 vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt, |
| 8031 | 214 access_flags, is_anonymous); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
215 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
216 |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
217 // 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
|
218 // class count. Can get OOM here. |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
219 if (HAS_PENDING_EXCEPTION) { |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
220 return NULL; |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
221 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
222 |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
223 // 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
|
224 // 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
|
225 loader_data->add_class(ik); |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
226 |
|
7464
ecd24264898b
8005048: NMT: #loaded classes needs to just show the # defined classes
zgu
parents:
7180
diff
changeset
|
227 Atomic::inc(&_total_instanceKlass_count); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
228 return ik; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
229 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
230 |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
231 |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
232 // 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
|
233 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
|
234 if (m != NULL) { |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
235 // 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
|
236 _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
|
237 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
|
238 _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
|
239 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
240 } else { |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
241 _method_ordering = Universe::the_empty_int_array(); |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
242 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
243 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
244 |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
245 // create a new array of vtable_indices for default methods |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
246 Array<int>* InstanceKlass::create_new_default_vtable_indices(int len, TRAPS) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
247 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
|
248 assert(default_vtable_indices() == NULL, "only create once"); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
249 set_default_vtable_indices(vtable_indices); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
250 return vtable_indices; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
251 } |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
252 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
253 InstanceKlass::InstanceKlass(int vtable_len, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
254 int itable_len, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
255 int static_field_size, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
256 int nonstatic_oop_map_size, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
257 ReferenceType rt, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
258 AccessFlags access_flags, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
259 bool is_anonymous) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
260 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
|
261 |
|
8712
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
262 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
|
263 access_flags.is_interface(), is_anonymous); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
264 |
|
8712
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
265 set_vtable_length(vtable_len); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
266 set_itable_length(itable_len); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
267 set_static_field_size(static_field_size); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
268 set_nonstatic_oop_map_size(nonstatic_oop_map_size); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
269 set_access_flags(access_flags); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
270 _misc_flags = 0; // initialize to zero |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
271 set_is_anonymous(is_anonymous); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
272 assert(size() == iksize, "wrong size for object"); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
273 |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
274 set_array_klasses(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
275 set_methods(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
276 set_method_ordering(NULL); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
277 set_default_methods(NULL); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
278 set_default_vtable_indices(NULL); |
|
8712
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
279 set_local_interfaces(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
280 set_transitive_interfaces(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
281 init_implementor(); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
282 set_fields(NULL, 0); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
283 set_constants(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
284 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
|
285 set_source_file_name_index(0); |
|
8712
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
286 set_source_debug_extension(NULL, 0); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
287 set_array_name(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
288 set_inner_classes(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
289 set_static_oop_field_count(0); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
290 set_nonstatic_field_size(0); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
291 set_is_marked_dependent(false); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
292 set_init_state(InstanceKlass::allocated); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
293 set_init_thread(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
294 set_reference_type(rt); |
|
15052
5e6f29f287d6
added InstanceKlass::_graal_node_class field to accelerate Node.getNodeClass()
Doug Simon <doug.simon@oracle.com>
parents:
14909
diff
changeset
|
295 #ifdef GRAAL |
|
5e6f29f287d6
added InstanceKlass::_graal_node_class field to accelerate Node.getNodeClass()
Doug Simon <doug.simon@oracle.com>
parents:
14909
diff
changeset
|
296 set_graal_node_class(NULL); |
|
5e6f29f287d6
added InstanceKlass::_graal_node_class field to accelerate Node.getNodeClass()
Doug Simon <doug.simon@oracle.com>
parents:
14909
diff
changeset
|
297 #endif |
|
8712
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
298 set_oop_map_cache(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
299 set_jni_ids(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
300 set_osr_nmethods_head(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
301 set_breakpoints(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
302 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
|
303 set_generic_signature_index(0); |
|
8712
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
304 release_set_methods_jmethod_ids(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
305 set_annotations(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
306 set_jvmti_cached_class_field_map(NULL); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
307 set_initial_method_idnum(0); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
308 _dependencies = NULL; |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
309 set_jvmti_cached_class_field_map(NULL); |
|
11148
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
310 set_cached_class_file(NULL); |
|
8712
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
311 set_initial_method_idnum(0); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
312 set_minor_version(0); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
313 set_major_version(0); |
|
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
314 NOT_PRODUCT(_verify_count = 0;) |
|
6725
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 // initialize the non-header words to zero |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
317 intptr_t* p = (intptr_t*)this; |
|
8712
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
318 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
|
319 p[index] = NULL_WORD; |
|
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 // 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
|
323 // size. |
|
8712
3efdfd6ddbf2
8003553: NPG: metaspace objects should be zeroed in constructors
coleenp
parents:
8031
diff
changeset
|
324 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
|
325 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
326 |
|
15052
5e6f29f287d6
added InstanceKlass::_graal_node_class field to accelerate Node.getNodeClass()
Doug Simon <doug.simon@oracle.com>
parents:
14909
diff
changeset
|
327 #ifdef GRAAL |
|
5e6f29f287d6
added InstanceKlass::_graal_node_class field to accelerate Node.getNodeClass()
Doug Simon <doug.simon@oracle.com>
parents:
14909
diff
changeset
|
328 void InstanceKlass::oops_do(OopClosure* cl) { |
|
5e6f29f287d6
added InstanceKlass::_graal_node_class field to accelerate Node.getNodeClass()
Doug Simon <doug.simon@oracle.com>
parents:
14909
diff
changeset
|
329 Klass::oops_do(cl); |
|
5e6f29f287d6
added InstanceKlass::_graal_node_class field to accelerate Node.getNodeClass()
Doug Simon <doug.simon@oracle.com>
parents:
14909
diff
changeset
|
330 cl->do_oop(adr_graal_node_class()); |
|
5e6f29f287d6
added InstanceKlass::_graal_node_class field to accelerate Node.getNodeClass()
Doug Simon <doug.simon@oracle.com>
parents:
14909
diff
changeset
|
331 } |
|
5e6f29f287d6
added InstanceKlass::_graal_node_class field to accelerate Node.getNodeClass()
Doug Simon <doug.simon@oracle.com>
parents:
14909
diff
changeset
|
332 #endif |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
333 |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
334 void InstanceKlass::deallocate_methods(ClassLoaderData* loader_data, |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
335 Array<Method*>* methods) { |
|
12857
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
336 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
|
337 !methods->is_shared()) { |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
338 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
|
339 Method* method = methods->at(i); |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
340 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
|
341 // 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
|
342 // 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
|
343 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
|
344 MetadataFactory::free_metadata(loader_data, method); |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
345 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
346 MetadataFactory::free_array<Method*>(loader_data, methods); |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
347 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
348 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
349 |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
350 void InstanceKlass::deallocate_interfaces(ClassLoaderData* loader_data, |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
351 Klass* super_klass, |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
352 Array<Klass*>* local_interfaces, |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
353 Array<Klass*>* transitive_interfaces) { |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
354 // 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
|
355 // 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
|
356 Array<Klass*>* ti = transitive_interfaces; |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
357 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
|
358 // 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
|
359 Array<Klass*>* sti = (super_klass == NULL) ? NULL : |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
360 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
|
361 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
|
362 MetadataFactory::free_array<Klass*>(loader_data, ti); |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
363 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
364 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
365 |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
366 // local interfaces can be empty |
|
12857
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
367 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
|
368 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
|
369 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
|
370 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
371 } |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
372 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
373 // 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
|
374 // InstanceKlass points to. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
375 void InstanceKlass::deallocate_contents(ClassLoaderData* loader_data) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
376 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
377 // 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
|
378 if (java_mirror() != NULL) { |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
379 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
|
380 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
381 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
382 // 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
|
383 loader_data->remove_class(this); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
384 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
385 // 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
|
386 // 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
|
387 // 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
|
388 // to deallocate. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
389 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
|
390 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
391 // 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
|
392 // reference counting symbol names. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
393 release_C_heap_structures(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
394 |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
395 deallocate_methods(loader_data, methods()); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
396 set_methods(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
397 |
|
12857
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
398 if (method_ordering() != NULL && |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
399 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
|
400 !method_ordering()->is_shared()) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
401 MetadataFactory::free_array<int>(loader_data, method_ordering()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
402 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
403 set_method_ordering(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
404 |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
405 // default methods can be empty |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
406 if (default_methods() != NULL && |
|
12857
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
407 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
|
408 !default_methods()->is_shared()) { |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
409 MetadataFactory::free_array<Method*>(loader_data, default_methods()); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
410 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
411 // Do NOT deallocate the default methods, they are owned by superinterfaces. |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
412 set_default_methods(NULL); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
413 |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
414 // 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
|
415 if (default_vtable_indices() != NULL && |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
416 !default_vtable_indices()->is_shared()) { |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
417 MetadataFactory::free_array<int>(loader_data, default_vtable_indices()); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
418 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
419 set_default_vtable_indices(NULL); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
420 |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
421 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
422 // 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
|
423 // 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
|
424 // interfaces. |
|
12857
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
425 if (secondary_supers() != NULL && |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
426 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
|
427 secondary_supers() != transitive_interfaces() && |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
428 !secondary_supers()->is_shared()) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
429 MetadataFactory::free_array<Klass*>(loader_data, secondary_supers()); |
|
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 set_secondary_supers(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
432 |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
433 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
|
434 set_transitive_interfaces(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
435 set_local_interfaces(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
436 |
|
12857
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
437 if (fields() != NULL && !fields()->is_shared()) { |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
438 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
|
439 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
440 set_fields(NULL, 0); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
441 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
442 // 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
|
443 // 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
|
444 if (constants() != NULL) { |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
445 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
|
446 if (!constants()->is_shared()) { |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
447 MetadataFactory::free_metadata(loader_data, constants()); |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
448 } |
|
8719
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
449 set_constants(NULL); |
|
c8b31b461e1a
8003419: NPG: Clean up metadata created during class loading if failure
coleenp
parents:
8714
diff
changeset
|
450 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
451 |
|
12857
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
452 if (inner_classes() != NULL && |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
453 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
|
454 !inner_classes()->is_shared()) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
455 MetadataFactory::free_array<jushort>(loader_data, inner_classes()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
456 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
457 set_inner_classes(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
458 |
|
12857
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
459 // 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
|
460 if (annotations() != NULL && !annotations()->is_shared()) { |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
461 MetadataFactory::free_metadata(loader_data, annotations()); |
|
d37a0525c0fe
8024667: VM crashes with "assert(method() != NULL) failed: must have set method"
hseigel
parents:
12828
diff
changeset
|
462 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
463 set_annotations(NULL); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
464 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
465 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
466 bool InstanceKlass::should_be_initialized() const { |
| 0 | 467 return !is_initialized(); |
| 468 } | |
| 469 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
470 klassVtable* InstanceKlass::vtable() const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
471 return new klassVtable(this, start_of_vtable(), vtable_length() / vtableEntry::size()); |
| 0 | 472 } |
| 473 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
474 klassItable* InstanceKlass::itable() const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
475 return new klassItable(instanceKlassHandle(this)); |
| 0 | 476 } |
| 477 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
478 void InstanceKlass::eager_initialize(Thread *thread) { |
| 0 | 479 if (!EagerInitialization) return; |
| 480 | |
| 481 if (this->is_not_initialized()) { | |
| 482 // abort if the the class has a class initializer | |
| 483 if (this->class_initializer() != NULL) return; | |
| 484 | |
| 485 // 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
|
486 Klass* super = this->super(); |
| 0 | 487 if (super == NULL) return; |
| 488 | |
| 489 // 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
|
490 if (!InstanceKlass::cast(super)->is_initialized()) return; |
| 0 | 491 |
| 492 // call body to expose the this pointer | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
493 instanceKlassHandle this_oop(thread, this); |
| 0 | 494 eager_initialize_impl(this_oop); |
| 495 } | |
| 496 } | |
| 497 | |
|
10343
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
498 // 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
|
499 // instanceKlass. These accessors pretend these fields are there. |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
500 // 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
|
501 oop InstanceKlass::protection_domain() const { |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
502 // return the protection_domain from the mirror |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
503 return java_lang_Class::protection_domain(java_mirror()); |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
504 } |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
505 |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
506 // 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
|
507 objArrayOop InstanceKlass::signers() const { |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
508 // return the signers from the mirror |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
509 return java_lang_Class::signers(java_mirror()); |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
510 } |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
511 |
|
12811
3374b92de2d9
8025004: -XX:+CheckUnhandledOops asserts for JDK 8 Solaris fastdebug binaries
coleenp
parents:
12318
diff
changeset
|
512 oop InstanceKlass::init_lock() const { |
|
10343
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10265
diff
changeset
|
513 // return the init lock from the mirror |
|
12946
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
514 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
|
515 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
|
516 "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
|
517 return lock; |
|
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
518 } |
|
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
519 |
|
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
520 // 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
|
521 // 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
|
522 // 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
|
523 // the lock and return. |
|
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
524 void InstanceKlass::fence_and_clear_init_lock() { |
|
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
525 // 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
|
526 OrderAccess::storestore(); |
|
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
527 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
|
528 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
|
529 } |
| 0 | 530 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
531 void InstanceKlass::eager_initialize_impl(instanceKlassHandle this_oop) { |
| 0 | 532 EXCEPTION_MARK; |
|
12811
3374b92de2d9
8025004: -XX:+CheckUnhandledOops asserts for JDK 8 Solaris fastdebug binaries
coleenp
parents:
12318
diff
changeset
|
533 oop init_lock = this_oop->init_lock(); |
|
12946
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
534 ObjectLocker ol(init_lock, THREAD, init_lock != NULL); |
| 0 | 535 |
| 536 // abort if someone beat us to the initialization | |
| 537 if (!this_oop->is_not_initialized()) return; // note: not equivalent to is_initialized() | |
| 538 | |
|
4739
52b5d32fbfaf
7117052: instanceKlass::_init_state can be u1 type
coleenp
parents:
4006
diff
changeset
|
539 ClassState old_state = this_oop->init_state(); |
| 0 | 540 link_class_impl(this_oop, true, THREAD); |
| 541 if (HAS_PENDING_EXCEPTION) { | |
| 542 CLEAR_PENDING_EXCEPTION; | |
| 543 // Abort if linking the class throws an exception. | |
| 544 | |
| 545 // Use a test to avoid redundantly resetting the state if there's | |
| 546 // no change. Set_init_state() asserts that state changes make | |
| 547 // progress, whereas here we might just be spinning in place. | |
| 548 if( old_state != this_oop->_init_state ) | |
| 549 this_oop->set_init_state (old_state); | |
| 550 } else { | |
| 551 // linking successfull, mark class as initialized | |
| 552 this_oop->set_init_state (fully_initialized); | |
|
12946
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
553 this_oop->fence_and_clear_init_lock(); |
| 0 | 554 // trace |
| 555 if (TraceClassInitialization) { | |
| 556 ResourceMark rm(THREAD); | |
| 557 tty->print_cr("[Initialized %s without side effects]", this_oop->external_name()); | |
| 558 } | |
| 559 } | |
| 560 } | |
| 561 | |
| 562 | |
| 563 // See "The Virtual Machine Specification" section 2.16.5 for a detailed explanation of the class initialization | |
| 564 // process. The step comments refers to the procedure described in that section. | |
| 565 // 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
|
566 void InstanceKlass::initialize(TRAPS) { |
| 0 | 567 if (this->should_be_initialized()) { |
| 568 HandleMark hm(THREAD); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
569 instanceKlassHandle this_oop(THREAD, this); |
| 0 | 570 initialize_impl(this_oop, CHECK); |
| 571 // Note: at this point the class may be initialized | |
| 572 // OR it may be in the state of being initialized | |
| 573 // in case of recursive initialization! | |
| 574 } else { | |
| 575 assert(is_initialized(), "sanity check"); | |
| 576 } | |
| 577 } | |
| 578 | |
| 579 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
580 bool InstanceKlass::verify_code( |
| 0 | 581 instanceKlassHandle this_oop, bool throw_verifyerror, TRAPS) { |
| 582 // 1) Verify the bytecodes | |
| 583 Verifier::Mode mode = | |
| 584 throw_verifyerror ? Verifier::ThrowException : Verifier::NoException; | |
|
973
ad6585fd4087
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
964
diff
changeset
|
585 return Verifier::verify(this_oop, mode, this_oop->should_verify_class(), CHECK_false); |
| 0 | 586 } |
| 587 | |
| 588 | |
| 589 // Used exclusively by the shared spaces dump mechanism to prevent | |
| 590 // classes mapped into the shared regions in new VMs from appearing linked. | |
| 591 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
592 void InstanceKlass::unlink_class() { |
| 0 | 593 assert(is_linked(), "must be linked"); |
| 594 _init_state = loaded; | |
| 595 } | |
| 596 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
597 void InstanceKlass::link_class(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, true, CHECK); |
| 603 } | |
| 604 } | |
| 605 | |
| 606 // Called to verify that a class can link during initialization, without | |
| 607 // throwing a VerifyError. | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
608 bool InstanceKlass::link_class_or_fail(TRAPS) { |
| 0 | 609 assert(is_loaded(), "must be loaded"); |
| 610 if (!is_linked()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
611 HandleMark hm(THREAD); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
612 instanceKlassHandle this_oop(THREAD, this); |
| 0 | 613 link_class_impl(this_oop, false, CHECK_false); |
| 614 } | |
| 615 return is_linked(); | |
| 616 } | |
| 617 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
618 bool InstanceKlass::link_class_impl( |
| 0 | 619 instanceKlassHandle this_oop, bool throw_verifyerror, TRAPS) { |
| 620 // check for error state | |
| 621 if (this_oop->is_in_error_state()) { | |
| 622 ResourceMark rm(THREAD); | |
| 623 THROW_MSG_(vmSymbols::java_lang_NoClassDefFoundError(), | |
| 624 this_oop->external_name(), false); | |
| 625 } | |
| 626 // return if already verified | |
| 627 if (this_oop->is_linked()) { | |
| 628 return true; | |
| 629 } | |
| 630 | |
| 631 // Timing | |
| 632 // timer handles recursion | |
| 633 assert(THREAD->is_Java_thread(), "non-JavaThread in link_class_impl"); | |
| 634 JavaThread* jt = (JavaThread*)THREAD; | |
| 635 | |
| 636 // link super class before linking this class | |
| 637 instanceKlassHandle super(THREAD, this_oop->super()); | |
| 638 if (super.not_null()) { | |
| 639 if (super->is_interface()) { // check if super class is an interface | |
| 640 ResourceMark rm(THREAD); | |
| 641 Exceptions::fthrow( | |
| 642 THREAD_AND_LOCATION, | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
643 vmSymbols::java_lang_IncompatibleClassChangeError(), |
| 0 | 644 "class %s has interface %s as super class", |
| 645 this_oop->external_name(), | |
| 646 super->external_name() | |
| 647 ); | |
| 648 return false; | |
| 649 } | |
| 650 | |
| 651 link_class_impl(super, throw_verifyerror, CHECK_false); | |
| 652 } | |
| 653 | |
| 654 // 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
|
655 Array<Klass*>* interfaces = this_oop->local_interfaces(); |
| 0 | 656 int num_interfaces = interfaces->length(); |
| 657 for (int index = 0; index < num_interfaces; index++) { | |
| 658 HandleMark hm(THREAD); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
659 instanceKlassHandle ih(THREAD, interfaces->at(index)); |
| 0 | 660 link_class_impl(ih, throw_verifyerror, CHECK_false); |
| 661 } | |
| 662 | |
| 663 // in case the class is linked in the process of linking its superclasses | |
| 664 if (this_oop->is_linked()) { | |
| 665 return true; | |
| 666 } | |
| 667 | |
|
875
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
668 // 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
|
669 // the verification time |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
670 PerfClassTraceTime vmtimer(ClassLoader::perf_class_link_time(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
671 ClassLoader::perf_class_link_selftime(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
672 ClassLoader::perf_classes_linked(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
673 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
|
674 jt->get_thread_stat()->perf_timers_addr(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
675 PerfClassTraceTime::CLASS_LINK); |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
676 |
| 0 | 677 // verification & rewriting |
| 678 { | |
|
12811
3374b92de2d9
8025004: -XX:+CheckUnhandledOops asserts for JDK 8 Solaris fastdebug binaries
coleenp
parents:
12318
diff
changeset
|
679 oop init_lock = this_oop->init_lock(); |
|
12946
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
680 ObjectLocker ol(init_lock, THREAD, init_lock != NULL); |
| 0 | 681 // rewritten will have been set if loader constraint error found |
| 682 // on an earlier link attempt | |
| 683 // 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
|
684 |
| 0 | 685 if (!this_oop->is_linked()) { |
| 686 if (!this_oop->is_rewritten()) { | |
| 687 { | |
| 688 // Timer includes any side effects of class verification (resolution, | |
| 689 // 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
|
690 PerfClassTraceTime timer(ClassLoader::perf_class_verify_time(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
691 ClassLoader::perf_class_verify_selftime(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
692 ClassLoader::perf_classes_verified(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
693 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
|
694 jt->get_thread_stat()->perf_timers_addr(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
695 PerfClassTraceTime::CLASS_VERIFY); |
| 0 | 696 bool verify_ok = verify_code(this_oop, throw_verifyerror, THREAD); |
| 697 if (!verify_ok) { | |
| 698 return false; | |
| 699 } | |
| 700 } | |
| 701 | |
| 702 // Just in case a side-effect of verify linked this class already | |
| 703 // (which can sometimes happen since the verifier loads classes | |
| 704 // using custom class loaders, which are free to initialize things) | |
| 705 if (this_oop->is_linked()) { | |
| 706 return true; | |
| 707 } | |
| 708 | |
| 709 // also sets rewritten | |
| 710 this_oop->rewrite_class(CHECK_false); | |
| 711 } | |
| 712 | |
| 3404 | 713 // 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
|
714 this_oop->link_methods(CHECK_false); |
| 3404 | 715 |
| 0 | 716 // Initialize the vtable and interface table after |
| 717 // methods have been rewritten since rewrite may | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
718 // fabricate new Method*s. |
| 0 | 719 // also does loader constraint checking |
| 720 if (!this_oop()->is_shared()) { | |
| 721 ResourceMark rm(THREAD); | |
| 722 this_oop->vtable()->initialize_vtable(true, CHECK_false); | |
| 723 this_oop->itable()->initialize_itable(true, CHECK_false); | |
| 724 } | |
| 725 #ifdef ASSERT | |
| 726 else { | |
| 727 ResourceMark rm(THREAD); | |
| 728 this_oop->vtable()->verify(tty, true); | |
| 729 // In case itable verification is ever added. | |
| 730 // this_oop->itable()->verify(tty, true); | |
| 731 } | |
| 732 #endif | |
| 733 this_oop->set_init_state(linked); | |
| 734 if (JvmtiExport::should_post_class_prepare()) { | |
| 735 Thread *thread = THREAD; | |
| 736 assert(thread->is_Java_thread(), "thread->is_Java_thread()"); | |
| 737 JvmtiExport::post_class_prepare((JavaThread *) thread, this_oop()); | |
| 738 } | |
| 739 } | |
| 740 } | |
| 741 return true; | |
| 742 } | |
| 743 | |
| 744 | |
| 745 // Rewrite the byte codes of all of the methods of a class. | |
| 746 // The rewriter must be called exactly once. Rewriting must happen after | |
| 747 // 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
|
748 void InstanceKlass::rewrite_class(TRAPS) { |
| 0 | 749 assert(is_loaded(), "must be loaded"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
750 instanceKlassHandle this_oop(THREAD, this); |
| 0 | 751 if (this_oop->is_rewritten()) { |
| 752 assert(this_oop()->is_shared(), "rewriting an unshared class?"); | |
| 753 return; | |
| 754 } | |
| 3404 | 755 Rewriter::rewrite(this_oop, CHECK); |
| 0 | 756 this_oop->set_rewritten(); |
| 757 } | |
| 758 | |
| 3404 | 759 // Now relocate and link method entry points after class is rewritten. |
| 760 // This is outside is_rewritten flag. In case of an exception, it can be | |
| 761 // 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
|
762 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
|
763 int len = methods()->length(); |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
764 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
|
765 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
|
766 |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
767 // 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
|
768 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
|
769 |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
770 // 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
|
771 #ifdef ASSERT |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
772 if (StressMethodComparator) { |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
773 ResourceMark rm(THREAD); |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
774 static int nmc = 0; |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
775 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
|
776 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
|
777 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
|
778 methods()->at(j)); |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
779 if (j == i && !z) { |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
780 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
|
781 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
|
782 } |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
783 } |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
784 } |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
785 #endif //ASSERT |
|
cc6a617fffd2
8005494: SIGSEGV in Rewriter::relocate_and_link() when testing Weblogic with CompressedOops and KlassPtrs
coleenp
parents:
7457
diff
changeset
|
786 } |
| 3404 | 787 } |
| 788 | |
| 0 | 789 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
790 void InstanceKlass::initialize_impl(instanceKlassHandle this_oop, TRAPS) { |
| 0 | 791 // Make sure klass is linked (verified) before initialization |
| 792 // A class could already be verified, since it has been reflected upon. | |
| 793 this_oop->link_class(CHECK); | |
| 794 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
795 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
|
796 |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
797 bool wait = false; |
|
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
798 |
| 0 | 799 // refer to the JVM book page 47 for description of steps |
| 800 // Step 1 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
801 { |
|
12811
3374b92de2d9
8025004: -XX:+CheckUnhandledOops asserts for JDK 8 Solaris fastdebug binaries
coleenp
parents:
12318
diff
changeset
|
802 oop init_lock = this_oop->init_lock(); |
|
12946
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
803 ObjectLocker ol(init_lock, THREAD, init_lock != NULL); |
| 0 | 804 |
| 805 Thread *self = THREAD; // it's passed the current thread | |
| 806 | |
| 807 // Step 2 | |
| 808 // If we were to use wait() instead of waitInterruptibly() then | |
| 809 // we might end up throwing IE from link/symbol resolution sites | |
| 810 // that aren't expected to throw. This would wreak havoc. See 6320309. | |
| 811 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
|
812 wait = true; |
| 0 | 813 ol.waitUninterruptibly(CHECK); |
| 814 } | |
| 815 | |
| 816 // Step 3 | |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
817 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
|
818 DTRACE_CLASSINIT_PROBE_WAIT(recursive, InstanceKlass::cast(this_oop()), -1,wait); |
| 0 | 819 return; |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
820 } |
| 0 | 821 |
| 822 // Step 4 | |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
823 if (this_oop->is_initialized()) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
824 DTRACE_CLASSINIT_PROBE_WAIT(concurrent, InstanceKlass::cast(this_oop()), -1,wait); |
| 0 | 825 return; |
|
1324
e392695de029
6935224: Adding new DTrace probes to work with Palantir
fparain
parents:
1155
diff
changeset
|
826 } |
| 0 | 827 |
| 828 // Step 5 | |
| 829 if (this_oop->is_in_error_state()) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
830 DTRACE_CLASSINIT_PROBE_WAIT(erroneous, InstanceKlass::cast(this_oop()), -1,wait); |
| 0 | 831 ResourceMark rm(THREAD); |
| 832 const char* desc = "Could not initialize class "; | |
| 833 const char* className = this_oop->external_name(); | |
| 834 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
|
835 char* message = NEW_RESOURCE_ARRAY(char, msglen); |
| 0 | 836 if (NULL == message) { |
| 837 // Out of memory: can't create detailed error message | |
| 838 THROW_MSG(vmSymbols::java_lang_NoClassDefFoundError(), className); | |
| 839 } else { | |
| 840 jio_snprintf(message, msglen, "%s%s", desc, className); | |
| 841 THROW_MSG(vmSymbols::java_lang_NoClassDefFoundError(), message); | |
| 842 } | |
| 843 } | |
| 844 | |
| 845 // Step 6 | |
| 846 this_oop->set_init_state(being_initialized); | |
| 847 this_oop->set_init_thread(self); | |
| 848 } | |
| 849 | |
| 850 // Step 7 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
851 Klass* super_klass = this_oop->super(); |
| 6983 | 852 if (super_klass != NULL && !this_oop->is_interface() && super_klass->should_be_initialized()) { |
| 853 super_klass->initialize(THREAD); | |
| 0 | 854 |
| 855 if (HAS_PENDING_EXCEPTION) { | |
| 856 Handle e(THREAD, PENDING_EXCEPTION); | |
| 857 CLEAR_PENDING_EXCEPTION; | |
| 858 { | |
| 859 EXCEPTION_MARK; | |
| 860 this_oop->set_initialization_state_and_notify(initialization_error, THREAD); // Locks object, set state, and notify all waiting threads | |
| 861 CLEAR_PENDING_EXCEPTION; // ignore any exception thrown, superclass initialization error is thrown below | |
| 862 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
863 DTRACE_CLASSINIT_PROBE_WAIT(super__failed, InstanceKlass::cast(this_oop()), -1,wait); |
| 0 | 864 THROW_OOP(e()); |
| 865 } | |
| 866 } | |
| 867 | |
| 6934 | 868 if (this_oop->has_default_methods()) { |
| 869 // Step 7.5: initialize any interfaces which have default methods | |
| 870 for (int i = 0; i < this_oop->local_interfaces()->length(); ++i) { | |
| 871 Klass* iface = this_oop->local_interfaces()->at(i); | |
| 872 InstanceKlass* ik = InstanceKlass::cast(iface); | |
| 873 if (ik->has_default_methods() && ik->should_be_initialized()) { | |
| 874 ik->initialize(THREAD); | |
| 875 | |
| 876 if (HAS_PENDING_EXCEPTION) { | |
| 877 Handle e(THREAD, PENDING_EXCEPTION); | |
| 878 CLEAR_PENDING_EXCEPTION; | |
| 879 { | |
| 880 EXCEPTION_MARK; | |
| 881 // Locks object, set state, and notify all waiting threads | |
| 882 this_oop->set_initialization_state_and_notify( | |
| 883 initialization_error, THREAD); | |
| 884 | |
| 885 // ignore any exception thrown, superclass initialization error is | |
| 886 // thrown below | |
| 887 CLEAR_PENDING_EXCEPTION; | |
| 888 } | |
| 889 DTRACE_CLASSINIT_PROBE_WAIT( | |
| 890 super__failed, InstanceKlass::cast(this_oop()), -1, wait); | |
| 891 THROW_OOP(e()); | |
| 892 } | |
| 893 } | |
| 894 } | |
| 895 } | |
| 896 | |
| 0 | 897 // Step 8 |
| 898 { | |
| 899 assert(THREAD->is_Java_thread(), "non-JavaThread in initialize_impl"); | |
| 900 JavaThread* jt = (JavaThread*)THREAD; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
901 DTRACE_CLASSINIT_PROBE_WAIT(clinit, InstanceKlass::cast(this_oop()), -1,wait); |
| 0 | 902 // Timer includes any side effects of class initialization (resolution, |
| 903 // 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
|
904 PerfClassTraceTime timer(ClassLoader::perf_class_init_time(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
905 ClassLoader::perf_class_init_selftime(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
906 ClassLoader::perf_classes_inited(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
907 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
|
908 jt->get_thread_stat()->perf_timers_addr(), |
|
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
676
diff
changeset
|
909 PerfClassTraceTime::CLASS_CLINIT); |
| 0 | 910 this_oop->call_class_initializer(THREAD); |
| 911 } | |
| 912 | |
| 913 // Step 9 | |
| 914 if (!HAS_PENDING_EXCEPTION) { | |
| 915 this_oop->set_initialization_state_and_notify(fully_initialized, CHECK); | |
| 916 { ResourceMark rm(THREAD); | |
| 917 debug_only(this_oop->vtable()->verify(tty, true);) | |
| 918 } | |
| 919 } | |
| 920 else { | |
| 921 // Step 10 and 11 | |
| 922 Handle e(THREAD, PENDING_EXCEPTION); | |
| 923 CLEAR_PENDING_EXCEPTION; | |
| 924 { | |
| 925 EXCEPTION_MARK; | |
| 926 this_oop->set_initialization_state_and_notify(initialization_error, THREAD); | |
| 927 CLEAR_PENDING_EXCEPTION; // ignore any exception thrown, class initialization error is thrown below | |
| 928 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
929 DTRACE_CLASSINIT_PROBE_WAIT(error, InstanceKlass::cast(this_oop()), -1,wait); |
| 1142 | 930 if (e->is_a(SystemDictionary::Error_klass())) { |
| 0 | 931 THROW_OOP(e()); |
| 932 } else { | |
| 933 JavaCallArguments args(e); | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
934 THROW_ARG(vmSymbols::java_lang_ExceptionInInitializerError(), |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
935 vmSymbols::throwable_void_signature(), |
| 0 | 936 &args); |
| 937 } | |
| 938 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
939 DTRACE_CLASSINIT_PROBE_WAIT(end, InstanceKlass::cast(this_oop()), -1,wait); |
| 0 | 940 } |
| 941 | |
| 942 | |
| 943 // 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
|
944 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
|
945 instanceKlassHandle kh(THREAD, this); |
| 0 | 946 set_initialization_state_and_notify_impl(kh, state, CHECK); |
| 947 } | |
| 948 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
949 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
|
950 oop init_lock = this_oop->init_lock(); |
|
12946
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
951 ObjectLocker ol(init_lock, THREAD, init_lock != NULL); |
| 0 | 952 this_oop->set_init_state(state); |
|
12946
b8860472c377
8014910: deadlock between JVM/TI ClassPrepare event handler and CompilerThread
iklam
parents:
12857
diff
changeset
|
953 this_oop->fence_and_clear_init_lock(); |
| 0 | 954 ol.notify_all(CHECK); |
| 955 } | |
| 956 | |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
957 // 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
|
958 // 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
|
959 // 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
|
960 // 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
|
961 // NULL - no implementor |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
962 // 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
|
963 // 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
|
964 // |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
965 // The _implementor field only exists for interfaces. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
966 void InstanceKlass::add_implementor(Klass* k) { |
| 0 | 967 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
|
968 assert(is_interface(), "not interface"); |
| 0 | 969 // Filter out my subinterfaces. |
| 970 // (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
|
971 if (InstanceKlass::cast(k)->is_interface()) return; |
| 0 | 972 |
| 973 // Filter out subclasses whose supers already implement me. | |
| 974 // (Note: CHA must walk subclasses of direct implementors | |
| 975 // in order to locate indirect implementors.) | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
976 Klass* sk = InstanceKlass::cast(k)->super(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
977 if (sk != NULL && InstanceKlass::cast(sk)->implements_interface(this)) |
| 0 | 978 // We only need to check one immediate superclass, since the |
| 979 // implements_interface query looks at transitive_interfaces. | |
| 980 // Any supers of the super have the same (or fewer) transitive_interfaces. | |
| 981 return; | |
| 982 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
983 Klass* ik = implementor(); |
|
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
984 if (ik == NULL) { |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
985 set_implementor(k); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
986 } 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
|
987 // 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
|
988 // more than one implementors. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
989 set_implementor(this); |
| 0 | 990 } |
| 991 | |
| 992 // The implementor also implements the transitive_interfaces | |
| 993 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
|
994 InstanceKlass::cast(local_interfaces()->at(index))->add_implementor(k); |
| 0 | 995 } |
| 996 } | |
| 997 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
998 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
|
999 if (is_interface()) { |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
1000 set_implementor(NULL); |
|
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
5969
diff
changeset
|
1001 } |
| 0 | 1002 } |
| 1003 | |
| 1004 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1005 void InstanceKlass::process_interfaces(Thread *thread) { |
| 0 | 1006 // 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
|
1007 Klass* this_as_klass_oop = this; |
| 0 | 1008 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
|
1009 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
|
1010 InstanceKlass* interf = InstanceKlass::cast(local_interfaces()->at(i)); |
| 0 | 1011 assert(interf->is_interface(), "expected interface"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1012 interf->add_implementor(this_as_klass_oop); |
| 0 | 1013 } |
| 1014 } | |
| 1015 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1016 bool InstanceKlass::can_be_primary_super_slow() const { |
| 0 | 1017 if (is_interface()) |
| 1018 return false; | |
| 1019 else | |
| 1020 return Klass::can_be_primary_super_slow(); | |
| 1021 } | |
| 1022 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1023 GrowableArray<Klass*>* InstanceKlass::compute_secondary_supers(int num_extra_slots) { |
| 0 | 1024 // The secondaries are the implemented interfaces. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1025 InstanceKlass* ik = InstanceKlass::cast(this); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1026 Array<Klass*>* interfaces = ik->transitive_interfaces(); |
| 0 | 1027 int num_secondaries = num_extra_slots + interfaces->length(); |
| 1028 if (num_secondaries == 0) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1029 // Must share this for correct bootstrapping! |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1030 set_secondary_supers(Universe::the_empty_klass_array()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1031 return NULL; |
| 0 | 1032 } else if (num_extra_slots == 0) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1033 // 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
|
1034 // 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
|
1035 set_secondary_supers(interfaces); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1036 return NULL; |
| 0 | 1037 } else { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1038 // 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
|
1039 // into the secondary super list with extra slots. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1040 GrowableArray<Klass*>* secondaries = new GrowableArray<Klass*>(interfaces->length()); |
| 0 | 1041 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
|
1042 secondaries->push(interfaces->at(i)); |
| 0 | 1043 } |
| 1044 return secondaries; | |
| 1045 } | |
| 1046 } | |
| 1047 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1048 bool InstanceKlass::compute_is_subtype_of(Klass* k) { |
| 6983 | 1049 if (k->is_interface()) { |
| 0 | 1050 return implements_interface(k); |
| 1051 } else { | |
| 1052 return Klass::compute_is_subtype_of(k); | |
| 1053 } | |
| 1054 } | |
| 1055 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1056 bool InstanceKlass::implements_interface(Klass* k) const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1057 if (this == k) return true; |
| 6983 | 1058 assert(k->is_interface(), "should be an interface class"); |
| 0 | 1059 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
|
1060 if (transitive_interfaces()->at(i) == k) { |
| 0 | 1061 return true; |
| 1062 } | |
| 1063 } | |
| 1064 return false; | |
| 1065 } | |
| 1066 | |
|
13401
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1067 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
|
1068 // Verify direct super interface |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1069 if (this == k) return true; |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1070 assert(k->is_interface(), "should be an interface class"); |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1071 for (int i = 0; i < local_interfaces()->length(); i++) { |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1072 if (local_interfaces()->at(i) == k) { |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1073 return true; |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1074 } |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1075 } |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1076 return false; |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1077 } |
|
22eaa15b7960
8026065: InterfaceMethodref for invokespecial must name a direct superinterface
hseigel
parents:
13080
diff
changeset
|
1078 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1079 objArrayOop InstanceKlass::allocate_objArray(int n, int length, TRAPS) { |
| 0 | 1080 if (length < 0) THROW_0(vmSymbols::java_lang_NegativeArraySizeException()); |
| 1081 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
|
1082 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
|
1083 JvmtiExport::post_array_size_exhausted(); |
| 0 | 1084 THROW_OOP_0(Universe::out_of_memory_error_array_size()); |
| 1085 } | |
| 1086 int size = objArrayOopDesc::object_size(length); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1087 Klass* ak = array_klass(n, CHECK_NULL); |
| 0 | 1088 KlassHandle h_ak (THREAD, ak); |
| 1089 objArrayOop o = | |
| 1090 (objArrayOop)CollectedHeap::array_allocate(h_ak, size, length, CHECK_NULL); | |
| 1091 return o; | |
| 1092 } | |
| 1093 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1094 instanceOop InstanceKlass::register_finalizer(instanceOop i, TRAPS) { |
| 0 | 1095 if (TraceFinalizerRegistration) { |
| 1096 tty->print("Registered "); | |
| 1097 i->print_value_on(tty); | |
| 1098 tty->print_cr(" (" INTPTR_FORMAT ") as finalizable", (address)i); | |
| 1099 } | |
| 1100 instanceHandle h_i(THREAD, i); | |
| 1101 // Pass the handle as argument, JavaCalls::call expects oop as jobjects | |
| 1102 JavaValue result(T_VOID); | |
| 1103 JavaCallArguments args(h_i); | |
| 1104 methodHandle mh (THREAD, Universe::finalizer_register_method()); | |
| 1105 JavaCalls::call(&result, mh, &args, CHECK_NULL); | |
| 1106 return h_i(); | |
| 1107 } | |
| 1108 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1109 instanceOop InstanceKlass::allocate_instance(TRAPS) { |
| 0 | 1110 bool has_finalizer_flag = has_finalizer(); // Query before possible GC |
| 1111 int size = size_helper(); // Query before forming handle. | |
| 1112 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1113 KlassHandle h_k(THREAD, this); |
| 0 | 1114 |
| 1115 instanceOop i; | |
| 1116 | |
| 1117 i = (instanceOop)CollectedHeap::obj_allocate(h_k, size, CHECK_NULL); | |
| 1118 if (has_finalizer_flag && !RegisterFinalizersAtInit) { | |
| 1119 i = register_finalizer(i, CHECK_NULL); | |
| 1120 } | |
| 1121 return i; | |
| 1122 } | |
| 1123 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1124 void InstanceKlass::check_valid_for_instantiation(bool throwError, TRAPS) { |
| 0 | 1125 if (is_interface() || is_abstract()) { |
| 1126 ResourceMark rm(THREAD); | |
| 1127 THROW_MSG(throwError ? vmSymbols::java_lang_InstantiationError() | |
| 1128 : vmSymbols::java_lang_InstantiationException(), external_name()); | |
| 1129 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1130 if (this == SystemDictionary::Class_klass()) { |
| 0 | 1131 ResourceMark rm(THREAD); |
| 1132 THROW_MSG(throwError ? vmSymbols::java_lang_IllegalAccessError() | |
| 1133 : vmSymbols::java_lang_IllegalAccessException(), external_name()); | |
| 1134 } | |
| 1135 } | |
| 1136 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1137 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
|
1138 instanceKlassHandle this_oop(THREAD, this); |
| 0 | 1139 return array_klass_impl(this_oop, or_null, n, THREAD); |
| 1140 } | |
| 1141 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1142 Klass* InstanceKlass::array_klass_impl(instanceKlassHandle this_oop, bool or_null, int n, TRAPS) { |
| 0 | 1143 if (this_oop->array_klasses() == NULL) { |
| 1144 if (or_null) return NULL; | |
| 1145 | |
| 1146 ResourceMark rm; | |
| 1147 JavaThread *jt = (JavaThread *)THREAD; | |
| 1148 { | |
| 1149 // Atomic creation of array_klasses | |
| 1150 MutexLocker mc(Compile_lock, THREAD); // for vtables | |
| 1151 MutexLocker ma(MultiArray_lock, THREAD); | |
| 1152 | |
| 1153 // Check if update has already taken place | |
| 1154 if (this_oop->array_klasses() == NULL) { | |
|
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
1155 Klass* k = ObjArrayKlass::allocate_objArray_klass(this_oop->class_loader_data(), 1, this_oop, CHECK_NULL); |
| 0 | 1156 this_oop->set_array_klasses(k); |
| 1157 } | |
| 1158 } | |
| 1159 } | |
| 1160 // _this will always be set at this point | |
|
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
1161 ObjArrayKlass* oak = (ObjArrayKlass*)this_oop->array_klasses(); |
| 0 | 1162 if (or_null) { |
| 1163 return oak->array_klass_or_null(n); | |
| 1164 } | |
| 1165 return oak->array_klass(n, CHECK_NULL); | |
| 1166 } | |
| 1167 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1168 Klass* InstanceKlass::array_klass_impl(bool or_null, TRAPS) { |
| 0 | 1169 return array_klass_impl(or_null, 1, THREAD); |
| 1170 } | |
| 1171 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1172 void InstanceKlass::call_class_initializer(TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1173 instanceKlassHandle ik (THREAD, this); |
| 0 | 1174 call_class_initializer_impl(ik, THREAD); |
| 1175 } | |
| 1176 | |
| 1177 static int call_class_initializer_impl_counter = 0; // for debugging | |
| 1178 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1179 Method* InstanceKlass::class_initializer() { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1180 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
|
1181 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
|
1182 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
|
1183 return clinit; |
|
dbad0519a1c4
6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents:
2227
diff
changeset
|
1184 } |
|
dbad0519a1c4
6845426: non-static <clinit> method with no args is called during the class initialization process
kamg
parents:
2227
diff
changeset
|
1185 return NULL; |
| 0 | 1186 } |
| 1187 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1188 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
|
1189 if (ReplayCompiles && |
|
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6934
diff
changeset
|
1190 (ReplaySuppressInitializers == 1 || |
|
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6934
diff
changeset
|
1191 ReplaySuppressInitializers >= 2 && this_oop->class_loader() != NULL)) { |
|
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6934
diff
changeset
|
1192 // 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
|
1193 return; |
|
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6934
diff
changeset
|
1194 } |
|
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6934
diff
changeset
|
1195 |
| 0 | 1196 methodHandle h_method(THREAD, this_oop->class_initializer()); |
| 1197 assert(!this_oop->is_initialized(), "we cannot initialize twice"); | |
| 1198 if (TraceClassInitialization) { | |
| 1199 tty->print("%d Initializing ", call_class_initializer_impl_counter++); | |
| 1200 this_oop->name()->print_value(); | |
| 1201 tty->print_cr("%s (" INTPTR_FORMAT ")", h_method() == NULL ? "(no method)" : "", (address)this_oop()); | |
| 1202 } | |
| 1203 if (h_method() != NULL) { | |
| 1204 JavaCallArguments args; // No arguments | |
| 1205 JavaValue result(T_VOID); | |
| 1206 JavaCalls::call(&result, h_method, &args, CHECK); // Static call (no args) | |
| 1207 } | |
|
15106
6876a4599b7e
create NodeClass for each Node subclass during class initialization of the latter
Doug Simon <doug.simon@oracle.com>
parents:
15052
diff
changeset
|
1208 |
|
6876a4599b7e
create NodeClass for each Node subclass during class initialization of the latter
Doug Simon <doug.simon@oracle.com>
parents:
15052
diff
changeset
|
1209 #ifdef GRAAL |
|
15126
bd4c7b669bd8
initialize NodeClass for Node classes that are not on the boot class path
Doug Simon <doug.simon@oracle.com>
parents:
15106
diff
changeset
|
1210 if (this_oop->is_subtype_of(SystemDictionary::Node_klass())) { |
|
15106
6876a4599b7e
create NodeClass for each Node subclass during class initialization of the latter
Doug Simon <doug.simon@oracle.com>
parents:
15052
diff
changeset
|
1211 if (this_oop() != SystemDictionary::Node_klass()) { |
|
15926
af0e42dad358
reduced time to initialize ForeignCallProviders by avoiding triggering class initialization of Node subclasses as well as making annotation parsing lazy in SnippetInfo
Doug Simon <doug.simon@oracle.com>
parents:
15126
diff
changeset
|
1212 if (!VMToCompiler::is_HotSpotGraalRuntime_initialized() && JavaAssertions::systemClassDefault() == false) { |
|
af0e42dad358
reduced time to initialize ForeignCallProviders by avoiding triggering class initialization of Node subclasses as well as making annotation parsing lazy in SnippetInfo
Doug Simon <doug.simon@oracle.com>
parents:
15126
diff
changeset
|
1213 // We want to ensure that the process of initializing HotSpotGraalRuntime |
|
af0e42dad358
reduced time to initialize ForeignCallProviders by avoiding triggering class initialization of Node subclasses as well as making annotation parsing lazy in SnippetInfo
Doug Simon <doug.simon@oracle.com>
parents:
15126
diff
changeset
|
1214 // is fast since it executes at VM startup. We must avoid triggering |
|
af0e42dad358
reduced time to initialize ForeignCallProviders by avoiding triggering class initialization of Node subclasses as well as making annotation parsing lazy in SnippetInfo
Doug Simon <doug.simon@oracle.com>
parents:
15126
diff
changeset
|
1215 // class initialization of any Node classes during this process. |
|
af0e42dad358
reduced time to initialize ForeignCallProviders by avoiding triggering class initialization of Node subclasses as well as making annotation parsing lazy in SnippetInfo
Doug Simon <doug.simon@oracle.com>
parents:
15126
diff
changeset
|
1216 ResourceMark rm; |
|
af0e42dad358
reduced time to initialize ForeignCallProviders by avoiding triggering class initialization of Node subclasses as well as making annotation parsing lazy in SnippetInfo
Doug Simon <doug.simon@oracle.com>
parents:
15126
diff
changeset
|
1217 char buf[200]; |
|
af0e42dad358
reduced time to initialize ForeignCallProviders by avoiding triggering class initialization of Node subclasses as well as making annotation parsing lazy in SnippetInfo
Doug Simon <doug.simon@oracle.com>
parents:
15126
diff
changeset
|
1218 jio_snprintf(buf, sizeof(buf), "Node subclass %s must not be initialized before HotSpotGraalRuntime is initialized", this_oop->name()->as_C_string()); |
|
af0e42dad358
reduced time to initialize ForeignCallProviders by avoiding triggering class initialization of Node subclasses as well as making annotation parsing lazy in SnippetInfo
Doug Simon <doug.simon@oracle.com>
parents:
15126
diff
changeset
|
1219 THROW_MSG(vmSymbols::java_lang_InternalError(), buf); |
|
af0e42dad358
reduced time to initialize ForeignCallProviders by avoiding triggering class initialization of Node subclasses as well as making annotation parsing lazy in SnippetInfo
Doug Simon <doug.simon@oracle.com>
parents:
15126
diff
changeset
|
1220 } |
|
15106
6876a4599b7e
create NodeClass for each Node subclass during class initialization of the latter
Doug Simon <doug.simon@oracle.com>
parents:
15052
diff
changeset
|
1221 // Create the NodeClass for a Node subclass. |
|
6876a4599b7e
create NodeClass for each Node subclass during class initialization of the latter
Doug Simon <doug.simon@oracle.com>
parents:
15052
diff
changeset
|
1222 TempNewSymbol sig = SymbolTable::new_symbol("(Ljava/lang/Class;)Lcom/oracle/graal/graph/NodeClass;", CHECK); |
|
6876a4599b7e
create NodeClass for each Node subclass during class initialization of the latter
Doug Simon <doug.simon@oracle.com>
parents:
15052
diff
changeset
|
1223 JavaValue result(T_OBJECT); |
|
6876a4599b7e
create NodeClass for each Node subclass during class initialization of the latter
Doug Simon <doug.simon@oracle.com>
parents:
15052
diff
changeset
|
1224 JavaCalls::call_static(&result, SystemDictionary::NodeClass_klass(), vmSymbols::get_name(), sig, this_oop->java_mirror(), CHECK); |
|
6876a4599b7e
create NodeClass for each Node subclass during class initialization of the latter
Doug Simon <doug.simon@oracle.com>
parents:
15052
diff
changeset
|
1225 this_oop->set_graal_node_class((oop) result.get_jobject()); |
|
15126
bd4c7b669bd8
initialize NodeClass for Node classes that are not on the boot class path
Doug Simon <doug.simon@oracle.com>
parents:
15106
diff
changeset
|
1226 } else { |
|
bd4c7b669bd8
initialize NodeClass for Node classes that are not on the boot class path
Doug Simon <doug.simon@oracle.com>
parents:
15106
diff
changeset
|
1227 // A NodeClass cannot be created for Node due to checks in |
|
bd4c7b669bd8
initialize NodeClass for Node classes that are not on the boot class path
Doug Simon <doug.simon@oracle.com>
parents:
15106
diff
changeset
|
1228 // NodeClass.FieldScanner.scanField() |
|
15106
6876a4599b7e
create NodeClass for each Node subclass during class initialization of the latter
Doug Simon <doug.simon@oracle.com>
parents:
15052
diff
changeset
|
1229 } |
|
6876a4599b7e
create NodeClass for each Node subclass during class initialization of the latter
Doug Simon <doug.simon@oracle.com>
parents:
15052
diff
changeset
|
1230 } |
|
6876a4599b7e
create NodeClass for each Node subclass during class initialization of the latter
Doug Simon <doug.simon@oracle.com>
parents:
15052
diff
changeset
|
1231 #endif |
| 0 | 1232 } |
| 1233 | |
| 1234 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1235 void InstanceKlass::mask_for(methodHandle method, int bci, |
| 0 | 1236 InterpreterOopMap* entry_for) { |
| 1237 // Dirty read, then double-check under a lock. | |
| 1238 if (_oop_map_cache == NULL) { | |
| 1239 // Otherwise, allocate a new one. | |
| 1240 MutexLocker x(OopMapCacheAlloc_lock); | |
| 1241 // First time use. Allocate a cache in C heap | |
| 1242 if (_oop_map_cache == NULL) { | |
| 14909 | 1243 _oop_map_cache = new OopMapCache(); |
| 0 | 1244 } |
| 1245 } | |
| 1246 // _oop_map_cache is constant after init; lookup below does is own locking. | |
| 1247 _oop_map_cache->lookup(method, bci, entry_for); | |
| 1248 } | |
| 1249 | |
| 1250 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1251 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
|
1252 for (JavaFieldStream fs(this); !fs.done(); fs.next()) { |
| 3938 | 1253 Symbol* f_name = fs.name(); |
| 1254 Symbol* f_sig = fs.signature(); | |
| 0 | 1255 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
|
1256 fd->reinitialize(const_cast<InstanceKlass*>(this), fs.index()); |
| 0 | 1257 return true; |
| 1258 } | |
| 1259 } | |
| 1260 return false; | |
| 1261 } | |
| 1262 | |
| 1263 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1264 Klass* InstanceKlass::find_interface_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const { |
| 0 | 1265 const int n = local_interfaces()->length(); |
| 1266 for (int i = 0; i < n; i++) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1267 Klass* intf1 = local_interfaces()->at(i); |
| 6983 | 1268 assert(intf1->is_interface(), "just checking type"); |
| 0 | 1269 // search for field in current interface |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1270 if (InstanceKlass::cast(intf1)->find_local_field(name, sig, fd)) { |
| 0 | 1271 assert(fd->is_static(), "interface field must be static"); |
| 1272 return intf1; | |
| 1273 } | |
| 1274 // search for field in direct superinterfaces | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1275 Klass* intf2 = InstanceKlass::cast(intf1)->find_interface_field(name, sig, fd); |
| 0 | 1276 if (intf2 != NULL) return intf2; |
| 1277 } | |
| 1278 // otherwise field lookup fails | |
| 1279 return NULL; | |
| 1280 } | |
| 1281 | |
| 1282 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1283 Klass* InstanceKlass::find_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const { |
| 0 | 1284 // search order according to newest JVM spec (5.4.3.2, p.167). |
| 1285 // 1) search for field in current klass | |
| 1286 if (find_local_field(name, sig, fd)) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1287 return const_cast<InstanceKlass*>(this); |
| 0 | 1288 } |
| 1289 // 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
|
1290 { Klass* intf = find_interface_field(name, sig, fd); |
| 0 | 1291 if (intf != NULL) return intf; |
| 1292 } | |
| 1293 // 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
|
1294 { Klass* supr = super(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1295 if (supr != NULL) return InstanceKlass::cast(supr)->find_field(name, sig, fd); |
| 0 | 1296 } |
| 1297 // 4) otherwise field lookup fails | |
| 1298 return NULL; | |
| 1299 } | |
| 1300 | |
| 1301 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1302 Klass* InstanceKlass::find_field(Symbol* name, Symbol* sig, bool is_static, fieldDescriptor* fd) const { |
| 0 | 1303 // search order according to newest JVM spec (5.4.3.2, p.167). |
| 1304 // 1) search for field in current klass | |
| 1305 if (find_local_field(name, sig, fd)) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1306 if (fd->is_static() == is_static) return const_cast<InstanceKlass*>(this); |
| 0 | 1307 } |
| 1308 // 2) search for field recursively in direct superinterfaces | |
| 1309 if (is_static) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1310 Klass* intf = find_interface_field(name, sig, fd); |
| 0 | 1311 if (intf != NULL) return intf; |
| 1312 } | |
| 1313 // 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
|
1314 { Klass* supr = super(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1315 if (supr != NULL) return InstanceKlass::cast(supr)->find_field(name, sig, is_static, fd); |
| 0 | 1316 } |
| 1317 // 4) otherwise field lookup fails | |
| 1318 return NULL; | |
| 1319 } | |
| 1320 | |
| 1321 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1322 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
|
1323 for (JavaFieldStream fs(this); !fs.done(); fs.next()) { |
| 3938 | 1324 if (fs.offset() == offset) { |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
1325 fd->reinitialize(const_cast<InstanceKlass*>(this), fs.index()); |
| 0 | 1326 if (fd->is_static() == is_static) return true; |
| 1327 } | |
| 1328 } | |
| 1329 return false; | |
| 1330 } | |
| 1331 | |
| 1332 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1333 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
|
1334 Klass* klass = const_cast<InstanceKlass*>(this); |
| 0 | 1335 while (klass != NULL) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1336 if (InstanceKlass::cast(klass)->find_local_field_from_offset(offset, is_static, fd)) { |
| 0 | 1337 return true; |
| 1338 } | |
| 6983 | 1339 klass = klass->super(); |
| 0 | 1340 } |
| 1341 return false; | |
| 1342 } | |
| 1343 | |
| 1344 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1345 void InstanceKlass::methods_do(void f(Method* method)) { |
| 0 | 1346 int len = methods()->length(); |
| 1347 for (int index = 0; index < len; index++) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1348 Method* m = methods()->at(index); |
| 0 | 1349 assert(m->is_method(), "must be method"); |
| 1350 f(m); | |
| 1351 } | |
| 1352 } | |
| 1353 | |
|
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
1354 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1355 void InstanceKlass::do_local_static_fields(FieldClosure* cl) { |
| 3938 | 1356 for (JavaFieldStream fs(this); !fs.done(); fs.next()) { |
| 1357 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
|
1358 fieldDescriptor& fd = fs.field_descriptor(); |
| 3938 | 1359 cl->do_field(&fd); |
| 1360 } | |
| 0 | 1361 } |
| 1362 } | |
| 1363 | |
| 1364 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1365 void InstanceKlass::do_local_static_fields(void f(fieldDescriptor*, TRAPS), TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1366 instanceKlassHandle h_this(THREAD, this); |
| 0 | 1367 do_local_static_fields_impl(h_this, f, CHECK); |
| 1368 } | |
| 1369 | |
| 1370 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1371 void InstanceKlass::do_local_static_fields_impl(instanceKlassHandle this_oop, void f(fieldDescriptor* fd, TRAPS), TRAPS) { |
| 3938 | 1372 for (JavaFieldStream fs(this_oop()); !fs.done(); fs.next()) { |
| 1373 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
|
1374 fieldDescriptor& fd = fs.field_descriptor(); |
| 3938 | 1375 f(&fd, CHECK); |
| 1376 } | |
| 0 | 1377 } |
| 1378 } | |
| 1379 | |
| 1380 | |
|
44
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1381 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
|
1382 return a[0] - b[0]; |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1383 } |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1384 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1385 void InstanceKlass::do_nonstatic_fields(FieldClosure* cl) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1386 InstanceKlass* super = superklass(); |
| 0 | 1387 if (super != NULL) { |
| 1388 super->do_nonstatic_fields(cl); | |
| 1389 } | |
|
44
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1390 fieldDescriptor fd; |
| 3938 | 1391 int length = java_fields_count(); |
|
44
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1392 // In DebugInfo nonstatic fields are sorted by offset. |
| 6197 | 1393 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
|
1394 int j = 0; |
| 3938 | 1395 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
|
1396 fd.reinitialize(this, i); |
|
44
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1397 if (!fd.is_static()) { |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1398 fields_sorted[j + 0] = fd.offset(); |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1399 fields_sorted[j + 1] = i; |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1400 j += 2; |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1401 } |
| 0 | 1402 } |
|
44
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1403 if (j > 0) { |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1404 length = j; |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1405 // _sort_Fn is defined in growableArray.hpp. |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1406 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
|
1407 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
|
1408 fd.reinitialize(this, fields_sorted[i + 1]); |
|
44
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1409 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
|
1410 cl->do_field(&fd); |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1411 } |
|
52fed2ec0afb
6667620: (Escape Analysis) fix deoptimization for scalar replaced objects
kvn
parents:
0
diff
changeset
|
1412 } |
| 6197 | 1413 FREE_C_HEAP_ARRAY(int, fields_sorted, mtClass); |
| 0 | 1414 } |
| 1415 | |
| 1416 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1417 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
|
1418 if (array_klasses() != NULL) |
|
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
1419 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
|
1420 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1421 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1422 void InstanceKlass::array_klasses_do(void f(Klass* k)) { |
| 0 | 1423 if (array_klasses() != NULL) |
|
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
1424 ArrayKlass::cast(array_klasses())->array_klasses_do(f); |
| 0 | 1425 } |
| 1426 | |
| 1427 #ifdef ASSERT | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1428 static int linear_search(Array<Method*>* methods, Symbol* name, Symbol* signature) { |
| 0 | 1429 int len = methods->length(); |
| 1430 for (int index = 0; index < len; index++) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1431 Method* m = methods->at(index); |
| 0 | 1432 assert(m->is_method(), "must be method"); |
| 1433 if (m->signature() == signature && m->name() == name) { | |
| 1434 return index; | |
| 1435 } | |
| 1436 } | |
| 1437 return -1; | |
| 1438 } | |
| 1439 #endif | |
| 1440 | |
| 6934 | 1441 static int binary_search(Array<Method*>* methods, Symbol* name) { |
| 0 | 1442 int len = methods->length(); |
| 1443 // methods are sorted, so do binary search | |
| 1444 int l = 0; | |
| 1445 int h = len - 1; | |
| 1446 while (l <= h) { | |
| 1447 int mid = (l + h) >> 1; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1448 Method* m = methods->at(mid); |
| 0 | 1449 assert(m->is_method(), "must be method"); |
| 1450 int res = m->name()->fast_compare(name); | |
| 1451 if (res == 0) { | |
| 6934 | 1452 return mid; |
| 0 | 1453 } else if (res < 0) { |
| 1454 l = mid + 1; | |
| 1455 } else { | |
| 1456 h = mid - 1; | |
| 1457 } | |
| 1458 } | |
| 6934 | 1459 return -1; |
| 1460 } | |
| 1461 | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1462 // find_method looks up the name/signature in the local methods array |
| 6934 | 1463 Method* InstanceKlass::find_method(Symbol* name, Symbol* signature) const { |
| 1464 return InstanceKlass::find_method(methods(), name, signature); | |
| 1465 } | |
| 1466 | |
|
13414
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13401
diff
changeset
|
1467 // 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
|
1468 // and skips over static methods |
|
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13401
diff
changeset
|
1469 Method* InstanceKlass::find_instance_method( |
|
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13401
diff
changeset
|
1470 Array<Method*>* methods, Symbol* name, Symbol* signature) { |
|
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13401
diff
changeset
|
1471 Method* meth = InstanceKlass::find_method(methods, name, signature); |
|
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13401
diff
changeset
|
1472 if (meth != NULL && meth->is_static()) { |
|
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13401
diff
changeset
|
1473 meth = NULL; |
|
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13401
diff
changeset
|
1474 } |
|
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13401
diff
changeset
|
1475 return meth; |
|
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13401
diff
changeset
|
1476 } |
|
379f11bc04fc
8028438: static superclass method masks default methods
acorn
parents:
13401
diff
changeset
|
1477 |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1478 // find_method looks up the name/signature in the local methods array |
| 6934 | 1479 Method* InstanceKlass::find_method( |
| 1480 Array<Method*>* methods, Symbol* name, Symbol* signature) { | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1481 int hit = find_method_index(methods, name, signature); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1482 return hit >= 0 ? methods->at(hit): NULL; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1483 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1484 |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1485 // Used directly for default_methods to find the index into the |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1486 // default_vtable_indices, and indirectly by find_method |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1487 // find_method_index looks in the local methods array to return the index |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1488 // of the matching name/signature |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1489 int InstanceKlass::find_method_index( |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1490 Array<Method*>* methods, Symbol* name, Symbol* signature) { |
| 6934 | 1491 int hit = binary_search(methods, name); |
| 1492 if (hit != -1) { | |
| 1493 Method* m = methods->at(hit); | |
| 1494 // Do linear search to find matching signature. First, quick check | |
| 1495 // for common case | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1496 if (m->signature() == signature) return hit; |
| 6934 | 1497 // search downwards through overloaded methods |
| 1498 int i; | |
| 1499 for (i = hit - 1; i >= 0; --i) { | |
| 1500 Method* m = methods->at(i); | |
| 1501 assert(m->is_method(), "must be method"); | |
| 1502 if (m->name() != name) break; | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1503 if (m->signature() == signature) return i; |
| 6934 | 1504 } |
| 1505 // search upwards | |
| 1506 for (i = hit + 1; i < methods->length(); ++i) { | |
| 1507 Method* m = methods->at(i); | |
| 1508 assert(m->is_method(), "must be method"); | |
| 1509 if (m->name() != name) break; | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1510 if (m->signature() == signature) return i; |
| 6934 | 1511 } |
| 1512 // not found | |
| 0 | 1513 #ifdef ASSERT |
| 6934 | 1514 int index = linear_search(methods, name, signature); |
| 1515 assert(index == -1, err_msg("binary search should have found entry %d", index)); | |
| 0 | 1516 #endif |
| 6934 | 1517 } |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1518 return -1; |
| 0 | 1519 } |
| 6934 | 1520 int InstanceKlass::find_method_by_name(Symbol* name, int* end) { |
| 1521 return find_method_by_name(methods(), name, end); | |
| 1522 } | |
| 1523 | |
| 1524 int InstanceKlass::find_method_by_name( | |
| 1525 Array<Method*>* methods, Symbol* name, int* end_ptr) { | |
| 1526 assert(end_ptr != NULL, "just checking"); | |
| 1527 int start = binary_search(methods, name); | |
| 1528 int end = start + 1; | |
| 1529 if (start != -1) { | |
| 1530 while (start - 1 >= 0 && (methods->at(start - 1))->name() == name) --start; | |
| 1531 while (end < methods->length() && (methods->at(end))->name() == name) ++end; | |
| 1532 *end_ptr = end; | |
| 1533 return start; | |
| 1534 } | |
| 1535 return -1; | |
| 1536 } | |
| 1537 | |
| 14909 | 1538 // lookup_method searches both the local methods array and all superclasses methods arrays |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1539 Method* InstanceKlass::uncached_lookup_method(Symbol* name, Symbol* signature) const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1540 Klass* klass = const_cast<InstanceKlass*>(this); |
| 0 | 1541 while (klass != NULL) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1542 Method* method = InstanceKlass::cast(klass)->find_method(name, signature); |
| 14909 | 1543 if (method != NULL) return method; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1544 klass = InstanceKlass::cast(klass)->super(); |
| 0 | 1545 } |
| 1546 return NULL; | |
| 1547 } | |
| 1548 | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1549 // 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
|
1550 // Do NOT return private or static methods |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1551 Method* InstanceKlass::lookup_method_in_ordered_interfaces(Symbol* name, |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1552 Symbol* signature) const { |
|
12828
d25557d03ec0
8026185: nsk/jvmit/GetMethodDeclaringClass/declcls001 failed
acorn
parents:
12823
diff
changeset
|
1553 Method* m = NULL; |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1554 if (default_methods() != NULL) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1555 m = find_method(default_methods(), name, signature); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1556 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1557 // Look up interfaces |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1558 if (m == NULL) { |
| 14909 | 1559 m = lookup_method_in_all_interfaces(name, signature); |
|
12823
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 return m; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1562 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
1563 |
| 0 | 1564 // 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
|
1565 // 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
|
1566 // 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
|
1567 Method* InstanceKlass::lookup_method_in_all_interfaces(Symbol* name, |
| 14909 | 1568 Symbol* signature) const { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1569 Array<Klass*>* all_ifs = transitive_interfaces(); |
| 0 | 1570 int num_ifs = all_ifs->length(); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1571 InstanceKlass *ik = NULL; |
| 0 | 1572 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
|
1573 ik = InstanceKlass::cast(all_ifs->at(i)); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1574 Method* m = ik->lookup_method(name, signature); |
| 14909 | 1575 if (m != NULL && m->is_public() && !m->is_static()) { |
| 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:
3404
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) { |
| 14909 | 2267 for (ProfileData* data = mdo->first_data(); |
| 2268 mdo->is_valid(data); | |
| 2269 data = mdo->next_data(data)) { | |
| 2270 data->clean_weak_klass_links(is_alive); | |
| 2271 } | |
| 2272 ParametersTypeData* parameters = mdo->parameters_type_data(); | |
| 2273 if (parameters != NULL) { | |
| 2274 parameters->clean_weak_klass_links(is_alive); | |
| 2275 } | |
| 0 | 2276 } |
| 2277 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2278 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2279 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2280 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2281 static void remove_unshareable_in_class(Klass* k) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2282 // remove klass's unshareable info |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2283 k->remove_unshareable_info(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2284 } |
|
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 void InstanceKlass::remove_unshareable_info() { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2287 Klass::remove_unshareable_info(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2288 // Unlink the class |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2289 if (is_linked()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2290 unlink_class(); |
|
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 init_implementor(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2293 |
|
15052
5e6f29f287d6
added InstanceKlass::_graal_node_class field to accelerate Node.getNodeClass()
Doug Simon <doug.simon@oracle.com>
parents:
14909
diff
changeset
|
2294 #ifdef GRAAL |
|
5e6f29f287d6
added InstanceKlass::_graal_node_class field to accelerate Node.getNodeClass()
Doug Simon <doug.simon@oracle.com>
parents:
14909
diff
changeset
|
2295 set_graal_node_class(NULL); |
|
5e6f29f287d6
added InstanceKlass::_graal_node_class field to accelerate Node.getNodeClass()
Doug Simon <doug.simon@oracle.com>
parents:
14909
diff
changeset
|
2296 #endif |
|
5e6f29f287d6
added InstanceKlass::_graal_node_class field to accelerate Node.getNodeClass()
Doug Simon <doug.simon@oracle.com>
parents:
14909
diff
changeset
|
2297 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2298 constants()->remove_unshareable_info(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2299 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2300 for (int i = 0; i < methods()->length(); i++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2301 Method* m = methods()->at(i); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2302 m->remove_unshareable_info(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2303 } |
|
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 // do array classes also. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2306 array_klasses_do(remove_unshareable_in_class); |
| 0 | 2307 } |
| 2308 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2309 void restore_unshareable_in_class(Klass* k, TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2310 k->restore_unshareable_info(CHECK); |
| 0 | 2311 } |
| 2312 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2313 void InstanceKlass::restore_unshareable_info(TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2314 Klass::restore_unshareable_info(CHECK); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2315 instanceKlassHandle ik(THREAD, this); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2316 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2317 Array<Method*>* methods = ik->methods(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2318 int num_methods = methods->length(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2319 for (int index2 = 0; index2 < num_methods; ++index2) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2320 methodHandle m(THREAD, methods->at(index2)); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2321 m()->link_method(m, CHECK); |
|
6733
fa6e618671d7
7195867: NPG: SAJDI tests fail with sun.jvm.hotspot.types.WrongTypeException: No suitable match for type
coleenp
parents:
6725
diff
changeset
|
2322 // restore method's vtable by calling a virtual function |
|
fa6e618671d7
7195867: NPG: SAJDI tests fail with sun.jvm.hotspot.types.WrongTypeException: No suitable match for type
coleenp
parents:
6725
diff
changeset
|
2323 m->restore_vtable(); |
|
6725
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 if (JvmtiExport::has_redefined_a_class()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2326 // Reinitialize vtable because RedefineClasses may have changed some |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2327 // 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
|
2328 // 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
|
2329 // 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
|
2330 // 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
|
2331 ResourceMark rm(THREAD); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2332 ik->vtable()->initialize_vtable(false, CHECK); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2333 ik->itable()->initialize_itable(false, CHECK); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2334 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2335 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2336 // restore constant pool resolved references |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2337 ik->constants()->restore_unshareable_info(CHECK); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2338 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2339 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
|
2340 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2341 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2342 static void clear_all_breakpoints(Method* m) { |
| 0 | 2343 m->clear_all_breakpoints(); |
| 2344 } | |
| 2345 | |
|
10149
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2346 |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2347 void InstanceKlass::notify_unload_class(InstanceKlass* ik) { |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2348 // notify the debugger |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2349 if (JvmtiExport::should_post_class_unload()) { |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2350 JvmtiExport::post_class_unload(ik); |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2351 } |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2352 |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2353 // notify ClassLoadingService of class unload |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2354 ClassLoadingService::notify_class_unloaded(ik); |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2355 } |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2356 |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2357 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
|
2358 // Clean up C heap |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2359 ik->release_C_heap_structures(); |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2360 ik->constants()->release_C_heap_structures(); |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2361 } |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2362 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2363 void InstanceKlass::release_C_heap_structures() { |
|
10149
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2364 |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2365 // 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
|
2366 // 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
|
2367 // redefine classes. |
|
d587a5c30bd8
8011803: release_C_heap_structures is never called for anonymous classes.
coleenp
parents:
10133
diff
changeset
|
2368 |
| 0 | 2369 // Deallocate oop map cache |
| 2370 if (_oop_map_cache != NULL) { | |
| 2371 delete _oop_map_cache; | |
| 2372 _oop_map_cache = NULL; | |
| 2373 } | |
| 2374 | |
| 2375 // Deallocate JNI identifiers for jfieldIDs | |
| 2376 JNIid::deallocate(jni_ids()); | |
| 2377 set_jni_ids(NULL); | |
| 2378 | |
| 2379 jmethodID* jmeths = methods_jmethod_ids_acquire(); | |
| 2380 if (jmeths != (jmethodID*)NULL) { | |
| 2381 release_set_methods_jmethod_ids(NULL); | |
| 2382 FreeHeap(jmeths); | |
| 2383 } | |
| 2384 | |
|
10347
6c138b9851fb
8013945: CMS fatal error: must own lock MemberNameTable_lock
sspitsyn
parents:
10345
diff
changeset
|
2385 // Deallocate MemberNameTable |
|
6c138b9851fb
8013945: CMS fatal error: must own lock MemberNameTable_lock
sspitsyn
parents:
10345
diff
changeset
|
2386 { |
|
6c138b9851fb
8013945: CMS fatal error: must own lock MemberNameTable_lock
sspitsyn
parents:
10345
diff
changeset
|
2387 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
|
2388 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
|
2389 MemberNameTable* mnt = member_names(); |
|
6c138b9851fb
8013945: CMS fatal error: must own lock MemberNameTable_lock
sspitsyn
parents:
10345
diff
changeset
|
2390 if (mnt != NULL) { |
|
6c138b9851fb
8013945: CMS fatal error: must own lock MemberNameTable_lock
sspitsyn
parents:
10345
diff
changeset
|
2391 delete mnt; |
|
6c138b9851fb
8013945: CMS fatal error: must own lock MemberNameTable_lock
sspitsyn
parents:
10345
diff
changeset
|
2392 set_member_names(NULL); |
|
6c138b9851fb
8013945: CMS fatal error: must own lock MemberNameTable_lock
sspitsyn
parents:
10345
diff
changeset
|
2393 } |
|
10133
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
9062
diff
changeset
|
2394 } |
|
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
9062
diff
changeset
|
2395 |
| 0 | 2396 // release dependencies |
| 2397 nmethodBucket* b = _dependencies; | |
| 2398 _dependencies = NULL; | |
| 2399 while (b != NULL) { | |
| 2400 nmethodBucket* next = b->next(); | |
| 2401 delete b; | |
| 2402 b = next; | |
| 2403 } | |
| 2404 | |
| 2405 // Deallocate breakpoint records | |
| 2406 if (breakpoints() != 0x0) { | |
| 2407 methods_do(clear_all_breakpoints); | |
| 2408 assert(breakpoints() == 0x0, "should have cleared breakpoints"); | |
| 2409 } | |
| 2410 | |
| 2411 // deallocate information about previous versions | |
| 2412 if (_previous_versions != NULL) { | |
| 2413 for (int i = _previous_versions->length() - 1; i >= 0; i--) { | |
| 2414 PreviousVersionNode * pv_node = _previous_versions->at(i); | |
| 2415 delete pv_node; | |
| 2416 } | |
| 2417 delete _previous_versions; | |
| 2418 _previous_versions = NULL; | |
| 2419 } | |
| 2420 | |
| 2421 // deallocate the cached class file | |
|
11148
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
2422 if (_cached_class_file != NULL) { |
|
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
2423 os::free(_cached_class_file, mtClass); |
|
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
2424 _cached_class_file = NULL; |
| 0 | 2425 } |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2426 |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2427 // 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
|
2428 if (_name != NULL) _name->decrement_refcount(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2429 // 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
|
2430 // class can't be referenced anymore). |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2431 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
|
2432 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
|
2433 |
|
ecd24264898b
8005048: NMT: #loaded classes needs to just show the # defined classes
zgu
parents:
7180
diff
changeset
|
2434 assert(_total_instanceKlass_count >= 1, "Sanity check"); |
|
ecd24264898b
8005048: NMT: #loaded classes needs to just show the # defined classes
zgu
parents:
7180
diff
changeset
|
2435 Atomic::dec(&_total_instanceKlass_count); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2436 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2437 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2438 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
|
2439 if (array == NULL) { |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2440 _source_debug_extension = NULL; |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2441 } else { |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2442 // 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
|
2443 // 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
|
2444 // 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
|
2445 // unlikely to happen. |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2446 assert((length+1) > length, "Overflow checking"); |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2447 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
|
2448 for (int i = 0; i < length; i++) { |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2449 sde[i] = array[i]; |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2450 } |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2451 sde[length] = '\0'; |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2452 _source_debug_extension = sde; |
|
04ade88d9712
6294277: java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
fparain
parents:
6197
diff
changeset
|
2453 } |
| 0 | 2454 } |
| 2455 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2456 address InstanceKlass::static_field_addr(int offset) { |
|
12316
190899198332
7195622: CheckUnhandledOops has limited usefulness now
hseigel
parents:
12287
diff
changeset
|
2457 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
|
2458 } |
|
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2459 |
|
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2460 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2461 const char* InstanceKlass::signature_name() const { |
|
12995
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2462 int hash_len = 0; |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2463 char hash_buf[40]; |
|
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 // 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
|
2466 if (is_anonymous()) { |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2467 assert(EnableInvokeDynamic, "EnableInvokeDynamic was not set."); |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2468 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
|
2469 sprintf(hash_buf, "/" UINTX_FORMAT, (uintx)hash); |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2470 hash_len = (int)strlen(hash_buf); |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2471 } |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2472 |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2473 // Get the internal name as a c string |
| 0 | 2474 const char* src = (const char*) (name()->as_C_string()); |
| 2475 const int src_length = (int)strlen(src); | |
|
12995
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2476 |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2477 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
|
2478 |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2479 // Add L as type indicator |
| 0 | 2480 int dest_index = 0; |
| 2481 dest[dest_index++] = 'L'; | |
|
12995
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2482 |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2483 // Add the actual class name |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2484 for (int src_index = 0; src_index < src_length; ) { |
| 0 | 2485 dest[dest_index++] = src[src_index++]; |
| 2486 } | |
|
12995
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2487 |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2488 // If we have a hash, append it |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2489 for (int hash_index = 0; hash_index < hash_len; ) { |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2490 dest[dest_index++] = hash_buf[hash_index++]; |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2491 } |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2492 |
|
e64f1fe9756b
8024423: JVMTI: GetLoadedClasses doesn't enumerate anonymous classes
farvidsson
parents:
12946
diff
changeset
|
2493 // Add the semicolon and the NULL |
| 0 | 2494 dest[dest_index++] = ';'; |
| 2495 dest[dest_index] = '\0'; | |
| 2496 return dest; | |
| 2497 } | |
| 2498 | |
| 2499 // different verisons of is_same_class_package | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2500 bool InstanceKlass::is_same_class_package(Klass* class2) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2501 Klass* class1 = this; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2502 oop classloader1 = InstanceKlass::cast(class1)->class_loader(); |
| 6983 | 2503 Symbol* classname1 = class1->name(); |
| 2504 | |
| 2505 if (class2->oop_is_objArray()) { | |
|
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
2506 class2 = ObjArrayKlass::cast(class2)->bottom_klass(); |
| 0 | 2507 } |
| 2508 oop classloader2; | |
| 6983 | 2509 if (class2->oop_is_instance()) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2510 classloader2 = InstanceKlass::cast(class2)->class_loader(); |
| 0 | 2511 } else { |
| 6983 | 2512 assert(class2->oop_is_typeArray(), "should be type array"); |
| 0 | 2513 classloader2 = NULL; |
| 2514 } | |
| 6983 | 2515 Symbol* classname2 = class2->name(); |
| 0 | 2516 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2517 return InstanceKlass::is_same_class_package(classloader1, classname1, |
| 0 | 2518 classloader2, classname2); |
| 2519 } | |
| 2520 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2521 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
|
2522 Klass* class1 = this; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2523 oop classloader1 = InstanceKlass::cast(class1)->class_loader(); |
| 6983 | 2524 Symbol* classname1 = class1->name(); |
| 0 | 2525 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2526 return InstanceKlass::is_same_class_package(classloader1, classname1, |
| 0 | 2527 classloader2, classname2); |
| 2528 } | |
| 2529 | |
| 2530 // return true if two classes are in the same package, classloader | |
| 2531 // 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
|
2532 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
|
2533 oop class_loader2, Symbol* class_name2) { |
| 0 | 2534 if (class_loader1 != class_loader2) { |
| 2535 return false; | |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2536 } else if (class_name1 == class_name2) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2537 return true; // skip painful bytewise comparison |
| 0 | 2538 } else { |
| 2539 ResourceMark rm; | |
| 2540 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2541 // The Symbol*'s are in UTF8 encoding. Since we only need to check explicitly |
| 0 | 2542 // for ASCII characters ('/', 'L', '['), we can keep them in UTF8 encoding. |
| 2543 // 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
|
2544 const jbyte *name1 = class_name1->base(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2545 const jbyte *name2 = class_name2->base(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2546 |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
2547 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
|
2548 const jbyte *last_slash2 = UTF8::strrchr(name2, class_name2->utf8_length(), '/'); |
| 0 | 2549 |
| 2550 if ((last_slash1 == NULL) || (last_slash2 == NULL)) { | |
| 2551 // One of the two doesn't have a package. Only return true | |
| 2552 // if the other one also doesn't have a package. | |
| 2553 return last_slash1 == last_slash2; | |
| 2554 } else { | |
| 2555 // Skip over '['s | |
| 2556 if (*name1 == '[') { | |
| 2557 do { | |
| 2558 name1++; | |
| 2559 } while (*name1 == '['); | |
| 2560 if (*name1 != 'L') { | |
| 2561 // Something is terribly wrong. Shouldn't be here. | |
| 2562 return false; | |
| 2563 } | |
| 2564 } | |
| 2565 if (*name2 == '[') { | |
| 2566 do { | |
| 2567 name2++; | |
| 2568 } while (*name2 == '['); | |
| 2569 if (*name2 != 'L') { | |
| 2570 // Something is terribly wrong. Shouldn't be here. | |
| 2571 return false; | |
| 2572 } | |
| 2573 } | |
| 2574 | |
| 2575 // Check that package part is identical | |
| 2576 int length1 = last_slash1 - name1; | |
| 2577 int length2 = last_slash2 - name2; | |
| 2578 | |
| 2579 return UTF8::equal(name1, length1, name2, length2); | |
| 2580 } | |
| 2581 } | |
| 2582 } | |
| 2583 | |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2584 // 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
|
2585 // See JSL 3rd edition 8.4.6.1 |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2586 // Assumes name-signature match |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2587 // "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
|
2588 // 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
|
2589 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
|
2590 // Private methods can not be overridden |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2591 if (super_method->is_private()) { |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2592 return false; |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2593 } |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2594 // If super method is accessible, then override |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2595 if ((super_method->is_protected()) || |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2596 (super_method->is_public())) { |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2597 return true; |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2598 } |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2599 // Package-private methods are not inherited outside of package |
|
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2600 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
|
2601 return(is_same_class_package(targetclassloader(), targetclassname)); |
|
652
4aaa9f5e02a8
4766230: Hotspot vtable inconsistencies cause core dumps. 6579515. 6582242.
acorn
parents:
605
diff
changeset
|
2602 } |
| 0 | 2603 |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2604 /* 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
|
2605 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
|
2606 Symbol*& simple_name_result, TRAPS) { |
|
665
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 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2609 */ |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2610 |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2611 // 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
|
2612 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
|
2613 Klass* class2_oop, TRAPS) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2614 if (class2_oop == class1()) return true; |
| 6983 | 2615 if (!class2_oop->oop_is_instance()) return false; |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2616 instanceKlassHandle class2(THREAD, class2_oop); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2617 |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2618 // must be in same package before we try anything else |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2619 if (!class1->is_same_class_package(class2->class_loader(), class2->name())) |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2620 return false; |
|
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 // As long as there is an outer1.getEnclosingClass, |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2623 // shift the search outward. |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2624 instanceKlassHandle outer1 = class1; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2625 for (;;) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2626 // As we walk along, look for equalities between outer1 and class2. |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2627 // Eventually, the walks will terminate as outer1 stops |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2628 // 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
|
2629 bool ignore_inner_is_member; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2630 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
|
2631 CHECK_false); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2632 if (next == NULL) break; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2633 if (next == class2()) return true; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2634 outer1 = instanceKlassHandle(THREAD, next); |
|
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 |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2637 // Now do the same for class2. |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2638 instanceKlassHandle outer2 = class2; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2639 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
|
2640 bool ignore_inner_is_member; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2641 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
|
2642 CHECK_false); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2643 if (next == NULL) break; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2644 // Might as well check the new outer against all available values. |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2645 if (next == class1()) return true; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2646 if (next == outer1()) return true; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2647 outer2 = instanceKlassHandle(THREAD, next); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2648 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2649 |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2650 // 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
|
2651 // two classes, we know they are in separate package members. |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2652 return false; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2653 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2654 |
| 0 | 2655 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2656 jint InstanceKlass::compute_modifier_flags(TRAPS) const { |
| 0 | 2657 jint access = access_flags().as_int(); |
| 2658 | |
| 2659 // 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
|
2660 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
|
2661 InnerClassesIterator iter(ik); |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2662 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
|
2663 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
|
2664 // 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
|
2665 // 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
|
2666 if (ioff == 0) continue; |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2667 |
|
f7c4174b33ba
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
4739
diff
changeset
|
2668 // 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
|
2669 // 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
|
2670 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
|
2671 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
|
2672 // 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
|
2673 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
|
2674 break; |
| 0 | 2675 } |
| 2676 } | |
| 2677 // Remember to strip ACC_SUPER bit | |
| 2678 return (access & (~JVM_ACC_SUPER)) & JVM_ACC_WRITTEN_FLAGS; | |
| 2679 } | |
| 2680 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2681 jint InstanceKlass::jvmti_class_status() const { |
| 0 | 2682 jint result = 0; |
| 2683 | |
| 2684 if (is_linked()) { | |
| 2685 result |= JVMTI_CLASS_STATUS_VERIFIED | JVMTI_CLASS_STATUS_PREPARED; | |
| 2686 } | |
| 2687 | |
| 2688 if (is_initialized()) { | |
| 2689 assert(is_linked(), "Class status is not consistent"); | |
| 2690 result |= JVMTI_CLASS_STATUS_INITIALIZED; | |
| 2691 } | |
| 2692 if (is_in_error_state()) { | |
| 2693 result |= JVMTI_CLASS_STATUS_ERROR; | |
| 2694 } | |
| 2695 return result; | |
| 2696 } | |
| 2697 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2698 Method* InstanceKlass::method_at_itable(Klass* holder, int index, TRAPS) { |
| 0 | 2699 itableOffsetEntry* ioe = (itableOffsetEntry*)start_of_itable(); |
| 2700 int method_table_offset_in_words = ioe->offset()/wordSize; | |
| 2701 int nof_interfaces = (method_table_offset_in_words - itable_offset_in_words()) | |
| 2702 / itableOffsetEntry::size(); | |
| 2703 | |
| 2704 for (int cnt = 0 ; ; cnt ++, ioe ++) { | |
| 605 | 2705 // If the interface isn't implemented by the receiver class, |
| 0 | 2706 // the VM should throw IncompatibleClassChangeError. |
| 2707 if (cnt >= nof_interfaces) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2708 THROW_NULL(vmSymbols::java_lang_IncompatibleClassChangeError()); |
| 0 | 2709 } |
| 2710 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2711 Klass* ik = ioe->interface_klass(); |
| 0 | 2712 if (ik == holder) break; |
| 2713 } | |
| 2714 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2715 itableMethodEntry* ime = ioe->first_method_entry(this); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2716 Method* m = ime[index].method(); |
| 0 | 2717 if (m == NULL) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2718 THROW_NULL(vmSymbols::java_lang_AbstractMethodError()); |
| 0 | 2719 } |
| 2720 return m; | |
| 2721 } | |
| 2722 | |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2723 |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2724 #if INCLUDE_JVMTI |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2725 // update default_methods for redefineclasses for methods that are |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2726 // 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
|
2727 // redefinition |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2728 // 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
|
2729 void InstanceKlass::adjust_default_methods(Method** old_methods, Method** new_methods, |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2730 int methods_length, bool* trace_name_printed) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2731 // 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
|
2732 if (default_methods() != NULL) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2733 for (int j = 0; j < methods_length; j++) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2734 Method* old_method = old_methods[j]; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2735 Method* new_method = new_methods[j]; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2736 |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2737 for (int index = 0; index < default_methods()->length(); index ++) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2738 if (default_methods()->at(index) == old_method) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2739 default_methods()->at_put(index, new_method); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2740 if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2741 if (!(*trace_name_printed)) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2742 // RC_TRACE_MESG macro has an embedded ResourceMark |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2743 RC_TRACE_MESG(("adjust: klassname=%s default methods from name=%s", |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2744 external_name(), |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2745 old_method->method_holder()->external_name())); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2746 *trace_name_printed = true; |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2747 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2748 RC_TRACE(0x00100000, ("default method update: %s(%s) ", |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2749 new_method->name()->as_C_string(), |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2750 new_method->signature()->as_C_string())); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2751 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2752 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2753 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2754 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2755 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2756 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2757 #endif // INCLUDE_JVMTI |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2758 |
| 0 | 2759 // On-stack replacement stuff |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2760 void InstanceKlass::add_osr_nmethod(nmethod* n) { |
| 0 | 2761 // only one compilation can be active |
| 2762 NEEDS_CLEANUP | |
| 2763 // This is a short non-blocking critical region, so the no safepoint check is ok. | |
| 2764 OsrList_lock->lock_without_safepoint_check(); | |
| 2765 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
|
2766 n->set_osr_link(osr_nmethods_head()); |
| 0 | 2767 set_osr_nmethods_head(n); |
| 1783 | 2768 // Raise the highest osr level if necessary |
| 2769 if (TieredCompilation) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2770 Method* m = n->method(); |
| 1783 | 2771 m->set_highest_osr_comp_level(MAX2(m->highest_osr_comp_level(), n->comp_level())); |
| 2772 } | |
| 0 | 2773 // Remember to unlock again |
| 2774 OsrList_lock->unlock(); | |
| 1783 | 2775 |
| 2776 // Get rid of the osr methods for the same bci that have lower levels. | |
| 2777 if (TieredCompilation) { | |
| 2778 for (int l = CompLevel_limited_profile; l < n->comp_level(); l++) { | |
| 2779 nmethod *inv = lookup_osr_nmethod(n->method(), n->osr_entry_bci(), l, true); | |
| 2780 if (inv != NULL && inv->is_in_use()) { | |
| 2781 inv->make_not_entrant(); | |
| 2782 } | |
| 2783 } | |
| 2784 } | |
| 0 | 2785 } |
| 2786 | |
| 2787 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2788 void InstanceKlass::remove_osr_nmethod(nmethod* n) { |
| 0 | 2789 // This is a short non-blocking critical region, so the no safepoint check is ok. |
| 2790 OsrList_lock->lock_without_safepoint_check(); | |
| 2791 assert(n->is_osr_method(), "wrong kind of nmethod"); | |
| 2792 nmethod* last = NULL; | |
| 2793 nmethod* cur = osr_nmethods_head(); | |
| 1783 | 2794 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
|
2795 Method* m = n->method(); |
| 0 | 2796 // Search for match |
| 2797 while(cur != NULL && cur != n) { | |
| 14909 | 2798 if (TieredCompilation) { |
| 1783 | 2799 // Find max level before n |
| 2800 max_level = MAX2(max_level, cur->comp_level()); | |
| 2801 } | |
| 0 | 2802 last = cur; |
|
989
148e5441d916
6863023: need non-perm oops in code cache for JSR 292
jrose
parents:
876
diff
changeset
|
2803 cur = cur->osr_link(); |
| 0 | 2804 } |
| 1783 | 2805 nmethod* next = NULL; |
| 0 | 2806 if (cur == n) { |
| 1783 | 2807 next = cur->osr_link(); |
| 0 | 2808 if (last == NULL) { |
| 2809 // Remove first element | |
| 1783 | 2810 set_osr_nmethods_head(next); |
| 0 | 2811 } else { |
| 1783 | 2812 last->set_osr_link(next); |
| 0 | 2813 } |
| 2814 } | |
|
989
148e5441d916
6863023: need non-perm oops in code cache for JSR 292
jrose
parents:
876
diff
changeset
|
2815 n->set_osr_link(NULL); |
| 1783 | 2816 if (TieredCompilation) { |
| 2817 cur = next; | |
| 2818 while (cur != NULL) { | |
| 2819 // Find max level after n | |
| 14909 | 2820 max_level = MAX2(max_level, cur->comp_level()); |
| 1783 | 2821 cur = cur->osr_link(); |
| 2822 } | |
| 2823 m->set_highest_osr_comp_level(max_level); | |
| 2824 } | |
| 0 | 2825 // Remember to unlock again |
| 2826 OsrList_lock->unlock(); | |
| 2827 } | |
| 2828 | |
|
10265
92ef81e2f571
8003557: NPG: Klass* const k should be const Klass* k.
minqi
parents:
10152
diff
changeset
|
2829 nmethod* InstanceKlass::lookup_osr_nmethod(const Method* m, int bci, int comp_level, bool match_level) const { |
| 0 | 2830 // This is a short non-blocking critical region, so the no safepoint check is ok. |
| 2831 OsrList_lock->lock_without_safepoint_check(); | |
| 2832 nmethod* osr = osr_nmethods_head(); | |
| 1783 | 2833 nmethod* best = NULL; |
| 0 | 2834 while (osr != NULL) { |
| 2835 assert(osr->is_osr_method(), "wrong kind of nmethod found in chain"); | |
| 1783 | 2836 // There can be a time when a c1 osr method exists but we are waiting |
| 2837 // for a c2 version. When c2 completes its osr nmethod we will trash | |
| 2838 // the c1 version and only be able to find the c2 version. However | |
| 2839 // while we overflow in the c1 code at back branches we don't want to | |
| 2840 // try and switch to the same code as we are already running | |
| 2841 | |
| 0 | 2842 if (osr->method() == m && |
| 2843 (bci == InvocationEntryBci || osr->osr_entry_bci() == bci)) { | |
| 1783 | 2844 if (match_level) { |
| 2845 if (osr->comp_level() == comp_level) { | |
| 2846 // Found a match - return it. | |
| 2847 OsrList_lock->unlock(); | |
| 2848 return osr; | |
| 2849 } | |
| 2850 } else { | |
| 2851 if (best == NULL || (osr->comp_level() > best->comp_level())) { | |
| 2852 if (osr->comp_level() == CompLevel_highest_tier) { | |
| 2853 // Found the best possible - return it. | |
| 2854 OsrList_lock->unlock(); | |
| 2855 return osr; | |
| 2856 } | |
| 2857 best = osr; | |
| 2858 } | |
| 2859 } | |
| 0 | 2860 } |
|
989
148e5441d916
6863023: need non-perm oops in code cache for JSR 292
jrose
parents:
876
diff
changeset
|
2861 osr = osr->osr_link(); |
| 0 | 2862 } |
| 2863 OsrList_lock->unlock(); | |
| 1783 | 2864 if (best != NULL && best->comp_level() >= comp_level && match_level == false) { |
| 2865 return best; | |
| 2866 } | |
| 0 | 2867 return NULL; |
| 2868 } | |
| 2869 | |
|
10345
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2870 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
|
2871 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
|
2872 MutexLocker ml(MemberNameTable_lock); |
|
10345
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2873 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
|
2874 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
|
2875 |
|
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
9062
diff
changeset
|
2876 if (_member_names == NULL) { |
|
10345
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2877 _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
|
2878 } |
|
10345
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2879 _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
|
2880 } |
|
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2881 |
|
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2882 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
|
2883 MutexLocker ml(MemberNameTable_lock); |
|
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2884 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
|
2885 DEBUG_ONLY(No_Safepoint_Verifier nsv); |
|
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2886 |
|
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2887 if (_member_names == NULL) { |
|
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2888 return NULL; |
|
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2889 } |
|
b7fa10a3a69a
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
10343
diff
changeset
|
2890 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
|
2891 return mem_name; |
|
10133
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
9062
diff
changeset
|
2892 } |
|
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
9062
diff
changeset
|
2893 |
| 0 | 2894 // ----------------------------------------------------------------------------------------------------- |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2895 // Printing |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2896 |
| 0 | 2897 #ifndef PRODUCT |
| 2898 | |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2899 #define BULLET " - " |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
2900 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2901 static const char* state_names[] = { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2902 "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
|
2903 }; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2904 |
|
12264
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
2905 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
|
2906 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
|
2907 intptr_t e = start[i]; |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
2908 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
|
2909 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
|
2910 st->print(" "); |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
2911 ((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
|
2912 } |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
2913 st->cr(); |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
2914 } |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
2915 } |
|
b2e698d2276c
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
12067
diff
changeset
|
2916 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2917 void InstanceKlass::print_on(outputStream* st) const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2918 assert(is_klass(), "must be klass"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2919 Klass::print_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2920 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2921 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
|
2922 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
|
2923 st->print(BULLET"access: "); access_flags().print_on(st); st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2924 st->print(BULLET"state: "); st->print_cr(state_names[_init_state]); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2925 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
|
2926 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
|
2927 st->print(BULLET"sub: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2928 Klass* sub = subklass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2929 int n; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2930 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
|
2931 if (n < MaxSubklassPrintSize) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2932 sub->print_value_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2933 st->print(" "); |
|
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 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
|
2937 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2938 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2939 if (is_interface()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2940 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
|
2941 if (nof_implementors() == 1) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2942 st->print_cr(BULLET"implementor: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2943 st->print(" "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2944 implementor()->print_value_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2945 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2946 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2947 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2948 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2949 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
|
2950 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
|
2951 if (Verbose || WizardMode) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2952 Array<Method*>* method_array = methods(); |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2953 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
|
2954 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
|
2955 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2956 } |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2957 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
|
2958 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
|
2959 if (Verbose && default_methods() != NULL) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2960 Array<Method*>* method_array = default_methods(); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2961 for (int i = 0; i < method_array->length(); i++) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2962 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
|
2963 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2964 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2965 if (default_vtable_indices() != NULL) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
2966 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
|
2967 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2968 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
|
2969 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
|
2970 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
|
2971 if (class_loader_data() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2972 st->print(BULLET"class loader data: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2973 class_loader_data()->print_value_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2974 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2975 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2976 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
|
2977 if (source_file_name() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2978 st->print(BULLET"source file: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2979 source_file_name()->print_value_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2980 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2981 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2982 if (source_debug_extension() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2983 st->print(BULLET"source debug extension: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2984 st->print("%s", source_debug_extension()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2985 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2986 } |
| 8031 | 2987 st->print(BULLET"class annotations: "); class_annotations()->print_value_on(st); st->cr(); |
| 2988 st->print(BULLET"class type annotations: "); class_type_annotations()->print_value_on(st); st->cr(); | |
| 2989 st->print(BULLET"field annotations: "); fields_annotations()->print_value_on(st); st->cr(); | |
| 2990 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
|
2991 { |
|
12281
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
2992 bool have_pv = false; |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
2993 PreviousVersionWalker pvw(Thread::current(), (InstanceKlass*)this); |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
2994 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
|
2995 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
|
2996 if (!have_pv) |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
2997 st->print(BULLET"previous version: "); |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
2998 have_pv = true; |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
2999 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
|
3000 } |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3001 if (have_pv) st->cr(); |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3002 } // pvw is cleaned up |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3003 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3004 if (generic_signature() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3005 st->print(BULLET"generic signature: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3006 generic_signature()->print_value_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3007 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3008 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3009 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
|
3010 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
|
3011 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
|
3012 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
|
3013 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
|
3014 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
|
3015 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
|
3016 FieldPrinter print_static_field(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3017 ((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
|
3018 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
|
3019 FieldPrinter print_nonstatic_field(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3020 ((InstanceKlass*)this)->do_nonstatic_fields(&print_nonstatic_field); |
|
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 st->print(BULLET"non-static oop maps: "); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3023 OopMapBlock* map = start_of_nonstatic_oop_maps(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3024 OopMapBlock* end_map = map + nonstatic_oop_map_count(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3025 while (map < end_map) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3026 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
|
3027 map++; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3028 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3029 st->cr(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3030 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3031 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3032 #endif //PRODUCT |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3033 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3034 void InstanceKlass::print_value_on(outputStream* st) const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3035 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
|
3036 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
|
3037 name()->print_value_on(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3038 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3039 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3040 #ifndef PRODUCT |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3041 |
| 0 | 3042 void FieldPrinter::do_field(fieldDescriptor* fd) { |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3043 _st->print(BULLET); |
|
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
3044 if (_obj == NULL) { |
| 0 | 3045 fd->print_on(_st); |
| 3046 _st->cr(); | |
| 3047 } else { | |
| 3048 fd->print_on_for(_st, _obj); | |
| 3049 _st->cr(); | |
| 3050 } | |
| 3051 } | |
| 3052 | |
| 3053 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3054 void InstanceKlass::oop_print_on(oop obj, outputStream* st) { |
| 0 | 3055 Klass::oop_print_on(obj, st); |
| 3056 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3057 if (this == SystemDictionary::String_klass()) { |
| 0 | 3058 typeArrayOop value = java_lang_String::value(obj); |
| 3059 juint offset = java_lang_String::offset(obj); | |
|
13714
b270b954ba9a
Avoid segfault in InstanceKlass::oop_print_on's String special case when the value array is null.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
13451
diff
changeset
|
3060 if (value != NULL) { |
| 0 | 3061 juint length = java_lang_String::length(obj); |
|
13714
b270b954ba9a
Avoid segfault in InstanceKlass::oop_print_on's String special case when the value array is null.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
13451
diff
changeset
|
3062 if (value->is_typeArray() && |
| 0 | 3063 offset <= (juint) value->length() && |
| 3064 offset + length <= (juint) value->length()) { | |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3065 st->print(BULLET"string: "); |
| 14909 | 3066 Handle h_obj(obj); |
| 3067 java_lang_String::print(h_obj, st); | |
| 0 | 3068 st->cr(); |
| 3069 if (!WizardMode) return; // that is enough | |
| 3070 } | |
| 3071 } | |
|
13714
b270b954ba9a
Avoid segfault in InstanceKlass::oop_print_on's String special case when the value array is null.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
13451
diff
changeset
|
3072 } |
| 0 | 3073 |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3074 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
|
3075 FieldPrinter print_field(st, obj); |
|
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
3076 do_nonstatic_fields(&print_field); |
| 0 | 3077 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3078 if (this == SystemDictionary::Class_klass()) { |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3079 st->print(BULLET"signature: "); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3080 java_lang_Class::print_signature(obj, st); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3081 st->cr(); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3082 Klass* mirrored_klass = java_lang_Class::as_Klass(obj); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3083 st->print(BULLET"fake entry for mirror: "); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3084 mirrored_klass->print_value_on_maybe_null(st); |
| 0 | 3085 st->cr(); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3086 Klass* array_klass = java_lang_Class::array_klass(obj); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3087 st->print(BULLET"fake entry for array: "); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3088 array_klass->print_value_on_maybe_null(st); |
| 0 | 3089 st->cr(); |
|
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
3090 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
|
3091 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
|
3092 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
|
3093 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
|
3094 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
|
3095 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3096 } else if (this == SystemDictionary::MethodType_klass()) { |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
997
diff
changeset
|
3097 st->print(BULLET"signature: "); |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2334
diff
changeset
|
3098 java_lang_invoke_MethodType::print_signature(obj, st); |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
997
diff
changeset
|
3099 st->cr(); |
| 0 | 3100 } |
| 3101 } | |
| 3102 | |
|
1155
4e6abf09f540
6912062: disassembler plugin needs to produce symbolic information in product mode
jrose
parents:
1144
diff
changeset
|
3103 #endif //PRODUCT |
|
4e6abf09f540
6912062: disassembler plugin needs to produce symbolic information in product mode
jrose
parents:
1144
diff
changeset
|
3104 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3105 void InstanceKlass::oop_print_value_on(oop obj, outputStream* st) { |
| 0 | 3106 st->print("a "); |
| 3107 name()->print_value_on(st); | |
| 3108 obj->print_address_on(st); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3109 if (this == SystemDictionary::String_klass() |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3110 && java_lang_String::value(obj) != NULL) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3111 ResourceMark rm; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3112 int len = java_lang_String::length(obj); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3113 int plen = (len < 24 ? len : 12); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3114 char* str = java_lang_String::as_utf8_string(obj, 0, plen); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3115 st->print(" = \"%s\"", str); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3116 if (len > plen) |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3117 st->print("...[%d]", len); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3118 } else if (this == SystemDictionary::Class_klass()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3119 Klass* k = java_lang_Class::as_Klass(obj); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3120 st->print(" = "); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3121 if (k != NULL) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3122 k->print_value_on(st); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3123 } else { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3124 const char* tname = type2name(java_lang_Class::primitive_type(obj)); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3125 st->print("%s", tname ? tname : "type?"); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3126 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3127 } else if (this == SystemDictionary::MethodType_klass()) { |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
997
diff
changeset
|
3128 st->print(" = "); |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2334
diff
changeset
|
3129 java_lang_invoke_MethodType::print_signature(obj, st); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3130 } else if (java_lang_boxing_object::is_instance(obj)) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3131 st->print(" = "); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3132 java_lang_boxing_object::print(obj, st); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3133 } 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
|
3134 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
|
3135 if (vmentry != NULL) { |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3136 st->print(" => "); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3137 vmentry->print_value_on(st); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3138 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3139 } else if (this == SystemDictionary::MemberName_klass()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3140 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
|
3141 if (vmtarget != NULL) { |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3142 st->print(" = "); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3143 vmtarget->print_value_on(st); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3144 } else { |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3145 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
|
3146 st->print("."); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6203
diff
changeset
|
3147 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
|
3148 } |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
3149 } |
| 0 | 3150 } |
| 3151 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3152 const char* InstanceKlass::internal_name() const { |
| 0 | 3153 return external_name(); |
| 3154 } | |
| 3155 | |
| 7956 | 3156 #if INCLUDE_SERVICES |
| 3157 // Size Statistics | |
| 3158 void InstanceKlass::collect_statistics(KlassSizeStats *sz) const { | |
| 3159 Klass::collect_statistics(sz); | |
| 3160 | |
| 3161 sz->_inst_size = HeapWordSize * size_helper(); | |
| 3162 sz->_vtab_bytes = HeapWordSize * align_object_offset(vtable_length()); | |
| 3163 sz->_itab_bytes = HeapWordSize * align_object_offset(itable_length()); | |
| 3164 sz->_nonstatic_oopmap_bytes = HeapWordSize * | |
| 3165 ((is_interface() || is_anonymous()) ? | |
| 3166 align_object_offset(nonstatic_oop_map_size()) : | |
| 3167 nonstatic_oop_map_size()); | |
| 3168 | |
| 3169 int n = 0; | |
| 3170 n += (sz->_methods_array_bytes = sz->count_array(methods())); | |
| 3171 n += (sz->_method_ordering_bytes = sz->count_array(method_ordering())); | |
| 3172 n += (sz->_local_interfaces_bytes = sz->count_array(local_interfaces())); | |
| 3173 n += (sz->_transitive_interfaces_bytes = sz->count_array(transitive_interfaces())); | |
| 3174 n += (sz->_fields_bytes = sz->count_array(fields())); | |
| 3175 n += (sz->_inner_classes_bytes = sz->count_array(inner_classes())); | |
| 3176 sz->_ro_bytes += n; | |
| 3177 | |
| 3178 const ConstantPool* cp = constants(); | |
| 3179 if (cp) { | |
| 3180 cp->collect_statistics(sz); | |
| 3181 } | |
| 3182 | |
| 3183 const Annotations* anno = annotations(); | |
| 3184 if (anno) { | |
| 3185 anno->collect_statistics(sz); | |
| 3186 } | |
| 3187 | |
| 3188 const Array<Method*>* methods_array = methods(); | |
| 3189 if (methods()) { | |
| 3190 for (int i = 0; i < methods_array->length(); i++) { | |
| 3191 Method* method = methods_array->at(i); | |
| 3192 if (method) { | |
| 3193 sz->_method_count ++; | |
| 3194 method->collect_statistics(sz); | |
| 3195 } | |
| 3196 } | |
| 3197 } | |
| 3198 } | |
| 3199 #endif // INCLUDE_SERVICES | |
| 3200 | |
| 0 | 3201 // Verification |
| 3202 | |
| 3203 class VerifyFieldClosure: public OopClosure { | |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3204 protected: |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3205 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
|
3206 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
|
3207 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
|
3208 tty->print_cr("Failed: " PTR_FORMAT " -> " PTR_FORMAT, p, (address)obj); |
| 0 | 3209 Universe::print(); |
| 3210 guarantee(false, "boom"); | |
| 3211 } | |
| 3212 } | |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3213 public: |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3214 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
|
3215 virtual void do_oop(narrowOop* p) { VerifyFieldClosure::do_oop_work(p); } |
| 0 | 3216 }; |
| 3217 | |
| 14909 | 3218 void InstanceKlass::verify_on(outputStream* st, bool check_dictionary) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3219 #ifndef PRODUCT |
| 11034 | 3220 // 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
|
3221 if (_verify_count == Universe::verify_count()) return; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3222 _verify_count = Universe::verify_count(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3223 #endif |
| 11034 | 3224 |
| 3225 // Verify Klass | |
| 14909 | 3226 Klass::verify_on(st, check_dictionary); |
| 3227 | |
| 3228 // Verify that klass is present in SystemDictionary if not already | |
| 3229 // verifying the SystemDictionary. | |
| 3230 if (is_loaded() && !is_anonymous() && check_dictionary) { | |
| 3231 Symbol* h_name = name(); | |
| 3232 SystemDictionary::verify_obj_klass_present(h_name, class_loader_data()); | |
| 3233 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3234 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3235 // Verify vtables |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3236 if (is_linked()) { |
| 11034 | 3237 ResourceMark rm; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3238 // $$$ 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
|
3239 // always seemed a valid generalization. (DLD -- 6/00) |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3240 vtable()->verify(st); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3241 } |
|
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 // Verify first subklass |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3244 if (subklass_oop() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3245 guarantee(subklass_oop()->is_klass(), "should be klass"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3246 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3247 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3248 // Verify siblings |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3249 Klass* super = this->super(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3250 Klass* sib = next_sibling(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3251 if (sib != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3252 if (sib == this) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3253 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
|
3254 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3255 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3256 guarantee(sib->is_klass(), "should be klass"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3257 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
|
3258 } |
|
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 // Verify implementor fields |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3261 Klass* im = implementor(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3262 if (im != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3263 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
|
3264 guarantee(im->is_klass(), "should be klass"); |
| 6983 | 3265 guarantee(!im->is_interface() || im == this, |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3266 "implementors cannot be interfaces"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3267 } |
|
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 // Verify local interfaces |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3270 if (local_interfaces()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3271 Array<Klass*>* local_interfaces = this->local_interfaces(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3272 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
|
3273 Klass* e = local_interfaces->at(j); |
| 6983 | 3274 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
|
3275 } |
|
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 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3278 // Verify transitive interfaces |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3279 if (transitive_interfaces() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3280 Array<Klass*>* transitive_interfaces = this->transitive_interfaces(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3281 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
|
3282 Klass* e = transitive_interfaces->at(j); |
| 6983 | 3283 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
|
3284 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3285 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3286 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3287 // Verify methods |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3288 if (methods() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3289 Array<Method*>* methods = this->methods(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3290 for (int j = 0; j < methods->length(); j++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3291 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
|
3292 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3293 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
|
3294 Method* m1 = methods->at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3295 Method* m2 = methods->at(j + 1); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3296 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
|
3297 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3298 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3299 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3300 // Verify method ordering |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3301 if (method_ordering() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3302 Array<int>* method_ordering = this->method_ordering(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3303 int length = method_ordering->length(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3304 if (JvmtiExport::can_maintain_original_method_order() || |
|
9057
8554c55669b0
8010943: guarantee(length == 0) failed: invalid method ordering length
hseigel
parents:
8719
diff
changeset
|
3305 ((UseSharedSpaces || DumpSharedSpaces) && length != 0)) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3306 guarantee(length == methods()->length(), "invalid method ordering length"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3307 jlong sum = 0; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3308 for (int j = 0; j < length; j++) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3309 int original_index = method_ordering->at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3310 guarantee(original_index >= 0, "invalid method ordering index"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3311 guarantee(original_index < length, "invalid method ordering index"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3312 sum += original_index; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3313 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3314 // Verify sum of indices 0,1,...,length-1 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3315 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
|
3316 } else { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3317 guarantee(length == 0, "invalid method ordering length"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3318 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3319 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3320 |
|
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3321 // Verify default methods |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3322 if (default_methods() != NULL) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3323 Array<Method*>* methods = this->default_methods(); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3324 for (int j = 0; j < methods->length(); j++) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3325 guarantee(methods->at(j)->is_method(), "non-method in methods array"); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3326 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3327 for (int j = 0; j < methods->length() - 1; j++) { |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3328 Method* m1 = methods->at(j); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3329 Method* m2 = methods->at(j + 1); |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3330 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
|
3331 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3332 } |
|
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
12811
diff
changeset
|
3333 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3334 // Verify JNI static field identifiers |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3335 if (jni_ids() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3336 jni_ids()->verify(this); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3337 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3338 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3339 // Verify other fields |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3340 if (array_klasses() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3341 guarantee(array_klasses()->is_klass(), "should be klass"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3342 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3343 if (constants() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3344 guarantee(constants()->is_constantPool(), "should be constant pool"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3345 } |
|
8693
872b3feace55
8008750: [partfait] Null pointer deference in hotspot/src/share/vm/oops/instanceKlass.hpp
morris
parents:
8031
diff
changeset
|
3346 const Klass* host = host_klass(); |
|
872b3feace55
8008750: [partfait] Null pointer deference in hotspot/src/share/vm/oops/instanceKlass.hpp
morris
parents:
8031
diff
changeset
|
3347 if (host != NULL) { |
|
872b3feace55
8008750: [partfait] Null pointer deference in hotspot/src/share/vm/oops/instanceKlass.hpp
morris
parents:
8031
diff
changeset
|
3348 guarantee(host->is_klass(), "should be klass"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3349 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3350 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3351 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3352 void InstanceKlass::oop_verify_on(oop obj, outputStream* st) { |
| 0 | 3353 Klass::oop_verify_on(obj, st); |
| 3354 VerifyFieldClosure blk; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3355 obj->oop_iterate_no_header(&blk); |
| 0 | 3356 } |
| 3357 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3358 |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3359 // JNIid class for jfieldIDs only |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3360 // Note to reviewers: |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3361 // 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
|
3362 // in the compressed oops workspace. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3363 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
|
3364 _holder = holder; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3365 _offset = offset; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3366 _next = next; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3367 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
|
3368 } |
| 0 | 3369 |
| 3370 | |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3371 JNIid* JNIid::find(int offset) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3372 JNIid* current = this; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3373 while (current != NULL) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3374 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
|
3375 current = current->next(); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3376 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3377 return NULL; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3378 } |
| 0 | 3379 |
| 3380 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
|
3381 while (current != NULL) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3382 JNIid* next = current->next(); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3383 delete current; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3384 current = next; |
|
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 } |
| 0 | 3387 |
| 3388 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3389 void JNIid::verify(Klass* holder) { |
|
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6733
diff
changeset
|
3390 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
|
3391 int end_field_offset; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3392 end_field_offset = first_field_offset + (InstanceKlass::cast(holder)->static_field_size() * wordSize); |
| 0 | 3393 |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3394 JNIid* current = this; |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3395 while (current != NULL) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3396 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
|
3397 #ifdef ASSERT |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3398 int o = current->offset(); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3399 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
|
3400 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
|
3401 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3402 #endif |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3403 current = current->next(); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3404 } |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3405 } |
| 0 | 3406 |
| 3407 | |
| 3408 #ifdef ASSERT | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3409 void InstanceKlass::set_init_state(ClassState state) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3410 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
|
3411 : (_init_state < state); |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3412 assert(good_state || state == allocated, "illegal state transition"); |
|
4739
52b5d32fbfaf
7117052: instanceKlass::_init_state can be u1 type
coleenp
parents:
4006
diff
changeset
|
3413 _init_state = (u1)state; |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
52
diff
changeset
|
3414 } |
| 0 | 3415 #endif |
| 3416 | |
| 3417 | |
| 3418 // RedefineClasses() support for previous versions: | |
| 3419 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3420 // Purge previous versions |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3421 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
|
3422 if (ik->previous_versions() != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3423 // 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
|
3424 // while it is safe to do so. |
|
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 int deleted_count = 0; // leave debugging breadcrumbs |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3427 int live_count = 0; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3428 ClassLoaderData* loader_data = ik->class_loader_data() == NULL ? |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3429 ClassLoaderData::the_null_class_loader_data() : |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3430 ik->class_loader_data(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3431 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3432 // RC_TRACE macro has an embedded ResourceMark |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3433 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
|
3434 ik->external_name(), ik->previous_versions()->length())); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3435 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3436 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
|
3437 // check the previous versions array |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3438 PreviousVersionNode * pv_node = ik->previous_versions()->at(i); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3439 ConstantPool* cp_ref = pv_node->prev_constant_pool(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3440 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
|
3441 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3442 ConstantPool* pvcp = cp_ref; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3443 if (!pvcp->on_stack()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3444 // 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
|
3445 // 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
|
3446 // and this previous version node. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3447 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
|
3448 if (method_refs != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3449 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
|
3450 Method* method = method_refs->at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3451 assert(method != NULL, "method ref was unexpectedly cleared"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3452 method_refs->remove_at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3453 // method will be freed with associated class. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3454 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3455 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3456 // Remove the constant pool |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3457 delete pv_node; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3458 // 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
|
3459 // do anything special with the index. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3460 ik->previous_versions()->remove_at(i); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3461 deleted_count++; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3462 continue; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3463 } else { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3464 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
|
3465 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
|
3466 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
|
3467 live_count++; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3468 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3469 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3470 // 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
|
3471 // the others or mark them as obsolete. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3472 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
|
3473 if (method_refs != NULL) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3474 RC_TRACE(0x00000200, ("purge: previous methods length=%d", |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3475 method_refs->length())); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3476 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
|
3477 Method* method = method_refs->at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3478 assert(method != NULL, "method ref was unexpectedly cleared"); |
|
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 // 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
|
3481 // 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
|
3482 // 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
|
3483 if (!method->on_stack()) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3484 method_refs->remove_at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3485 } else if (emcp_method_count == 0) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3486 method->set_is_obsolete(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3487 } else { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3488 // RC_TRACE macro has an embedded ResourceMark |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3489 RC_TRACE(0x00000200, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3490 ("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
|
3491 method->name()->as_C_string(), |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3492 method->signature()->as_C_string(), j, i)); |
|
14860
8762b6b8fbb6
fix scanning of method data for redefined methods
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
14518
diff
changeset
|
3493 if (method->method_data() != NULL) { |
|
8762b6b8fbb6
fix scanning of method data for redefined methods
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
14518
diff
changeset
|
3494 // Clean out any weak method links |
|
8762b6b8fbb6
fix scanning of method data for redefined methods
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
14518
diff
changeset
|
3495 method->method_data()->clean_weak_method_links(); |
|
8762b6b8fbb6
fix scanning of method data for redefined methods
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
14518
diff
changeset
|
3496 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3497 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3498 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3499 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3500 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3501 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
|
3502 RC_TRACE(0x00000200, |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3503 ("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
|
3504 deleted_count)); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3505 } |
|
14860
8762b6b8fbb6
fix scanning of method data for redefined methods
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
14518
diff
changeset
|
3506 |
|
8762b6b8fbb6
fix scanning of method data for redefined methods
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
14518
diff
changeset
|
3507 Array<Method*>* methods = ik->methods(); |
|
8762b6b8fbb6
fix scanning of method data for redefined methods
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
14518
diff
changeset
|
3508 int num_methods = methods->length(); |
|
8762b6b8fbb6
fix scanning of method data for redefined methods
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
14518
diff
changeset
|
3509 for (int index2 = 0; index2 < num_methods; ++index2) { |
|
8762b6b8fbb6
fix scanning of method data for redefined methods
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
14518
diff
changeset
|
3510 if (methods->at(index2)->method_data() != NULL) { |
|
8762b6b8fbb6
fix scanning of method data for redefined methods
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
14518
diff
changeset
|
3511 methods->at(index2)->method_data()->clean_weak_method_links(); |
|
8762b6b8fbb6
fix scanning of method data for redefined methods
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
14518
diff
changeset
|
3512 } |
|
8762b6b8fbb6
fix scanning of method data for redefined methods
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
14518
diff
changeset
|
3513 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3514 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3515 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3516 // External interface for use during class unloading. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3517 void InstanceKlass::purge_previous_versions(InstanceKlass* ik) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3518 // 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
|
3519 purge_previous_versions_internal(ik, 1); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3520 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3521 |
|
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 // Potentially add an information node that contains pointers to the |
| 0 | 3524 // 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
|
3525 // 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
|
3526 // 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
|
3527 // 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
|
3528 // 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
|
3529 // |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3530 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
|
3531 BitMap* emcp_methods, int emcp_method_count) { |
| 0 | 3532 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
|
3533 "only VMThread can add previous versions"); |
| 0 | 3534 |
| 3535 if (_previous_versions == NULL) { | |
| 3536 // This is the first previous version so make some space. | |
| 3537 // Start with 2 elements under the assumption that the class | |
| 3538 // won't be redefined much. | |
| 6197 | 3539 _previous_versions = new (ResourceObj::C_HEAP, mtClass) |
| 0 | 3540 GrowableArray<PreviousVersionNode *>(2, true); |
| 3541 } | |
| 3542 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3543 ConstantPool* cp_ref = ikh->constants(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3544 |
| 0 | 3545 // RC_TRACE macro has an embedded ResourceMark |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3546 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
|
3547 "on_stack=%d", |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3548 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
|
3549 cp_ref->on_stack())); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3550 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3551 // 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
|
3552 // 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
|
3553 // 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
|
3554 // 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
|
3555 // 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
|
3556 Array<Method*>* old_methods = ikh->methods(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3557 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3558 if (cp_ref->on_stack()) { |
|
12281
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3559 PreviousVersionNode * pv_node = NULL; |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3560 if (emcp_method_count == 0) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3561 // 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
|
3562 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
|
3563 RC_TRACE(0x00000400, |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3564 ("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
|
3565 } else { |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3566 int local_count = 0; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3567 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
|
3568 GrowableArray<Method*>(emcp_method_count, true); |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3569 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
|
3570 if (emcp_methods->at(i)) { |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3571 // 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
|
3572 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
|
3573 if (old_method->on_stack()) { |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3574 method_refs->append(old_method); |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3575 } |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3576 if (++local_count >= emcp_method_count) { |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3577 // 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
|
3578 break; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3579 } |
| 0 | 3580 } |
| 3581 } | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3582 // 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
|
3583 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
|
3584 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3585 // append new previous version. |
|
12281
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3586 _previous_versions->append(pv_node); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3587 } |
|
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 // 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
|
3590 // is a good time to clear out unused references. |
| 0 | 3591 |
| 3592 RC_TRACE(0x00000400, ("add: previous version length=%d", | |
| 3593 _previous_versions->length())); | |
| 3594 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3595 // Purge previous versions not executing on the stack |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3596 purge_previous_versions_internal(this, emcp_method_count); |
| 0 | 3597 |
| 3598 int obsolete_method_count = old_methods->length() - emcp_method_count; | |
| 3599 | |
| 3600 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
|
3601 _previous_versions->length() > 0) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3602 // We have a mix of obsolete and EMCP methods so we have to |
| 0 | 3603 // clear out any matching EMCP method entries the hard way. |
| 3604 int local_count = 0; | |
| 3605 for (int i = 0; i < old_methods->length(); i++) { | |
| 3606 if (!emcp_methods->at(i)) { | |
| 3607 // only obsolete methods are interesting | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3608 Method* old_method = old_methods->at(i); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
3609 Symbol* m_name = old_method->name(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
3610 Symbol* m_signature = old_method->signature(); |
| 0 | 3611 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3612 // we might not have added the last entry |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3613 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
|
3614 // 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
|
3615 PreviousVersionNode * pv_node = _previous_versions->at(j); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3616 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3617 GrowableArray<Method*>* method_refs = pv_node->prev_EMCP_methods(); |
| 0 | 3618 if (method_refs == NULL) { |
| 3619 // We have run into a PreviousVersion generation where | |
| 3620 // all methods were made obsolete during that generation's | |
| 3621 // RedefineClasses() operation. At the time of that | |
| 3622 // operation, all EMCP methods were flushed so we don't | |
| 3623 // have to go back any further. | |
| 3624 // | |
| 3625 // A NULL method_refs is different than an empty method_refs. | |
| 3626 // We cannot infer any optimizations about older generations | |
| 3627 // from an empty method_refs for the current generation. | |
| 3628 break; | |
| 3629 } | |
| 3630 | |
| 3631 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
|
3632 Method* method = method_refs->at(k); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3633 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3634 if (!method->is_obsolete() && |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3635 method->name() == m_name && |
| 0 | 3636 method->signature() == m_signature) { |
| 3637 // The current RedefineClasses() call has made all EMCP | |
| 3638 // 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
|
3639 // and remove the reference. |
| 0 | 3640 RC_TRACE(0x00000400, |
| 3641 ("add: %s(%s): flush obsolete method @%d in version @%d", | |
| 3642 m_name->as_C_string(), m_signature->as_C_string(), k, j)); | |
| 3643 | |
| 3644 method->set_is_obsolete(); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3645 // 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
|
3646 // clean up later. |
| 0 | 3647 break; |
| 3648 } | |
| 3649 } | |
| 3650 | |
| 3651 // The previous loop may not find a matching EMCP method, but | |
| 3652 // that doesn't mean that we can optimize and not go any | |
| 3653 // 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
|
3654 // method for this generation could have already been deleted, |
| 0 | 3655 // 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
|
3656 // been deleted. |
| 0 | 3657 } |
| 3658 | |
| 3659 if (++local_count >= obsolete_method_count) { | |
| 3660 // no more obsolete methods so bail out now | |
| 3661 break; | |
| 3662 } | |
| 3663 } | |
| 3664 } | |
| 3665 } | |
| 3666 } // end add_previous_version() | |
| 3667 | |
| 3668 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3669 // Determine if InstanceKlass has a previous version. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3670 bool InstanceKlass::has_previous_version() const { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3671 return (_previous_versions != NULL && _previous_versions->length() > 0); |
| 0 | 3672 } // end has_previous_version() |
| 3673 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3674 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3675 Method* InstanceKlass::method_with_idnum(int idnum) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3676 Method* m = NULL; |
| 0 | 3677 if (idnum < methods()->length()) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3678 m = methods()->at(idnum); |
| 0 | 3679 } |
| 3680 if (m == NULL || m->method_idnum() != idnum) { | |
| 3681 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
|
3682 m = methods()->at(index); |
| 0 | 3683 if (m->method_idnum() == idnum) { |
| 3684 return m; | |
| 3685 } | |
| 3686 } | |
|
12281
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3687 // 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
|
3688 return NULL; |
| 0 | 3689 } |
| 3690 return m; | |
| 3691 } | |
| 3692 | |
|
11148
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
3693 jint InstanceKlass::get_cached_class_file_len() { |
|
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
3694 return VM_RedefineClasses::get_cached_class_file_len(_cached_class_file); |
|
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
3695 } |
|
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
3696 |
|
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
3697 unsigned char * InstanceKlass::get_cached_class_file_bytes() { |
|
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
3698 return VM_RedefineClasses::get_cached_class_file_bytes(_cached_class_file); |
|
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
3699 } |
|
825e6cb66923
8020309: Eliminate InstanceKlass::_cached_class_file_len.
jiangli
parents:
11096
diff
changeset
|
3700 |
| 0 | 3701 |
| 3702 // 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
|
3703 // the InstanceKlass. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3704 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
|
3705 GrowableArray<Method*>* prev_EMCP_methods) { |
| 0 | 3706 |
| 3707 _prev_constant_pool = prev_constant_pool; | |
| 3708 _prev_EMCP_methods = prev_EMCP_methods; | |
| 3709 } | |
| 3710 | |
| 3711 | |
| 3712 // Destroy a PreviousVersionNode | |
| 3713 PreviousVersionNode::~PreviousVersionNode() { | |
| 3714 if (_prev_constant_pool != NULL) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
3715 _prev_constant_pool = NULL; |
| 0 | 3716 } |
| 3717 | |
| 3718 if (_prev_EMCP_methods != NULL) { | |
| 3719 delete _prev_EMCP_methods; | |
| 3720 } | |
| 3721 } | |
| 3722 | |
| 3723 // 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
|
3724 PreviousVersionWalker::PreviousVersionWalker(Thread* thread, InstanceKlass *ik) { |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3725 _thread = thread; |
| 0 | 3726 _previous_versions = ik->previous_versions(); |
| 3727 _current_index = 0; | |
| 3728 _current_p = NULL; | |
|
12281
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3729 _current_constant_pool_handle = constantPoolHandle(thread, ik->constants()); |
| 0 | 3730 } |
| 3731 | |
| 3732 | |
| 3733 // Return the interesting information for the next previous version | |
| 3734 // 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
|
3735 PreviousVersionNode* PreviousVersionWalker::next_previous_version() { |
| 0 | 3736 if (_previous_versions == NULL) { |
| 3737 // no previous versions so nothing to return | |
| 3738 return NULL; | |
| 3739 } | |
| 3740 | |
|
12281
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3741 _current_p = NULL; // reset to NULL |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3742 _current_constant_pool_handle = NULL; |
| 0 | 3743 |
| 3744 int length = _previous_versions->length(); | |
| 3745 | |
| 3746 while (_current_index < length) { | |
| 3747 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
|
3748 |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3749 // 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
|
3750 // 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
|
3751 _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
|
3752 _current_p = pv_node; |
|
4f9a42c33738
8022887: Assertion hit while using class and redefining it with RedefineClasses simultaneously
coleenp
parents:
12067
diff
changeset
|
3753 return pv_node; |
| 0 | 3754 } |
| 3755 | |
| 3756 return NULL; | |
| 3757 } // end next_previous_version() |