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