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