Mercurial > hg > graal-jvmci-8
annotate src/share/vm/classfile/systemDictionary.cpp @ 10154:d1644a010f52
8007154: Remove support for u4 MethodParameter flags fields
Summary: Remove support for parsing class files with four-byte flags fields in MethodParameters attributes
Reviewed-by: jrose, coleenp
author | emc |
---|---|
date | Fri, 26 Apr 2013 07:34:02 -0400 |
parents | 68fe50d4f1d5 |
children | 89e4d67fdd2a 800078be49d2 |
rev | line source |
---|---|
0 | 1 /* |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | |
5 * This code is free software; you can redistribute it and/or modify it | |
6 * under the terms of the GNU General Public License version 2 only, as | |
7 * published by the Free Software Foundation. | |
8 * | |
9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
12 * version 2 for more details (a copy is included in the LICENSE file that | |
13 * accompanied this code). | |
14 * | |
15 * You should have received a copy of the GNU General Public License version | |
16 * 2 along with this work; if not, write to the Free Software Foundation, | |
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
18 * | |
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1508
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1508
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:
1508
diff
changeset
|
21 * questions. |
0 | 22 * |
23 */ | |
24 | |
1972 | 25 #include "precompiled.hpp" |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
26 #include "classfile/classLoaderData.inline.hpp" |
1972 | 27 #include "classfile/dictionary.hpp" |
28 #include "classfile/javaClasses.hpp" | |
29 #include "classfile/loaderConstraints.hpp" | |
30 #include "classfile/placeholders.hpp" | |
31 #include "classfile/resolutionErrors.hpp" | |
32 #include "classfile/systemDictionary.hpp" | |
33 #include "classfile/vmSymbols.hpp" | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
34 #include "compiler/compileBroker.hpp" |
1972 | 35 #include "interpreter/bytecodeStream.hpp" |
36 #include "interpreter/interpreter.hpp" | |
37 #include "memory/gcLocker.hpp" | |
38 #include "memory/oopFactory.hpp" | |
39 #include "oops/instanceKlass.hpp" | |
40 #include "oops/instanceRefKlass.hpp" | |
41 #include "oops/klass.inline.hpp" | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
42 #include "oops/methodData.hpp" |
1972 | 43 #include "oops/objArrayKlass.hpp" |
44 #include "oops/oop.inline.hpp" | |
45 #include "oops/oop.inline2.hpp" | |
46 #include "oops/typeArrayKlass.hpp" | |
47 #include "prims/jvmtiEnvBase.hpp" | |
48 #include "prims/methodHandles.hpp" | |
49 #include "runtime/biasedLocking.hpp" | |
50 #include "runtime/fieldType.hpp" | |
51 #include "runtime/handles.inline.hpp" | |
52 #include "runtime/java.hpp" | |
53 #include "runtime/javaCalls.hpp" | |
54 #include "runtime/mutexLocker.hpp" | |
55 #include "runtime/signature.hpp" | |
56 #include "services/classLoadingService.hpp" | |
57 #include "services/threadService.hpp" | |
0 | 58 |
59 | |
1903 | 60 Dictionary* SystemDictionary::_dictionary = NULL; |
61 PlaceholderTable* SystemDictionary::_placeholders = NULL; | |
62 Dictionary* SystemDictionary::_shared_dictionary = NULL; | |
63 LoaderConstraintTable* SystemDictionary::_loader_constraints = NULL; | |
64 ResolutionErrorTable* SystemDictionary::_resolution_errors = NULL; | |
65 SymbolPropertyTable* SystemDictionary::_invoke_method_table = NULL; | |
0 | 66 |
67 | |
68 int SystemDictionary::_number_of_modifications = 0; | |
4864
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
69 int SystemDictionary::_sdgeneration = 0; |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
70 const int SystemDictionary::_primelist[_prime_array_size] = {1009,2017,4049,5051,10103, |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
71 20201,40423,99991}; |
0 | 72 |
73 oop SystemDictionary::_system_loader_lock_obj = NULL; | |
74 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
75 Klass* SystemDictionary::_well_known_klasses[SystemDictionary::WKID_LIMIT] |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
76 = { NULL /*, NULL...*/ }; |
0 | 77 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
78 Klass* SystemDictionary::_box_klasses[T_VOID+1] = { NULL /*, NULL...*/ }; |
0 | 79 |
80 oop SystemDictionary::_java_system_loader = NULL; | |
81 | |
82 bool SystemDictionary::_has_loadClassInternal = false; | |
83 bool SystemDictionary::_has_checkPackageAccess = false; | |
84 | |
85 // lazily initialized klass variables | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
86 Klass* volatile SystemDictionary::_abstract_ownable_synchronizer_klass = NULL; |
0 | 87 |
88 | |
89 // ---------------------------------------------------------------------------- | |
90 // Java-level SystemLoader | |
91 | |
92 oop SystemDictionary::java_system_loader() { | |
93 return _java_system_loader; | |
94 } | |
95 | |
96 void SystemDictionary::compute_java_system_loader(TRAPS) { | |
1142 | 97 KlassHandle system_klass(THREAD, WK_KLASS(ClassLoader_klass)); |
0 | 98 JavaValue result(T_OBJECT); |
99 JavaCalls::call_static(&result, | |
1142 | 100 KlassHandle(THREAD, WK_KLASS(ClassLoader_klass)), |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
101 vmSymbols::getSystemClassLoader_name(), |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
102 vmSymbols::void_classloader_signature(), |
0 | 103 CHECK); |
104 | |
105 _java_system_loader = (oop)result.get_jobject(); | |
106 } | |
107 | |
108 | |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
109 ClassLoaderData* SystemDictionary::register_loader(Handle class_loader, TRAPS) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
110 if (class_loader() == NULL) return ClassLoaderData::the_null_class_loader_data(); |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
111 return ClassLoaderDataGraph::find_or_create(class_loader, CHECK_NULL); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
112 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
113 |
0 | 114 // ---------------------------------------------------------------------------- |
115 // debugging | |
116 | |
117 #ifdef ASSERT | |
118 | |
119 // return true if class_name contains no '.' (internal format is '/') | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
120 bool SystemDictionary::is_internal_format(Symbol* class_name) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
121 if (class_name != NULL) { |
0 | 122 ResourceMark rm; |
123 char* name = class_name->as_C_string(); | |
124 return strchr(name, '.') == NULL; | |
125 } else { | |
126 return true; | |
127 } | |
128 } | |
129 | |
130 #endif | |
131 | |
132 // ---------------------------------------------------------------------------- | |
514 | 133 // Parallel class loading check |
134 | |
135 bool SystemDictionary::is_parallelCapable(Handle class_loader) { | |
136 if (UnsyncloadClass || class_loader.is_null()) return true; | |
137 if (AlwaysLockClassLoader) return false; | |
3938 | 138 return java_lang_ClassLoader::parallelCapable(class_loader()); |
514 | 139 } |
140 // ---------------------------------------------------------------------------- | |
1075
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
141 // ParallelDefineClass flag does not apply to bootclass loader |
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
142 bool SystemDictionary::is_parallelDefine(Handle class_loader) { |
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
143 if (class_loader.is_null()) return false; |
3938 | 144 if (AllowParallelDefineClass && java_lang_ClassLoader::parallelCapable(class_loader())) { |
1075
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
145 return true; |
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
146 } |
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
147 return false; |
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
148 } |
8866
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8751
diff
changeset
|
149 |
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8751
diff
changeset
|
150 /** |
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8751
diff
changeset
|
151 * Returns true if the passed class loader is the extension class loader. |
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8751
diff
changeset
|
152 */ |
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8751
diff
changeset
|
153 bool SystemDictionary::is_ext_class_loader(Handle class_loader) { |
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8751
diff
changeset
|
154 if (class_loader.is_null()) { |
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8751
diff
changeset
|
155 return false; |
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8751
diff
changeset
|
156 } |
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8751
diff
changeset
|
157 return (class_loader->klass()->name() == vmSymbols::sun_misc_Launcher_ExtClassLoader()); |
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8751
diff
changeset
|
158 } |
16885e702c88
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
8751
diff
changeset
|
159 |
1075
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
160 // ---------------------------------------------------------------------------- |
0 | 161 // Resolving of classes |
162 | |
163 // Forwards to resolve_or_null | |
164 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
165 Klass* SystemDictionary::resolve_or_fail(Symbol* class_name, Handle class_loader, Handle protection_domain, bool throw_error, TRAPS) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
166 Klass* klass = resolve_or_null(class_name, class_loader, protection_domain, THREAD); |
0 | 167 if (HAS_PENDING_EXCEPTION || klass == NULL) { |
168 KlassHandle k_h(THREAD, klass); | |
169 // can return a null klass | |
170 klass = handle_resolution_exception(class_name, class_loader, protection_domain, throw_error, k_h, THREAD); | |
171 } | |
172 return klass; | |
173 } | |
174 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
175 Klass* SystemDictionary::handle_resolution_exception(Symbol* class_name, Handle class_loader, Handle protection_domain, bool throw_error, KlassHandle klass_h, TRAPS) { |
0 | 176 if (HAS_PENDING_EXCEPTION) { |
177 // If we have a pending exception we forward it to the caller, unless throw_error is true, | |
178 // in which case we have to check whether the pending exception is a ClassNotFoundException, | |
179 // and if so convert it to a NoClassDefFoundError | |
180 // And chain the original ClassNotFoundException | |
1142 | 181 if (throw_error && PENDING_EXCEPTION->is_a(SystemDictionary::ClassNotFoundException_klass())) { |
0 | 182 ResourceMark rm(THREAD); |
183 assert(klass_h() == NULL, "Should not have result with exception pending"); | |
184 Handle e(THREAD, PENDING_EXCEPTION); | |
185 CLEAR_PENDING_EXCEPTION; | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
186 THROW_MSG_CAUSE_NULL(vmSymbols::java_lang_NoClassDefFoundError(), class_name->as_C_string(), e); |
0 | 187 } else { |
188 return NULL; | |
189 } | |
190 } | |
191 // Class not found, throw appropriate error or exception depending on value of throw_error | |
192 if (klass_h() == NULL) { | |
193 ResourceMark rm(THREAD); | |
194 if (throw_error) { | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
195 THROW_MSG_NULL(vmSymbols::java_lang_NoClassDefFoundError(), class_name->as_C_string()); |
0 | 196 } else { |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
197 THROW_MSG_NULL(vmSymbols::java_lang_ClassNotFoundException(), class_name->as_C_string()); |
0 | 198 } |
199 } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
200 return (Klass*)klass_h(); |
0 | 201 } |
202 | |
203 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
204 Klass* SystemDictionary::resolve_or_fail(Symbol* class_name, |
0 | 205 bool throw_error, TRAPS) |
206 { | |
207 return resolve_or_fail(class_name, Handle(), Handle(), throw_error, THREAD); | |
208 } | |
209 | |
210 | |
211 // Forwards to resolve_instance_class_or_null | |
212 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
213 Klass* SystemDictionary::resolve_or_null(Symbol* class_name, Handle class_loader, Handle protection_domain, TRAPS) { |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
214 assert(!THREAD->is_Compiler_thread(), |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
215 err_msg("can not load classes with compiler thread: class=%s, classloader=%s", |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
216 class_name->as_C_string(), |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
217 class_loader.is_null() ? "null" : class_loader->klass()->name()->as_C_string())); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
218 if (FieldType::is_array(class_name)) { |
0 | 219 return resolve_array_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
220 } else if (FieldType::is_obj(class_name)) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
221 ResourceMark rm(THREAD); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
222 // Ignore wrapping L and ;. |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
223 TempNewSymbol name = SymbolTable::new_symbol(class_name->as_C_string() + 1, |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
224 class_name->utf8_length() - 2, CHECK_NULL); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
225 return resolve_instance_class_or_null(name, class_loader, protection_domain, CHECK_NULL); |
0 | 226 } else { |
227 return resolve_instance_class_or_null(class_name, class_loader, protection_domain, CHECK_NULL); | |
228 } | |
229 } | |
230 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
231 Klass* SystemDictionary::resolve_or_null(Symbol* class_name, TRAPS) { |
0 | 232 return resolve_or_null(class_name, Handle(), Handle(), THREAD); |
233 } | |
234 | |
235 // Forwards to resolve_instance_class_or_null | |
236 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
237 Klass* SystemDictionary::resolve_array_class_or_null(Symbol* class_name, |
0 | 238 Handle class_loader, |
239 Handle protection_domain, | |
240 TRAPS) { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
241 assert(FieldType::is_array(class_name), "must be array"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
242 Klass* k = NULL; |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
243 FieldArrayInfo fd; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
244 // dimension and object_key in FieldArrayInfo are assigned as a side-effect |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
245 // of this call |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
246 BasicType t = FieldType::get_array_info(class_name, fd, CHECK_NULL); |
0 | 247 if (t == T_OBJECT) { |
248 // naked oop "k" is OK here -- we assign back into it | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
249 k = SystemDictionary::resolve_instance_class_or_null(fd.object_key(), |
0 | 250 class_loader, |
251 protection_domain, | |
252 CHECK_NULL); | |
253 if (k != NULL) { | |
6983 | 254 k = k->array_klass(fd.dimension(), CHECK_NULL); |
0 | 255 } |
256 } else { | |
257 k = Universe::typeArrayKlassObj(t); | |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
258 k = TypeArrayKlass::cast(k)->array_klass(fd.dimension(), CHECK_NULL); |
0 | 259 } |
260 return k; | |
261 } | |
262 | |
263 | |
264 // Must be called for any super-class or super-interface resolution | |
265 // during class definition to allow class circularity checking | |
266 // super-interface callers: | |
267 // parse_interfaces - for defineClass & jvmtiRedefineClasses | |
268 // super-class callers: | |
269 // ClassFileParser - for defineClass & jvmtiRedefineClasses | |
270 // load_shared_class - while loading a class from shared archive | |
514 | 271 // resolve_instance_class_or_null: |
272 // via: handle_parallel_super_load | |
0 | 273 // when resolving a class that has an existing placeholder with |
274 // a saved superclass [i.e. a defineClass is currently in progress] | |
275 // if another thread is trying to resolve the class, it must do | |
276 // super-class checks on its own thread to catch class circularity | |
277 // This last call is critical in class circularity checking for cases | |
278 // where classloading is delegated to different threads and the | |
279 // classloader lock is released. | |
280 // Take the case: Base->Super->Base | |
281 // 1. If thread T1 tries to do a defineClass of class Base | |
282 // resolve_super_or_fail creates placeholder: T1, Base (super Super) | |
283 // 2. resolve_instance_class_or_null does not find SD or placeholder for Super | |
284 // so it tries to load Super | |
285 // 3. If we load the class internally, or user classloader uses same thread | |
286 // loadClassFromxxx or defineClass via parseClassFile Super ... | |
287 // 3.1 resolve_super_or_fail creates placeholder: T1, Super (super Base) | |
288 // 3.3 resolve_instance_class_or_null Base, finds placeholder for Base | |
289 // 3.4 calls resolve_super_or_fail Base | |
290 // 3.5 finds T1,Base -> throws class circularity | |
291 //OR 4. If T2 tries to resolve Super via defineClass Super ... | |
292 // 4.1 resolve_super_or_fail creates placeholder: T2, Super (super Base) | |
293 // 4.2 resolve_instance_class_or_null Base, finds placeholder for Base (super Super) | |
294 // 4.3 calls resolve_super_or_fail Super in parallel on own thread T2 | |
295 // 4.4 finds T2, Super -> throws class circularity | |
296 // Must be called, even if superclass is null, since this is | |
297 // where the placeholder entry is created which claims this | |
298 // thread is loading this class/classloader. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
299 Klass* SystemDictionary::resolve_super_or_fail(Symbol* child_name, |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
300 Symbol* class_name, |
0 | 301 Handle class_loader, |
302 Handle protection_domain, | |
303 bool is_superclass, | |
304 TRAPS) { | |
305 // Double-check, if child class is already loaded, just return super-class,interface | |
306 // Don't add a placedholder if already loaded, i.e. already in system dictionary | |
307 // Make sure there's a placeholder for the *child* before resolving. | |
308 // Used as a claim that this thread is currently loading superclass/classloader | |
309 // Used here for ClassCircularity checks and also for heap verification | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
310 // (every InstanceKlass in the heap needs to be in the system dictionary |
0 | 311 // or have a placeholder). |
312 // Must check ClassCircularity before checking if super class is already loaded | |
313 // | |
314 // We might not already have a placeholder if this child_name was | |
315 // first seen via resolve_from_stream (jni_DefineClass or JVM_DefineClass); | |
316 // the name of the class might not be known until the stream is actually | |
317 // parsed. | |
318 // Bugs 4643874, 4715493 | |
319 // compute_hash can have a safepoint | |
320 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
321 ClassLoaderData* loader_data = class_loader_data(class_loader); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
322 unsigned int d_hash = dictionary()->compute_hash(child_name, loader_data); |
0 | 323 int d_index = dictionary()->hash_to_index(d_hash); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
324 unsigned int p_hash = placeholders()->compute_hash(child_name, loader_data); |
0 | 325 int p_index = placeholders()->hash_to_index(p_hash); |
326 // can't throw error holding a lock | |
327 bool child_already_loaded = false; | |
328 bool throw_circularity_error = false; | |
329 { | |
330 MutexLocker mu(SystemDictionary_lock, THREAD); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
331 Klass* childk = find_class(d_index, d_hash, child_name, loader_data); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
332 Klass* quicksuperk; |
0 | 333 // to support // loading: if child done loading, just return superclass |
334 // if class_name, & class_loader don't match: | |
335 // if initial define, SD update will give LinkageError | |
336 // if redefine: compare_class_versions will give HIERARCHY_CHANGED | |
337 // so we don't throw an exception here. | |
338 // see: nsk redefclass014 & java.lang.instrument Instrument032 | |
339 if ((childk != NULL ) && (is_superclass) && | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
340 ((quicksuperk = InstanceKlass::cast(childk)->super()) != NULL) && |
0 | 341 |
6983 | 342 ((quicksuperk->name() == class_name) && |
343 (quicksuperk->class_loader() == class_loader()))) { | |
0 | 344 return quicksuperk; |
345 } else { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
346 PlaceholderEntry* probe = placeholders()->get_entry(p_index, p_hash, child_name, loader_data); |
0 | 347 if (probe && probe->check_seen_thread(THREAD, PlaceholderTable::LOAD_SUPER)) { |
348 throw_circularity_error = true; | |
349 } | |
514 | 350 } |
351 if (!throw_circularity_error) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
352 PlaceholderEntry* newprobe = placeholders()->find_and_add(p_index, p_hash, child_name, loader_data, PlaceholderTable::LOAD_SUPER, class_name, THREAD); |
0 | 353 } |
354 } | |
355 if (throw_circularity_error) { | |
356 ResourceMark rm(THREAD); | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
357 THROW_MSG_NULL(vmSymbols::java_lang_ClassCircularityError(), child_name->as_C_string()); |
0 | 358 } |
359 | |
360 // java.lang.Object should have been found above | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
361 assert(class_name != NULL, "null super class for resolving"); |
0 | 362 // Resolve the super class or interface, check results on return |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
363 Klass* superk = SystemDictionary::resolve_or_null(class_name, |
0 | 364 class_loader, |
365 protection_domain, | |
366 THREAD); | |
367 | |
368 KlassHandle superk_h(THREAD, superk); | |
369 | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
370 // Clean up of placeholders moved so that each classloadAction registrar self-cleans up |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
371 // It is no longer necessary to keep the placeholder table alive until update_dictionary |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
372 // or error. GC used to walk the placeholder table as strong roots. |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
373 // The instanceKlass is kept alive because the class loader is on the stack, |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
374 // which keeps the loader_data alive, as well as all instanceKlasses in |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
375 // the loader_data. parseClassFile adds the instanceKlass to loader_data. |
0 | 376 { |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
377 MutexLocker mu(SystemDictionary_lock, THREAD); |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
378 placeholders()->find_and_remove(p_index, p_hash, child_name, loader_data, PlaceholderTable::LOAD_SUPER, THREAD); |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
379 SystemDictionary_lock->notify_all(); |
0 | 380 } |
381 if (HAS_PENDING_EXCEPTION || superk_h() == NULL) { | |
382 // can null superk | |
383 superk_h = KlassHandle(THREAD, handle_resolution_exception(class_name, class_loader, protection_domain, true, superk_h, THREAD)); | |
384 } | |
385 | |
386 return superk_h(); | |
387 } | |
388 | |
389 void SystemDictionary::validate_protection_domain(instanceKlassHandle klass, | |
390 Handle class_loader, | |
391 Handle protection_domain, | |
392 TRAPS) { | |
393 if(!has_checkPackageAccess()) return; | |
394 | |
395 // Now we have to call back to java to check if the initating class has access | |
396 JavaValue result(T_VOID); | |
397 if (TraceProtectionDomainVerification) { | |
398 // Print out trace information | |
399 tty->print_cr("Checking package access"); | |
400 tty->print(" - class loader: "); class_loader()->print_value_on(tty); tty->cr(); | |
401 tty->print(" - protection domain: "); protection_domain()->print_value_on(tty); tty->cr(); | |
402 tty->print(" - loading: "); klass()->print_value_on(tty); tty->cr(); | |
403 } | |
404 | |
1142 | 405 KlassHandle system_loader(THREAD, SystemDictionary::ClassLoader_klass()); |
0 | 406 JavaCalls::call_special(&result, |
407 class_loader, | |
408 system_loader, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
409 vmSymbols::checkPackageAccess_name(), |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
410 vmSymbols::class_protectiondomain_signature(), |
0 | 411 Handle(THREAD, klass->java_mirror()), |
412 protection_domain, | |
413 THREAD); | |
414 | |
415 if (TraceProtectionDomainVerification) { | |
416 if (HAS_PENDING_EXCEPTION) { | |
417 tty->print_cr(" -> DENIED !!!!!!!!!!!!!!!!!!!!!"); | |
418 } else { | |
419 tty->print_cr(" -> granted"); | |
420 } | |
421 tty->cr(); | |
422 } | |
423 | |
424 if (HAS_PENDING_EXCEPTION) return; | |
425 | |
426 // If no exception has been thrown, we have validated the protection domain | |
427 // Insert the protection domain of the initiating class into the set. | |
428 { | |
429 // We recalculate the entry here -- we've called out to java since | |
430 // the last time it was calculated. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
431 ClassLoaderData* loader_data = class_loader_data(class_loader); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
432 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
433 Symbol* kn = klass->name(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
434 unsigned int d_hash = dictionary()->compute_hash(kn, loader_data); |
0 | 435 int d_index = dictionary()->hash_to_index(d_hash); |
436 | |
437 MutexLocker mu(SystemDictionary_lock, THREAD); | |
438 { | |
439 // Note that we have an entry, and entries can be deleted only during GC, | |
440 // so we cannot allow GC to occur while we're holding this entry. | |
441 | |
442 // We're using a No_Safepoint_Verifier to catch any place where we | |
443 // might potentially do a GC at all. | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
444 // Dictionary::do_unloading() asserts that classes in SD are only |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
445 // unloaded at a safepoint. Anonymous classes are not in SD. |
0 | 446 No_Safepoint_Verifier nosafepoint; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
447 dictionary()->add_protection_domain(d_index, d_hash, klass, loader_data, |
0 | 448 protection_domain, THREAD); |
449 } | |
450 } | |
451 } | |
452 | |
453 // We only get here if this thread finds that another thread | |
454 // has already claimed the placeholder token for the current operation, | |
455 // but that other thread either never owned or gave up the | |
456 // object lock | |
457 // Waits on SystemDictionary_lock to indicate placeholder table updated | |
458 // On return, caller must recheck placeholder table state | |
459 // | |
460 // We only get here if | |
461 // 1) custom classLoader, i.e. not bootstrap classloader | |
462 // 2) UnsyncloadClass not set | |
463 // 3) custom classLoader has broken the class loader objectLock | |
464 // so another thread got here in parallel | |
465 // | |
466 // lockObject must be held. | |
467 // Complicated dance due to lock ordering: | |
468 // Must first release the classloader object lock to | |
469 // allow initial definer to complete the class definition | |
470 // and to avoid deadlock | |
471 // Reclaim classloader lock object with same original recursion count | |
472 // Must release SystemDictionary_lock after notify, since | |
473 // class loader lock must be claimed before SystemDictionary_lock | |
474 // to prevent deadlocks | |
475 // | |
476 // The notify allows applications that did an untimed wait() on | |
477 // the classloader object lock to not hang. | |
478 void SystemDictionary::double_lock_wait(Handle lockObject, TRAPS) { | |
479 assert_lock_strong(SystemDictionary_lock); | |
480 | |
481 bool calledholdinglock | |
482 = ObjectSynchronizer::current_thread_holds_lock((JavaThread*)THREAD, lockObject); | |
483 assert(calledholdinglock,"must hold lock for notify"); | |
514 | 484 assert((!(lockObject() == _system_loader_lock_obj) && !is_parallelCapable(lockObject)), "unexpected double_lock_wait"); |
0 | 485 ObjectSynchronizer::notifyall(lockObject, THREAD); |
486 intptr_t recursions = ObjectSynchronizer::complete_exit(lockObject, THREAD); | |
487 SystemDictionary_lock->wait(); | |
488 SystemDictionary_lock->unlock(); | |
489 ObjectSynchronizer::reenter(lockObject, recursions, THREAD); | |
490 SystemDictionary_lock->lock(); | |
491 } | |
492 | |
493 // If the class in is in the placeholder table, class loading is in progress | |
494 // For cases where the application changes threads to load classes, it | |
495 // is critical to ClassCircularity detection that we try loading | |
496 // the superclass on the same thread internally, so we do parallel | |
497 // super class loading here. | |
498 // This also is critical in cases where the original thread gets stalled | |
499 // even in non-circularity situations. | |
500 // Note: must call resolve_super_or_fail even if null super - | |
514 | 501 // to force placeholder entry creation for this class for circularity detection |
0 | 502 // Caller must check for pending exception |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
503 // Returns non-null Klass* if other thread has completed load |
0 | 504 // and we are done, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
505 // If return null Klass* and no pending exception, the caller must load the class |
0 | 506 instanceKlassHandle SystemDictionary::handle_parallel_super_load( |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
507 Symbol* name, Symbol* superclassname, Handle class_loader, |
0 | 508 Handle protection_domain, Handle lockObject, TRAPS) { |
509 | |
510 instanceKlassHandle nh = instanceKlassHandle(); // null Handle | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
511 ClassLoaderData* loader_data = class_loader_data(class_loader); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
512 unsigned int d_hash = dictionary()->compute_hash(name, loader_data); |
0 | 513 int d_index = dictionary()->hash_to_index(d_hash); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
514 unsigned int p_hash = placeholders()->compute_hash(name, loader_data); |
0 | 515 int p_index = placeholders()->hash_to_index(p_hash); |
516 | |
517 // superk is not used, resolve_super called for circularity check only | |
518 // This code is reached in two situations. One if this thread | |
519 // is loading the same class twice (e.g. ClassCircularity, or | |
520 // java.lang.instrument). | |
521 // The second is if another thread started the resolve_super first | |
522 // and has not yet finished. | |
523 // In both cases the original caller will clean up the placeholder | |
524 // entry on error. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
525 Klass* superk = SystemDictionary::resolve_super_or_fail(name, |
0 | 526 superclassname, |
527 class_loader, | |
528 protection_domain, | |
529 true, | |
530 CHECK_(nh)); | |
531 | |
514 | 532 // parallelCapable class loaders do NOT wait for parallel superclass loads to complete |
533 // Serial class loaders and bootstrap classloader do wait for superclass loads | |
534 if (!class_loader.is_null() && is_parallelCapable(class_loader)) { | |
0 | 535 MutexLocker mu(SystemDictionary_lock, THREAD); |
536 // Check if classloading completed while we were loading superclass or waiting | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
537 Klass* check = find_class(d_index, d_hash, name, loader_data); |
0 | 538 if (check != NULL) { |
539 // Klass is already loaded, so just return it | |
540 return(instanceKlassHandle(THREAD, check)); | |
541 } else { | |
542 return nh; | |
543 } | |
544 } | |
545 | |
546 // must loop to both handle other placeholder updates | |
547 // and spurious notifications | |
548 bool super_load_in_progress = true; | |
549 PlaceholderEntry* placeholder; | |
550 while (super_load_in_progress) { | |
551 MutexLocker mu(SystemDictionary_lock, THREAD); | |
552 // Check if classloading completed while we were loading superclass or waiting | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
553 Klass* check = find_class(d_index, d_hash, name, loader_data); |
0 | 554 if (check != NULL) { |
555 // Klass is already loaded, so just return it | |
556 return(instanceKlassHandle(THREAD, check)); | |
557 } else { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
558 placeholder = placeholders()->get_entry(p_index, p_hash, name, loader_data); |
0 | 559 if (placeholder && placeholder->super_load_in_progress() ){ |
560 // Before UnsyncloadClass: | |
561 // We only get here if the application has released the | |
562 // classloader lock when another thread was in the middle of loading a | |
563 // superclass/superinterface for this class, and now | |
564 // this thread is also trying to load this class. | |
565 // To minimize surprises, the first thread that started to | |
566 // load a class should be the one to complete the loading | |
567 // with the classfile it initially expected. | |
568 // This logic has the current thread wait once it has done | |
569 // all the superclass/superinterface loading it can, until | |
570 // the original thread completes the class loading or fails | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
571 // If it completes we will use the resulting InstanceKlass |
0 | 572 // which we will find below in the systemDictionary. |
573 // We also get here for parallel bootstrap classloader | |
574 if (class_loader.is_null()) { | |
575 SystemDictionary_lock->wait(); | |
576 } else { | |
577 double_lock_wait(lockObject, THREAD); | |
578 } | |
579 } else { | |
580 // If not in SD and not in PH, other thread's load must have failed | |
581 super_load_in_progress = false; | |
582 } | |
583 } | |
584 } | |
585 return (nh); | |
586 } | |
587 | |
588 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
589 Klass* SystemDictionary::resolve_instance_class_or_null(Symbol* name, Handle class_loader, Handle protection_domain, TRAPS) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
590 assert(name != NULL && !FieldType::is_array(name) && |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
591 !FieldType::is_obj(name), "invalid class name"); |
0 | 592 |
593 // UseNewReflection | |
594 // Fix for 4474172; see evaluation for more details | |
595 class_loader = Handle(THREAD, java_lang_ClassLoader::non_reflection_class_loader(class_loader())); | |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
596 ClassLoaderData *loader_data = register_loader(class_loader, CHECK_NULL); |
0 | 597 |
598 // Do lookup to see if class already exist and the protection domain | |
599 // has the right access | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
600 // This call uses find which checks protection domain already matches |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
601 // All subsequent calls use find_class, and set has_loaded_class so that |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
602 // before we return a result we call out to java to check for valid protection domain |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
603 // to allow returning the Klass* and add it to the pd_set if it is valid |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
604 unsigned int d_hash = dictionary()->compute_hash(name, loader_data); |
0 | 605 int d_index = dictionary()->hash_to_index(d_hash); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
606 Klass* probe = dictionary()->find(d_index, d_hash, name, loader_data, |
0 | 607 protection_domain, THREAD); |
608 if (probe != NULL) return probe; | |
609 | |
610 | |
611 // Non-bootstrap class loaders will call out to class loader and | |
612 // define via jvm/jni_DefineClass which will acquire the | |
613 // class loader object lock to protect against multiple threads | |
614 // defining the class in parallel by accident. | |
615 // This lock must be acquired here so the waiter will find | |
616 // any successful result in the SystemDictionary and not attempt | |
617 // the define | |
514 | 618 // ParallelCapable Classloaders and the bootstrap classloader, |
0 | 619 // or all classloaders with UnsyncloadClass do not acquire lock here |
620 bool DoObjectLock = true; | |
514 | 621 if (is_parallelCapable(class_loader)) { |
0 | 622 DoObjectLock = false; |
623 } | |
624 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
625 unsigned int p_hash = placeholders()->compute_hash(name, loader_data); |
0 | 626 int p_index = placeholders()->hash_to_index(p_hash); |
627 | |
628 // Class is not in SystemDictionary so we have to do loading. | |
629 // Make sure we are synchronized on the class loader before we proceed | |
630 Handle lockObject = compute_loader_lock_object(class_loader, THREAD); | |
631 check_loader_lock_contention(lockObject, THREAD); | |
632 ObjectLocker ol(lockObject, THREAD, DoObjectLock); | |
633 | |
634 // Check again (after locking) if class already exist in SystemDictionary | |
635 bool class_has_been_loaded = false; | |
636 bool super_load_in_progress = false; | |
637 bool havesupername = false; | |
638 instanceKlassHandle k; | |
639 PlaceholderEntry* placeholder; | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
640 Symbol* superclassname = NULL; |
0 | 641 |
642 { | |
643 MutexLocker mu(SystemDictionary_lock, THREAD); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
644 Klass* check = find_class(d_index, d_hash, name, loader_data); |
0 | 645 if (check != NULL) { |
646 // Klass is already loaded, so just return it | |
647 class_has_been_loaded = true; | |
648 k = instanceKlassHandle(THREAD, check); | |
649 } else { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
650 placeholder = placeholders()->get_entry(p_index, p_hash, name, loader_data); |
0 | 651 if (placeholder && placeholder->super_load_in_progress()) { |
652 super_load_in_progress = true; | |
653 if (placeholder->havesupername() == true) { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
654 superclassname = placeholder->supername(); |
0 | 655 havesupername = true; |
656 } | |
657 } | |
658 } | |
659 } | |
660 | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
661 // If the class is in the placeholder table, class loading is in progress |
0 | 662 if (super_load_in_progress && havesupername==true) { |
663 k = SystemDictionary::handle_parallel_super_load(name, superclassname, | |
664 class_loader, protection_domain, lockObject, THREAD); | |
665 if (HAS_PENDING_EXCEPTION) { | |
666 return NULL; | |
667 } | |
668 if (!k.is_null()) { | |
669 class_has_been_loaded = true; | |
670 } | |
671 } | |
672 | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
673 bool throw_circularity_error = false; |
0 | 674 if (!class_has_been_loaded) { |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
675 bool load_instance_added = false; |
0 | 676 |
677 // add placeholder entry to record loading instance class | |
678 // Five cases: | |
679 // All cases need to prevent modifying bootclasssearchpath | |
680 // in parallel with a classload of same classname | |
514 | 681 // Redefineclasses uses existence of the placeholder for the duration |
682 // of the class load to prevent concurrent redefinition of not completely | |
683 // defined classes. | |
0 | 684 // case 1. traditional classloaders that rely on the classloader object lock |
685 // - no other need for LOAD_INSTANCE | |
686 // case 2. traditional classloaders that break the classloader object lock | |
687 // as a deadlock workaround. Detection of this case requires that | |
688 // this check is done while holding the classloader object lock, | |
689 // and that lock is still held when calling classloader's loadClass. | |
690 // For these classloaders, we ensure that the first requestor | |
691 // completes the load and other requestors wait for completion. | |
692 // case 3. UnsyncloadClass - don't use objectLocker | |
693 // With this flag, we allow parallel classloading of a | |
694 // class/classloader pair | |
695 // case4. Bootstrap classloader - don't own objectLocker | |
696 // This classloader supports parallelism at the classloader level, | |
697 // but only allows a single load of a class/classloader pair. | |
698 // No performance benefit and no deadlock issues. | |
514 | 699 // case 5. parallelCapable user level classloaders - without objectLocker |
700 // Allow parallel classloading of a class/classloader pair | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
701 |
0 | 702 { |
703 MutexLocker mu(SystemDictionary_lock, THREAD); | |
514 | 704 if (class_loader.is_null() || !is_parallelCapable(class_loader)) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
705 PlaceholderEntry* oldprobe = placeholders()->get_entry(p_index, p_hash, name, loader_data); |
0 | 706 if (oldprobe) { |
707 // only need check_seen_thread once, not on each loop | |
708 // 6341374 java/lang/Instrument with -Xcomp | |
709 if (oldprobe->check_seen_thread(THREAD, PlaceholderTable::LOAD_INSTANCE)) { | |
710 throw_circularity_error = true; | |
711 } else { | |
712 // case 1: traditional: should never see load_in_progress. | |
713 while (!class_has_been_loaded && oldprobe && oldprobe->instance_load_in_progress()) { | |
714 | |
715 // case 4: bootstrap classloader: prevent futile classloading, | |
716 // wait on first requestor | |
717 if (class_loader.is_null()) { | |
718 SystemDictionary_lock->wait(); | |
719 } else { | |
720 // case 2: traditional with broken classloader lock. wait on first | |
721 // requestor. | |
722 double_lock_wait(lockObject, THREAD); | |
723 } | |
724 // Check if classloading completed while we were waiting | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
725 Klass* check = find_class(d_index, d_hash, name, loader_data); |
0 | 726 if (check != NULL) { |
727 // Klass is already loaded, so just return it | |
728 k = instanceKlassHandle(THREAD, check); | |
729 class_has_been_loaded = true; | |
730 } | |
731 // check if other thread failed to load and cleaned up | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
732 oldprobe = placeholders()->get_entry(p_index, p_hash, name, loader_data); |
0 | 733 } |
734 } | |
735 } | |
736 } | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
737 // All cases: add LOAD_INSTANCE holding SystemDictionary_lock |
514 | 738 // case 3: UnsyncloadClass || case 5: parallelCapable: allow competing threads to try |
0 | 739 // LOAD_INSTANCE in parallel |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
740 |
514 | 741 if (!throw_circularity_error && !class_has_been_loaded) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
742 PlaceholderEntry* newprobe = placeholders()->find_and_add(p_index, p_hash, name, loader_data, PlaceholderTable::LOAD_INSTANCE, NULL, THREAD); |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
743 load_instance_added = true; |
0 | 744 // For class loaders that do not acquire the classloader object lock, |
745 // if they did not catch another thread holding LOAD_INSTANCE, | |
746 // need a check analogous to the acquire ObjectLocker/find_class | |
747 // i.e. now that we hold the LOAD_INSTANCE token on loading this class/CL | |
748 // one final check if the load has already completed | |
514 | 749 // class loaders holding the ObjectLock shouldn't find the class here |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
750 Klass* check = find_class(d_index, d_hash, name, loader_data); |
0 | 751 if (check != NULL) { |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
752 // Klass is already loaded, so return it after checking/adding protection domain |
0 | 753 k = instanceKlassHandle(THREAD, check); |
754 class_has_been_loaded = true; | |
755 } | |
756 } | |
757 } | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
758 |
0 | 759 // must throw error outside of owning lock |
760 if (throw_circularity_error) { | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
761 assert(!HAS_PENDING_EXCEPTION && load_instance_added == false,"circularity error cleanup"); |
0 | 762 ResourceMark rm(THREAD); |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
763 THROW_MSG_NULL(vmSymbols::java_lang_ClassCircularityError(), name->as_C_string()); |
0 | 764 } |
765 | |
766 if (!class_has_been_loaded) { | |
767 | |
768 // Do actual loading | |
769 k = load_instance_class(name, class_loader, THREAD); | |
770 | |
1075
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
771 // For UnsyncloadClass only |
0 | 772 // If they got a linkageError, check if a parallel class load succeeded. |
773 // If it did, then for bytecode resolution the specification requires | |
774 // that we return the same result we did for the other thread, i.e. the | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
775 // successfully loaded InstanceKlass |
0 | 776 // Should not get here for classloaders that support parallelism |
1075
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
777 // with the new cleaner mechanism, even with AllowParallelDefineClass |
514 | 778 // Bootstrap goes through here to allow for an extra guarantee check |
0 | 779 if (UnsyncloadClass || (class_loader.is_null())) { |
780 if (k.is_null() && HAS_PENDING_EXCEPTION | |
1142 | 781 && PENDING_EXCEPTION->is_a(SystemDictionary::LinkageError_klass())) { |
0 | 782 MutexLocker mu(SystemDictionary_lock, THREAD); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
783 Klass* check = find_class(d_index, d_hash, name, loader_data); |
0 | 784 if (check != NULL) { |
785 // Klass is already loaded, so just use it | |
786 k = instanceKlassHandle(THREAD, check); | |
787 CLEAR_PENDING_EXCEPTION; | |
788 guarantee((!class_loader.is_null()), "dup definition for bootstrap loader?"); | |
789 } | |
790 } | |
791 } | |
792 | |
793 // If everything was OK (no exceptions, no null return value), and | |
794 // class_loader is NOT the defining loader, do a little more bookkeeping. | |
795 if (!HAS_PENDING_EXCEPTION && !k.is_null() && | |
796 k->class_loader() != class_loader()) { | |
797 | |
798 check_constraints(d_index, d_hash, k, class_loader, false, THREAD); | |
799 | |
800 // Need to check for a PENDING_EXCEPTION again; check_constraints | |
801 // can throw and doesn't use the CHECK macro. | |
802 if (!HAS_PENDING_EXCEPTION) { | |
803 { // Grabbing the Compile_lock prevents systemDictionary updates | |
804 // during compilations. | |
805 MutexLocker mu(Compile_lock, THREAD); | |
806 update_dictionary(d_index, d_hash, p_index, p_hash, | |
807 k, class_loader, THREAD); | |
808 } | |
809 if (JvmtiExport::should_post_class_load()) { | |
810 Thread *thread = THREAD; | |
811 assert(thread->is_Java_thread(), "thread->is_Java_thread()"); | |
812 JvmtiExport::post_class_load((JavaThread *) thread, k()); | |
813 } | |
814 } | |
815 } | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
816 } // load_instance_class loop |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
817 |
8751
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
818 if (HAS_PENDING_EXCEPTION) { |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
819 // An exception, such as OOM could have happened at various places inside |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
820 // load_instance_class. We might have partially initialized a shared class |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
821 // and need to clean it up. |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
822 if (class_loader.is_null()) { |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
823 // In some cases k may be null. Let's find the shared class again. |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
824 instanceKlassHandle ik(THREAD, find_shared_class(name)); |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
825 if (ik.not_null()) { |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
826 if (ik->class_loader_data() == NULL) { |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
827 // We didn't go as far as Klass::restore_unshareable_info(), |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
828 // so nothing to clean up. |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
829 } else { |
8848
d886ac1dfd36
8010723: fatal error: acquiring lock Metaspace allocation lock/5 out of order
coleenp
parents:
8840
diff
changeset
|
830 Klass *kk; |
d886ac1dfd36
8010723: fatal error: acquiring lock Metaspace allocation lock/5 out of order
coleenp
parents:
8840
diff
changeset
|
831 { |
d886ac1dfd36
8010723: fatal error: acquiring lock Metaspace allocation lock/5 out of order
coleenp
parents:
8840
diff
changeset
|
832 MutexLocker mu(SystemDictionary_lock, THREAD); |
d886ac1dfd36
8010723: fatal error: acquiring lock Metaspace allocation lock/5 out of order
coleenp
parents:
8840
diff
changeset
|
833 kk = find_class(name, ik->class_loader_data()); |
d886ac1dfd36
8010723: fatal error: acquiring lock Metaspace allocation lock/5 out of order
coleenp
parents:
8840
diff
changeset
|
834 } |
8751
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
835 if (kk != NULL) { |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
836 // No clean up is needed if the shared class has been entered |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
837 // into system dictionary, as load_shared_class() won't be called |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
838 // again. |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
839 } else { |
8848
d886ac1dfd36
8010723: fatal error: acquiring lock Metaspace allocation lock/5 out of order
coleenp
parents:
8840
diff
changeset
|
840 // This must be done outside of the SystemDictionary_lock to |
d886ac1dfd36
8010723: fatal error: acquiring lock Metaspace allocation lock/5 out of order
coleenp
parents:
8840
diff
changeset
|
841 // avoid deadlock. |
d886ac1dfd36
8010723: fatal error: acquiring lock Metaspace allocation lock/5 out of order
coleenp
parents:
8840
diff
changeset
|
842 // |
d886ac1dfd36
8010723: fatal error: acquiring lock Metaspace allocation lock/5 out of order
coleenp
parents:
8840
diff
changeset
|
843 // Note that Klass::restore_unshareable_info (called via |
d886ac1dfd36
8010723: fatal error: acquiring lock Metaspace allocation lock/5 out of order
coleenp
parents:
8840
diff
changeset
|
844 // load_instance_class above) is also called outside |
d886ac1dfd36
8010723: fatal error: acquiring lock Metaspace allocation lock/5 out of order
coleenp
parents:
8840
diff
changeset
|
845 // of SystemDictionary_lock. Other threads are blocked from |
d886ac1dfd36
8010723: fatal error: acquiring lock Metaspace allocation lock/5 out of order
coleenp
parents:
8840
diff
changeset
|
846 // loading this class because they are waiting on the |
d886ac1dfd36
8010723: fatal error: acquiring lock Metaspace allocation lock/5 out of order
coleenp
parents:
8840
diff
changeset
|
847 // SystemDictionary_lock until this thread removes |
d886ac1dfd36
8010723: fatal error: acquiring lock Metaspace allocation lock/5 out of order
coleenp
parents:
8840
diff
changeset
|
848 // the placeholder below. |
d886ac1dfd36
8010723: fatal error: acquiring lock Metaspace allocation lock/5 out of order
coleenp
parents:
8840
diff
changeset
|
849 // |
d886ac1dfd36
8010723: fatal error: acquiring lock Metaspace allocation lock/5 out of order
coleenp
parents:
8840
diff
changeset
|
850 // This need to be re-thought when parallel-capable non-boot |
d886ac1dfd36
8010723: fatal error: acquiring lock Metaspace allocation lock/5 out of order
coleenp
parents:
8840
diff
changeset
|
851 // classloaders are supported by CDS (today they're not). |
8751
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
852 clean_up_shared_class(ik, class_loader, THREAD); |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
853 } |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
854 } |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
855 } |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
856 } |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
857 } |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
858 |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
859 if (load_instance_added == true) { |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
860 // clean up placeholder entries for LOAD_INSTANCE success or error |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
861 // This brackets the SystemDictionary updates for both defining |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
862 // and initiating loaders |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
863 MutexLocker mu(SystemDictionary_lock, THREAD); |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
864 placeholders()->find_and_remove(p_index, p_hash, name, loader_data, PlaceholderTable::LOAD_INSTANCE, THREAD); |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
865 SystemDictionary_lock->notify_all(); |
0 | 866 } |
867 } | |
868 | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
869 if (HAS_PENDING_EXCEPTION || k.is_null()) { |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
870 return NULL; |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
871 } |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
872 |
0 | 873 #ifdef ASSERT |
874 { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
875 ClassLoaderData* loader_data = k->class_loader_data(); |
0 | 876 MutexLocker mu(SystemDictionary_lock, THREAD); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
877 Klass* kk = find_class(name, loader_data); |
0 | 878 assert(kk == k(), "should be present in dictionary"); |
879 } | |
880 #endif | |
881 | |
882 // return if the protection domain in NULL | |
883 if (protection_domain() == NULL) return k(); | |
884 | |
885 // Check the protection domain has the right access | |
886 { | |
887 MutexLocker mu(SystemDictionary_lock, THREAD); | |
888 // Note that we have an entry, and entries can be deleted only during GC, | |
889 // so we cannot allow GC to occur while we're holding this entry. | |
890 // We're using a No_Safepoint_Verifier to catch any place where we | |
891 // might potentially do a GC at all. | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
892 // Dictionary::do_unloading() asserts that classes in SD are only |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
893 // unloaded at a safepoint. Anonymous classes are not in SD. |
0 | 894 No_Safepoint_Verifier nosafepoint; |
895 if (dictionary()->is_valid_protection_domain(d_index, d_hash, name, | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
896 loader_data, |
0 | 897 protection_domain)) { |
898 return k(); | |
899 } | |
900 } | |
901 | |
902 // Verify protection domain. If it fails an exception is thrown | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
903 validate_protection_domain(k, class_loader, protection_domain, CHECK_NULL); |
0 | 904 |
905 return k(); | |
906 } | |
907 | |
908 | |
909 // This routine does not lock the system dictionary. | |
910 // | |
911 // Since readers don't hold a lock, we must make sure that system | |
912 // dictionary entries are only removed at a safepoint (when only one | |
913 // thread is running), and are added to in a safe way (all links must | |
914 // be updated in an MT-safe manner). | |
915 // | |
916 // Callers should be aware that an entry could be added just after | |
917 // _dictionary->bucket(index) is read here, so the caller will not see | |
918 // the new entry. | |
919 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
920 Klass* SystemDictionary::find(Symbol* class_name, |
8667
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7951
diff
changeset
|
921 Handle class_loader, |
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7951
diff
changeset
|
922 Handle protection_domain, |
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7951
diff
changeset
|
923 TRAPS) { |
0 | 924 |
556
48bb4a49b7ac
6790209: server VM fails with assert(will_link,"_new: typeflow responsibility")
kvn
parents:
431
diff
changeset
|
925 // UseNewReflection |
48bb4a49b7ac
6790209: server VM fails with assert(will_link,"_new: typeflow responsibility")
kvn
parents:
431
diff
changeset
|
926 // The result of this call should be consistent with the result |
48bb4a49b7ac
6790209: server VM fails with assert(will_link,"_new: typeflow responsibility")
kvn
parents:
431
diff
changeset
|
927 // of the call to resolve_instance_class_or_null(). |
48bb4a49b7ac
6790209: server VM fails with assert(will_link,"_new: typeflow responsibility")
kvn
parents:
431
diff
changeset
|
928 // See evaluation 6790209 and 4474172 for more details. |
48bb4a49b7ac
6790209: server VM fails with assert(will_link,"_new: typeflow responsibility")
kvn
parents:
431
diff
changeset
|
929 class_loader = Handle(THREAD, java_lang_ClassLoader::non_reflection_class_loader(class_loader())); |
8667
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7951
diff
changeset
|
930 ClassLoaderData* loader_data = ClassLoaderData::class_loader_data_or_null(class_loader()); |
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7951
diff
changeset
|
931 |
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7951
diff
changeset
|
932 if (loader_data == NULL) { |
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7951
diff
changeset
|
933 // If the ClassLoaderData has not been setup, |
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7951
diff
changeset
|
934 // then the class loader has no entries in the dictionary. |
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7951
diff
changeset
|
935 return NULL; |
1f9994892f89
8008549: NPG: SystemDictionary::find(...) unnecessarily keeps class loaders alive
stefank
parents:
7951
diff
changeset
|
936 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
937 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
938 unsigned int d_hash = dictionary()->compute_hash(class_name, loader_data); |
0 | 939 int d_index = dictionary()->hash_to_index(d_hash); |
940 | |
941 { | |
942 // Note that we have an entry, and entries can be deleted only during GC, | |
943 // so we cannot allow GC to occur while we're holding this entry. | |
944 // We're using a No_Safepoint_Verifier to catch any place where we | |
945 // might potentially do a GC at all. | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
946 // Dictionary::do_unloading() asserts that classes in SD are only |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
947 // unloaded at a safepoint. Anonymous classes are not in SD. |
0 | 948 No_Safepoint_Verifier nosafepoint; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
949 return dictionary()->find(d_index, d_hash, class_name, loader_data, |
0 | 950 protection_domain, THREAD); |
951 } | |
952 } | |
953 | |
954 | |
955 // Look for a loaded instance or array klass by name. Do not do any loading. | |
956 // return NULL in case of error. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
957 Klass* SystemDictionary::find_instance_or_array_klass(Symbol* class_name, |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
958 Handle class_loader, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
959 Handle protection_domain, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
960 TRAPS) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
961 Klass* k = NULL; |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
962 assert(class_name != NULL, "class name must be non NULL"); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
963 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
964 if (FieldType::is_array(class_name)) { |
0 | 965 // The name refers to an array. Parse the name. |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
966 // dimension and object_key in FieldArrayInfo are assigned as a |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
967 // side-effect of this call |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
968 FieldArrayInfo fd; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
969 BasicType t = FieldType::get_array_info(class_name, fd, CHECK_(NULL)); |
0 | 970 if (t != T_OBJECT) { |
971 k = Universe::typeArrayKlassObj(t); | |
972 } else { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
973 k = SystemDictionary::find(fd.object_key(), class_loader, protection_domain, THREAD); |
0 | 974 } |
975 if (k != NULL) { | |
6983 | 976 k = k->array_klass_or_null(fd.dimension()); |
0 | 977 } |
978 } else { | |
979 k = find(class_name, class_loader, protection_domain, THREAD); | |
980 } | |
981 return k; | |
982 } | |
983 | |
984 // Note: this method is much like resolve_from_stream, but | |
985 // updates no supplemental data structures. | |
986 // TODO consolidate the two methods with a helper routine? | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
987 Klass* SystemDictionary::parse_stream(Symbol* class_name, |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
988 Handle class_loader, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
989 Handle protection_domain, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
990 ClassFileStream* st, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
991 KlassHandle host_klass, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
992 GrowableArray<Handle>* cp_patches, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
993 TRAPS) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
994 TempNewSymbol parsed_name = NULL; |
0 | 995 |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
996 ClassLoaderData* loader_data; |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
997 if (host_klass.not_null()) { |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
998 // Create a new CLD for anonymous class, that uses the same class loader |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
999 // as the host_klass |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
1000 assert(EnableInvokeDynamic, ""); |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
1001 guarantee(host_klass->class_loader() == class_loader(), "should be the same"); |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
1002 loader_data = ClassLoaderData::anonymous_class_loader_data(class_loader(), CHECK_NULL); |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
1003 loader_data->record_dependency(host_klass(), CHECK_NULL); |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
1004 } else { |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
1005 loader_data = ClassLoaderData::class_loader_data(class_loader()); |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
1006 } |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
1007 |
0 | 1008 // Parse the stream. Note that we do this even though this klass might |
1009 // already be present in the SystemDictionary, otherwise we would not | |
1010 // throw potential ClassFormatErrors. | |
1011 // | |
1012 // Note: "name" is updated. | |
1013 | |
1014 instanceKlassHandle k = ClassFileParser(st).parseClassFile(class_name, | |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
1015 loader_data, |
0 | 1016 protection_domain, |
710 | 1017 host_klass, |
1018 cp_patches, | |
0 | 1019 parsed_name, |
973
ad6585fd4087
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
875
diff
changeset
|
1020 true, |
0 | 1021 THREAD); |
1022 | |
1023 | |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1024 if (host_klass.not_null() && k.not_null()) { |
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2357
diff
changeset
|
1025 assert(EnableInvokeDynamic, ""); |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
1026 k->set_host_klass(host_klass()); |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1027 // If it's anonymous, initialize it now, since nobody else will. |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1028 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1029 { |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1030 MutexLocker mu_r(Compile_lock, THREAD); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1031 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1032 // Add to class hierarchy, initialize vtables, and do possible |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1033 // deoptimizations. |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1034 add_to_hierarchy(k, CHECK_NULL); // No exception, but can block |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1035 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1036 // But, do not add to system dictionary. |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1037 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1038 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1039 // Rewrite and patch constant pool here. |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
1040 k->link_class(CHECK_NULL); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1041 if (cp_patches != NULL) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1042 k->constants()->patch_resolved_references(cp_patches); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1043 } |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
1044 k->eager_initialize(CHECK_NULL); |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1045 |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1046 // notify jvmti |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1047 if (JvmtiExport::should_post_class_load()) { |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1048 assert(THREAD->is_Java_thread(), "thread->is_Java_thread()"); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1049 JvmtiExport::post_class_load((JavaThread *) THREAD, k()); |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1050 } |
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1051 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1052 assert(host_klass.not_null() || cp_patches == NULL, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1053 "cp_patches only found with host_klass"); |
431
a45484ea312d
6653858: dynamic languages need to be able to load anonymous classes
jrose
parents:
196
diff
changeset
|
1054 |
0 | 1055 return k(); |
1056 } | |
1057 | |
1058 // Add a klass to the system from a stream (called by jni_DefineClass and | |
1059 // JVM_DefineClass). | |
1060 // Note: class_name can be NULL. In that case we do not know the name of | |
1061 // the class until we have parsed the stream. | |
1062 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1063 Klass* SystemDictionary::resolve_from_stream(Symbol* class_name, |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
1064 Handle class_loader, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
1065 Handle protection_domain, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
1066 ClassFileStream* st, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
1067 bool verify, |
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
1068 TRAPS) { |
0 | 1069 |
514 | 1070 // Classloaders that support parallelism, e.g. bootstrap classloader, |
1071 // or all classloaders with UnsyncloadClass do not acquire lock here | |
1072 bool DoObjectLock = true; | |
1073 if (is_parallelCapable(class_loader)) { | |
1074 DoObjectLock = false; | |
1075 } | |
1076 | |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
1077 ClassLoaderData* loader_data = register_loader(class_loader, CHECK_NULL); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1078 |
514 | 1079 // Make sure we are synchronized on the class loader before we proceed |
0 | 1080 Handle lockObject = compute_loader_lock_object(class_loader, THREAD); |
1081 check_loader_lock_contention(lockObject, THREAD); | |
514 | 1082 ObjectLocker ol(lockObject, THREAD, DoObjectLock); |
0 | 1083 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1084 TempNewSymbol parsed_name = NULL; |
0 | 1085 |
1086 // Parse the stream. Note that we do this even though this klass might | |
1087 // already be present in the SystemDictionary, otherwise we would not | |
1088 // throw potential ClassFormatErrors. | |
1089 // | |
1090 // Note: "name" is updated. | |
1091 | |
1092 instanceKlassHandle k = ClassFileParser(st).parseClassFile(class_name, | |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
1093 loader_data, |
0 | 1094 protection_domain, |
1095 parsed_name, | |
973
ad6585fd4087
6830542: Performance: JVM_DefineClass already verified.
acorn
parents:
875
diff
changeset
|
1096 verify, |
0 | 1097 THREAD); |
1098 | |
1099 const char* pkg = "java/"; | |
1100 if (!HAS_PENDING_EXCEPTION && | |
1101 !class_loader.is_null() && | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1102 parsed_name != NULL && |
0 | 1103 !strncmp((const char*)parsed_name->bytes(), pkg, strlen(pkg))) { |
1104 // It is illegal to define classes in the "java." package from | |
1105 // JVM_DefineClass or jni_DefineClass unless you're the bootclassloader | |
1106 ResourceMark rm(THREAD); | |
1107 char* name = parsed_name->as_C_string(); | |
1108 char* index = strrchr(name, '/'); | |
1109 *index = '\0'; // chop to just the package name | |
1110 while ((index = strchr(name, '/')) != NULL) { | |
1111 *index = '.'; // replace '/' with '.' in package name | |
1112 } | |
1113 const char* fmt = "Prohibited package name: %s"; | |
1114 size_t len = strlen(fmt) + strlen(name); | |
1115 char* message = NEW_RESOURCE_ARRAY(char, len); | |
1116 jio_snprintf(message, len, fmt, name); | |
1117 Exceptions::_throw_msg(THREAD_AND_LOCATION, | |
1118 vmSymbols::java_lang_SecurityException(), message); | |
1119 } | |
1120 | |
1121 if (!HAS_PENDING_EXCEPTION) { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1122 assert(parsed_name != NULL, "Sanity"); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1123 assert(class_name == NULL || class_name == parsed_name, "name mismatch"); |
0 | 1124 // Verification prevents us from creating names with dots in them, this |
1125 // asserts that that's the case. | |
1126 assert(is_internal_format(parsed_name), | |
1127 "external class name format used internally"); | |
1128 | |
1129 // Add class just loaded | |
514 | 1130 // If a class loader supports parallel classloading handle parallel define requests |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1131 // find_or_define_instance_class may return a different InstanceKlass |
514 | 1132 if (is_parallelCapable(class_loader)) { |
1133 k = find_or_define_instance_class(class_name, class_loader, k, THREAD); | |
1134 } else { | |
1135 define_instance_class(k, THREAD); | |
1136 } | |
0 | 1137 } |
1138 | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
1139 // Make sure we have an entry in the SystemDictionary on success |
0 | 1140 debug_only( { |
1141 if (!HAS_PENDING_EXCEPTION) { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1142 assert(parsed_name != NULL, "parsed_name is still null?"); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1143 Symbol* h_name = k->name(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1144 ClassLoaderData *defining_loader_data = k->class_loader_data(); |
0 | 1145 |
1146 MutexLocker mu(SystemDictionary_lock, THREAD); | |
1147 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1148 Klass* check = find_class(parsed_name, loader_data); |
0 | 1149 assert(check == k(), "should be present in the dictionary"); |
1150 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1151 Klass* check2 = find_class(h_name, defining_loader_data); |
0 | 1152 assert(check == check2, "name inconsistancy in SystemDictionary"); |
1153 } | |
1154 } ); | |
1155 | |
1156 return k(); | |
1157 } | |
1158 | |
1159 | |
6197 | 1160 void SystemDictionary::set_shared_dictionary(HashtableBucket<mtClass>* t, int length, |
0 | 1161 int number_of_entries) { |
6197 | 1162 assert(length == _nof_buckets * sizeof(HashtableBucket<mtClass>), |
0 | 1163 "bad shared dictionary size."); |
1164 _shared_dictionary = new Dictionary(_nof_buckets, t, number_of_entries); | |
1165 } | |
1166 | |
1167 | |
1168 // If there is a shared dictionary, then find the entry for the | |
1169 // given shared system class, if any. | |
1170 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1171 Klass* SystemDictionary::find_shared_class(Symbol* class_name) { |
0 | 1172 if (shared_dictionary() != NULL) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1173 unsigned int d_hash = shared_dictionary()->compute_hash(class_name, NULL); |
4864
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1174 int d_index = shared_dictionary()->hash_to_index(d_hash); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1175 |
0 | 1176 return shared_dictionary()->find_shared_class(d_index, d_hash, class_name); |
1177 } else { | |
1178 return NULL; | |
1179 } | |
1180 } | |
1181 | |
1182 | |
1183 // Load a class from the shared spaces (found through the shared system | |
1184 // dictionary). Force the superclass and all interfaces to be loaded. | |
1185 // Update the class definition to include sibling classes and no | |
1186 // subclasses (yet). [Classes in the shared space are not part of the | |
1187 // object hierarchy until loaded.] | |
1188 | |
1189 instanceKlassHandle SystemDictionary::load_shared_class( | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1190 Symbol* class_name, Handle class_loader, TRAPS) { |
0 | 1191 instanceKlassHandle ik (THREAD, find_shared_class(class_name)); |
1192 return load_shared_class(ik, class_loader, THREAD); | |
1193 } | |
1194 | |
1195 instanceKlassHandle SystemDictionary::load_shared_class( | |
1196 instanceKlassHandle ik, Handle class_loader, TRAPS) { | |
1197 assert(class_loader.is_null(), "non-null classloader for shared class?"); | |
1198 if (ik.not_null()) { | |
1199 instanceKlassHandle nh = instanceKlassHandle(); // null Handle | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1200 Symbol* class_name = ik->name(); |
0 | 1201 |
1202 // Found the class, now load the superclass and interfaces. If they | |
1203 // are shared, add them to the main system dictionary and reset | |
1204 // their hierarchy references (supers, subs, and interfaces). | |
1205 | |
1206 if (ik->super() != NULL) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1207 Symbol* cn = ik->super()->name(); |
0 | 1208 resolve_super_or_fail(class_name, cn, |
1209 class_loader, Handle(), true, CHECK_(nh)); | |
1210 } | |
1211 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1212 Array<Klass*>* interfaces = ik->local_interfaces(); |
0 | 1213 int num_interfaces = interfaces->length(); |
1214 for (int index = 0; index < num_interfaces; index++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1215 Klass* k = interfaces->at(index); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1216 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1217 // Note: can not use InstanceKlass::cast here because |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1218 // interfaces' InstanceKlass's C++ vtbls haven't been |
0 | 1219 // reinitialized yet (they will be once the interface classes |
1220 // are loaded) | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1221 Symbol* name = k->name(); |
0 | 1222 resolve_super_or_fail(class_name, name, class_loader, Handle(), false, CHECK_(nh)); |
1223 } | |
1224 | |
1225 // Adjust methods to recover missing data. They need addresses for | |
1226 // interpreter entry points and their default native method address | |
1227 // must be reset. | |
1228 | |
1229 // Updating methods must be done under a lock so multiple | |
1230 // threads don't update these in parallel | |
1231 // Shared classes are all currently loaded by the bootstrap | |
1232 // classloader, so this will never cause a deadlock on | |
1233 // a custom class loader lock. | |
1234 | |
1235 { | |
1236 Handle lockObject = compute_loader_lock_object(class_loader, THREAD); | |
1237 check_loader_lock_contention(lockObject, THREAD); | |
1238 ObjectLocker ol(lockObject, THREAD, true); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1239 ik->restore_unshareable_info(CHECK_(nh)); |
0 | 1240 } |
1241 | |
1242 if (TraceClassLoading) { | |
1243 ResourceMark rm; | |
1244 tty->print("[Loaded %s", ik->external_name()); | |
1245 tty->print(" from shared objects file"); | |
1246 tty->print_cr("]"); | |
1247 } | |
1248 // notify a class loaded from shared object | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1249 ClassLoadingService::notify_class_loaded(InstanceKlass::cast(ik()), |
0 | 1250 true /* shared class */); |
1251 } | |
1252 return ik; | |
1253 } | |
1254 | |
8751
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
1255 void SystemDictionary::clean_up_shared_class(instanceKlassHandle ik, Handle class_loader, TRAPS) { |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
1256 // Updating methods must be done under a lock so multiple |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
1257 // threads don't update these in parallel |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
1258 // Shared classes are all currently loaded by the bootstrap |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
1259 // classloader, so this will never cause a deadlock on |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
1260 // a custom class loader lock. |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
1261 { |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
1262 Handle lockObject = compute_loader_lock_object(class_loader, THREAD); |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
1263 check_loader_lock_contention(lockObject, THREAD); |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
1264 ObjectLocker ol(lockObject, THREAD, true); |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
1265 ik->remove_unshareable_info(); |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
1266 } |
1fc4d4768b90
8007725: NPG: Klass::restore_unshareable_info() triggers assert(k->java_mirror() == NULL)
coleenp
parents:
8667
diff
changeset
|
1267 } |
0 | 1268 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1269 instanceKlassHandle SystemDictionary::load_instance_class(Symbol* class_name, Handle class_loader, TRAPS) { |
0 | 1270 instanceKlassHandle nh = instanceKlassHandle(); // null Handle |
1271 if (class_loader.is_null()) { | |
875
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1272 |
0 | 1273 // Search the shared system dictionary for classes preloaded into the |
1274 // shared spaces. | |
1275 instanceKlassHandle k; | |
875
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1276 { |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1277 PerfTraceTime vmtimer(ClassLoader::perf_shared_classload_time()); |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1278 k = load_shared_class(class_name, class_loader, THREAD); |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1279 } |
0 | 1280 |
1281 if (k.is_null()) { | |
1282 // Use VM class loader | |
875
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1283 PerfTraceTime vmtimer(ClassLoader::perf_sys_classload_time()); |
0 | 1284 k = ClassLoader::load_classfile(class_name, CHECK_(nh)); |
1285 } | |
1286 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1287 // find_or_define_instance_class may return a different InstanceKlass |
0 | 1288 if (!k.is_null()) { |
1289 k = find_or_define_instance_class(class_name, class_loader, k, CHECK_(nh)); | |
1290 } | |
1291 return k; | |
1292 } else { | |
1293 // Use user specified class loader to load class. Call loadClass operation on class_loader. | |
1294 ResourceMark rm(THREAD); | |
1295 | |
875
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1296 assert(THREAD->is_Java_thread(), "must be a JavaThread"); |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1297 JavaThread* jt = (JavaThread*) THREAD; |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1298 |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1299 PerfClassTraceTime vmtimer(ClassLoader::perf_app_classload_time(), |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1300 ClassLoader::perf_app_classload_selftime(), |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1301 ClassLoader::perf_app_classload_count(), |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1302 jt->get_thread_stat()->perf_recursion_counts_addr(), |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1303 jt->get_thread_stat()->perf_timers_addr(), |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1304 PerfClassTraceTime::CLASS_LOAD); |
6a93908f268f
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
726
diff
changeset
|
1305 |
0 | 1306 Handle s = java_lang_String::create_from_symbol(class_name, CHECK_(nh)); |
1307 // Translate to external class name format, i.e., convert '/' chars to '.' | |
1308 Handle string = java_lang_String::externalize_classname(s, CHECK_(nh)); | |
1309 | |
1310 JavaValue result(T_OBJECT); | |
1311 | |
1142 | 1312 KlassHandle spec_klass (THREAD, SystemDictionary::ClassLoader_klass()); |
0 | 1313 |
514 | 1314 // Call public unsynchronized loadClass(String) directly for all class loaders |
1315 // for parallelCapable class loaders. JDK >=7, loadClass(String, boolean) will | |
1316 // acquire a class-name based lock rather than the class loader object lock. | |
1317 // JDK < 7 already acquire the class loader lock in loadClass(String, boolean), | |
1318 // so the call to loadClassInternal() was not required. | |
1319 // | |
1320 // UnsyncloadClass flag means both call loadClass(String) and do | |
1321 // not acquire the class loader lock even for class loaders that are | |
1322 // not parallelCapable. This was a risky transitional | |
1323 // flag for diagnostic purposes only. It is risky to call | |
0 | 1324 // custom class loaders without synchronization. |
1325 // WARNING If a custom class loader does NOT synchronizer findClass, or callers of | |
514 | 1326 // findClass, the UnsyncloadClass flag risks unexpected timing bugs in the field. |
0 | 1327 // Do NOT assume this will be supported in future releases. |
514 | 1328 // |
1329 // Added MustCallLoadClassInternal in case we discover in the field | |
1330 // a customer that counts on this call | |
1331 if (MustCallLoadClassInternal && has_loadClassInternal()) { | |
0 | 1332 JavaCalls::call_special(&result, |
1333 class_loader, | |
1334 spec_klass, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1335 vmSymbols::loadClassInternal_name(), |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1336 vmSymbols::string_class_signature(), |
0 | 1337 string, |
1338 CHECK_(nh)); | |
1339 } else { | |
1340 JavaCalls::call_virtual(&result, | |
1341 class_loader, | |
1342 spec_klass, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1343 vmSymbols::loadClass_name(), |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1344 vmSymbols::string_class_signature(), |
0 | 1345 string, |
1346 CHECK_(nh)); | |
1347 } | |
1348 | |
1349 assert(result.get_type() == T_OBJECT, "just checking"); | |
1350 oop obj = (oop) result.get_jobject(); | |
1351 | |
1352 // Primitive classes return null since forName() can not be | |
1353 // used to obtain any of the Class objects representing primitives or void | |
1354 if ((obj != NULL) && !(java_lang_Class::is_primitive(obj))) { | |
1355 instanceKlassHandle k = | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1356 instanceKlassHandle(THREAD, java_lang_Class::as_Klass(obj)); |
0 | 1357 // For user defined Java class loaders, check that the name returned is |
1358 // the same as that requested. This check is done for the bootstrap | |
1359 // loader when parsing the class file. | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1360 if (class_name == k->name()) { |
0 | 1361 return k; |
1362 } | |
1363 } | |
1364 // Class is not found or has the wrong name, return NULL | |
1365 return nh; | |
1366 } | |
1367 } | |
1368 | |
1369 void SystemDictionary::define_instance_class(instanceKlassHandle k, TRAPS) { | |
1370 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1371 ClassLoaderData* loader_data = k->class_loader_data(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1372 Handle class_loader_h(THREAD, loader_data->class_loader()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1373 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1374 for (uintx it = 0; it < GCExpandToAllocateDelayMillis; it++){} |
0 | 1375 |
514 | 1376 // for bootstrap and other parallel classloaders don't acquire lock, |
1377 // use placeholder token | |
1378 // If a parallelCapable class loader calls define_instance_class instead of | |
1379 // find_or_define_instance_class to get here, we have a timing | |
1380 // hole with systemDictionary updates and check_constraints | |
1381 if (!class_loader_h.is_null() && !is_parallelCapable(class_loader_h)) { | |
0 | 1382 assert(ObjectSynchronizer::current_thread_holds_lock((JavaThread*)THREAD, |
1383 compute_loader_lock_object(class_loader_h, THREAD)), | |
1384 "define called without lock"); | |
1385 } | |
1386 | |
1387 // Check class-loading constraints. Throw exception if violation is detected. | |
1388 // Grabs and releases SystemDictionary_lock | |
1389 // The check_constraints/find_class call and update_dictionary sequence | |
1390 // must be "atomic" for a specific class/classloader pair so we never | |
1391 // define two different instanceKlasses for that class/classloader pair. | |
1392 // Existing classloaders will call define_instance_class with the | |
1393 // classloader lock held | |
1394 // Parallel classloaders will call find_or_define_instance_class | |
1395 // which will require a token to perform the define class | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1396 Symbol* name_h = k->name(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1397 unsigned int d_hash = dictionary()->compute_hash(name_h, loader_data); |
0 | 1398 int d_index = dictionary()->hash_to_index(d_hash); |
1399 check_constraints(d_index, d_hash, k, class_loader_h, true, CHECK); | |
1400 | |
6751
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1401 // Register class just loaded with class loader (placed in Vector) |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1402 // Note we do this before updating the dictionary, as this can |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1403 // fail with an OutOfMemoryError (if it does, we will *not* put this |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1404 // class in the dictionary and will not update the class hierarchy). |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1405 // JVMTI FollowReferences needs to find the classes this way. |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1406 if (k->class_loader() != NULL) { |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1407 methodHandle m(THREAD, Universe::loader_addClass_method()); |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1408 JavaValue result(T_VOID); |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1409 JavaCallArguments args(class_loader_h); |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1410 args.push_oop(Handle(THREAD, k->java_mirror())); |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1411 JavaCalls::call(&result, m, &args, CHECK); |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1412 } |
2a48c84f1d04
7197269: NPG: FollowReferences has no ClassLoader -> Class link to follow
coleenp
parents:
6735
diff
changeset
|
1413 |
0 | 1414 // Add the new class. We need recompile lock during update of CHA. |
1415 { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1416 unsigned int p_hash = placeholders()->compute_hash(name_h, loader_data); |
0 | 1417 int p_index = placeholders()->hash_to_index(p_hash); |
1418 | |
1419 MutexLocker mu_r(Compile_lock, THREAD); | |
1420 | |
1421 // Add to class hierarchy, initialize vtables, and do possible | |
1422 // deoptimizations. | |
1423 add_to_hierarchy(k, CHECK); // No exception, but can block | |
1424 | |
1425 // Add to systemDictionary - so other classes can see it. | |
1426 // Grabs and releases SystemDictionary_lock | |
1427 update_dictionary(d_index, d_hash, p_index, p_hash, | |
1428 k, class_loader_h, THREAD); | |
1429 } | |
1430 k->eager_initialize(THREAD); | |
1431 | |
1432 // notify jvmti | |
1433 if (JvmtiExport::should_post_class_load()) { | |
1434 assert(THREAD->is_Java_thread(), "thread->is_Java_thread()"); | |
1435 JvmtiExport::post_class_load((JavaThread *) THREAD, k()); | |
1436 | |
1437 } | |
1438 } | |
1439 | |
1440 // Support parallel classloading | |
1075
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
1441 // All parallel class loaders, including bootstrap classloader |
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
1442 // lock a placeholder entry for this class/class_loader pair |
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
1443 // to allow parallel defines of different classes for this class loader |
514 | 1444 // With AllowParallelDefine flag==true, in case they do not synchronize around |
1445 // FindLoadedClass/DefineClass, calls, we check for parallel | |
0 | 1446 // loading for them, wait if a defineClass is in progress |
1447 // and return the initial requestor's results | |
1075
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
1448 // This flag does not apply to the bootstrap classloader. |
514 | 1449 // With AllowParallelDefine flag==false, call through to define_instance_class |
1450 // which will throw LinkageError: duplicate class definition. | |
1075
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
1451 // False is the requested default. |
0 | 1452 // For better performance, the class loaders should synchronize |
514 | 1453 // findClass(), i.e. FindLoadedClass/DefineClassIfAbsent or they |
0 | 1454 // potentially waste time reading and parsing the bytestream. |
1455 // Note: VM callers should ensure consistency of k/class_name,class_loader | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1456 instanceKlassHandle SystemDictionary::find_or_define_instance_class(Symbol* class_name, Handle class_loader, instanceKlassHandle k, TRAPS) { |
0 | 1457 |
1458 instanceKlassHandle nh = instanceKlassHandle(); // null Handle | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1459 Symbol* name_h = k->name(); // passed in class_name may be null |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1460 ClassLoaderData* loader_data = class_loader_data(class_loader); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1461 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1462 unsigned int d_hash = dictionary()->compute_hash(name_h, loader_data); |
0 | 1463 int d_index = dictionary()->hash_to_index(d_hash); |
1464 | |
1465 // Hold SD lock around find_class and placeholder creation for DEFINE_CLASS | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1466 unsigned int p_hash = placeholders()->compute_hash(name_h, loader_data); |
0 | 1467 int p_index = placeholders()->hash_to_index(p_hash); |
1468 PlaceholderEntry* probe; | |
1469 | |
1470 { | |
1471 MutexLocker mu(SystemDictionary_lock, THREAD); | |
1472 // First check if class already defined | |
1075
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
1473 if (UnsyncloadClass || (is_parallelDefine(class_loader))) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1474 Klass* check = find_class(d_index, d_hash, name_h, loader_data); |
1075
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
1475 if (check != NULL) { |
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
1476 return(instanceKlassHandle(THREAD, check)); |
a75edfd400ea
6893504: LinkageError for bootstrap duplicate class definitions.
acorn
parents:
1039
diff
changeset
|
1477 } |
0 | 1478 } |
1479 | |
1480 // Acquire define token for this class/classloader | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1481 probe = placeholders()->find_and_add(p_index, p_hash, name_h, loader_data, PlaceholderTable::DEFINE_CLASS, NULL, THREAD); |
514 | 1482 // Wait if another thread defining in parallel |
1483 // All threads wait - even those that will throw duplicate class: otherwise | |
1484 // caller is surprised by LinkageError: duplicate, but findLoadedClass fails | |
1485 // if other thread has not finished updating dictionary | |
1486 while (probe->definer() != NULL) { | |
1487 SystemDictionary_lock->wait(); | |
1488 } | |
1489 // Only special cases allow parallel defines and can use other thread's results | |
1490 // Other cases fall through, and may run into duplicate defines | |
1491 // caught by finding an entry in the SystemDictionary | |
6983 | 1492 if ((UnsyncloadClass || is_parallelDefine(class_loader)) && (probe->instance_klass() != NULL)) { |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
1493 placeholders()->find_and_remove(p_index, p_hash, name_h, loader_data, PlaceholderTable::DEFINE_CLASS, THREAD); |
514 | 1494 SystemDictionary_lock->notify_all(); |
0 | 1495 #ifdef ASSERT |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1496 Klass* check = find_class(d_index, d_hash, name_h, loader_data); |
514 | 1497 assert(check != NULL, "definer missed recording success"); |
0 | 1498 #endif |
6983 | 1499 return(instanceKlassHandle(THREAD, probe->instance_klass())); |
0 | 1500 } else { |
514 | 1501 // This thread will define the class (even if earlier thread tried and had an error) |
1502 probe->set_definer(THREAD); | |
0 | 1503 } |
1504 } | |
1505 | |
1506 define_instance_class(k, THREAD); | |
1507 | |
1508 Handle linkage_exception = Handle(); // null handle | |
1509 | |
1510 // definer must notify any waiting threads | |
1511 { | |
1512 MutexLocker mu(SystemDictionary_lock, THREAD); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1513 PlaceholderEntry* probe = placeholders()->get_entry(p_index, p_hash, name_h, loader_data); |
0 | 1514 assert(probe != NULL, "DEFINE_CLASS placeholder lost?"); |
1515 if (probe != NULL) { | |
1516 if (HAS_PENDING_EXCEPTION) { | |
1517 linkage_exception = Handle(THREAD,PENDING_EXCEPTION); | |
1518 CLEAR_PENDING_EXCEPTION; | |
1519 } else { | |
6983 | 1520 probe->set_instance_klass(k()); |
0 | 1521 } |
1522 probe->set_definer(NULL); | |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
1523 placeholders()->find_and_remove(p_index, p_hash, name_h, loader_data, PlaceholderTable::DEFINE_CLASS, THREAD); |
0 | 1524 SystemDictionary_lock->notify_all(); |
1525 } | |
1526 } | |
1527 | |
1528 // Can't throw exception while holding lock due to rank ordering | |
1529 if (linkage_exception() != NULL) { | |
1530 THROW_OOP_(linkage_exception(), nh); // throws exception and returns | |
1531 } | |
1532 | |
1533 return k; | |
1534 } | |
1535 Handle SystemDictionary::compute_loader_lock_object(Handle class_loader, TRAPS) { | |
1536 // If class_loader is NULL we synchronize on _system_loader_lock_obj | |
1537 if (class_loader.is_null()) { | |
1538 return Handle(THREAD, _system_loader_lock_obj); | |
1539 } else { | |
1540 return class_loader; | |
1541 } | |
1542 } | |
1543 | |
1544 // This method is added to check how often we have to wait to grab loader | |
1545 // lock. The results are being recorded in the performance counters defined in | |
1546 // ClassLoader::_sync_systemLoaderLockContentionRate and | |
1547 // ClassLoader::_sync_nonSystemLoaderLockConteionRate. | |
1548 void SystemDictionary::check_loader_lock_contention(Handle loader_lock, TRAPS) { | |
1549 if (!UsePerfData) { | |
1550 return; | |
1551 } | |
1552 | |
1553 assert(!loader_lock.is_null(), "NULL lock object"); | |
1554 | |
1555 if (ObjectSynchronizer::query_lock_ownership((JavaThread*)THREAD, loader_lock) | |
1556 == ObjectSynchronizer::owner_other) { | |
1557 // contention will likely happen, so increment the corresponding | |
1558 // contention counter. | |
1559 if (loader_lock() == _system_loader_lock_obj) { | |
1560 ClassLoader::sync_systemLoaderLockContentionRate()->inc(); | |
1561 } else { | |
1562 ClassLoader::sync_nonSystemLoaderLockContentionRate()->inc(); | |
1563 } | |
1564 } | |
1565 } | |
1566 | |
1567 // ---------------------------------------------------------------------------- | |
1568 // Lookup | |
1569 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1570 Klass* SystemDictionary::find_class(int index, unsigned int hash, |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1571 Symbol* class_name, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1572 ClassLoaderData* loader_data) { |
0 | 1573 assert_locked_or_safepoint(SystemDictionary_lock); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1574 assert (index == dictionary()->index_for(class_name, loader_data), |
0 | 1575 "incorrect index?"); |
1576 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1577 Klass* k = dictionary()->find_class(index, hash, class_name, loader_data); |
0 | 1578 return k; |
1579 } | |
1580 | |
1581 | |
1582 // Basic find on classes in the midst of being loaded | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1583 Symbol* SystemDictionary::find_placeholder(Symbol* class_name, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1584 ClassLoaderData* loader_data) { |
0 | 1585 assert_locked_or_safepoint(SystemDictionary_lock); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1586 unsigned int p_hash = placeholders()->compute_hash(class_name, loader_data); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1587 int p_index = placeholders()->hash_to_index(p_hash); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1588 return placeholders()->find_entry(p_index, p_hash, class_name, loader_data); |
0 | 1589 } |
1590 | |
1591 | |
1592 // Used for assertions and verification only | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1593 Klass* SystemDictionary::find_class(Symbol* class_name, ClassLoaderData* loader_data) { |
0 | 1594 #ifndef ASSERT |
9071
68fe50d4f1d5
8011343: Add new flag for verifying the heap during startup
johnc
parents:
8880
diff
changeset
|
1595 guarantee(VerifyBeforeGC || |
68fe50d4f1d5
8011343: Add new flag for verifying the heap during startup
johnc
parents:
8880
diff
changeset
|
1596 VerifyDuringGC || |
68fe50d4f1d5
8011343: Add new flag for verifying the heap during startup
johnc
parents:
8880
diff
changeset
|
1597 VerifyBeforeExit || |
68fe50d4f1d5
8011343: Add new flag for verifying the heap during startup
johnc
parents:
8880
diff
changeset
|
1598 VerifyDuringStartup || |
0 | 1599 VerifyAfterGC, "too expensive"); |
1600 #endif | |
1601 assert_locked_or_safepoint(SystemDictionary_lock); | |
1602 | |
1603 // First look in the loaded class array | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1604 unsigned int d_hash = dictionary()->compute_hash(class_name, loader_data); |
0 | 1605 int d_index = dictionary()->hash_to_index(d_hash); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1606 return find_class(d_index, d_hash, class_name, loader_data); |
0 | 1607 } |
1608 | |
1609 | |
1610 // Get the next class in the diictionary. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1611 Klass* SystemDictionary::try_get_next_class() { |
0 | 1612 return dictionary()->try_get_next_class(); |
1613 } | |
1614 | |
1615 | |
1616 // ---------------------------------------------------------------------------- | |
1617 // Update hierachy. This is done before the new klass has been added to the SystemDictionary. The Recompile_lock | |
1618 // is held, to ensure that the compiler is not using the class hierachy, and that deoptimization will kick in | |
1619 // before a new class is used. | |
1620 | |
1621 void SystemDictionary::add_to_hierarchy(instanceKlassHandle k, TRAPS) { | |
1622 assert(k.not_null(), "just checking"); | |
2244
4f26f535a225
6354181: nsk.logging.stress.threads.scmhml001 fails assertion in "src/share/vm/oops/instanceKlass.cpp, 111"
never
parents:
2177
diff
changeset
|
1623 assert_locked_or_safepoint(Compile_lock); |
4f26f535a225
6354181: nsk.logging.stress.threads.scmhml001 fails assertion in "src/share/vm/oops/instanceKlass.cpp, 111"
never
parents:
2177
diff
changeset
|
1624 |
0 | 1625 // Link into hierachy. Make sure the vtables are initialized before linking into |
1626 k->append_to_sibling_list(); // add to superklass/sibling list | |
1627 k->process_interfaces(THREAD); // handle all "implements" declarations | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1628 k->set_init_state(InstanceKlass::loaded); |
0 | 1629 // Now flush all code that depended on old class hierarchy. |
1630 // Note: must be done *after* linking k into the hierarchy (was bug 12/9/97) | |
1631 // Also, first reinitialize vtable because it may have gotten out of synch | |
1632 // while the new class wasn't connected to the class hierarchy. | |
1633 Universe::flush_dependents_on(k); | |
1634 } | |
1635 | |
1636 | |
1637 // ---------------------------------------------------------------------------- | |
1638 // GC support | |
1639 | |
1640 // Following roots during mark-sweep is separated in two phases. | |
1641 // | |
1642 // The first phase follows preloaded classes and all other system | |
1643 // classes, since these will never get unloaded anyway. | |
1644 // | |
1645 // The second phase removes (unloads) unreachable classes from the | |
1646 // system dictionary and follows the remaining classes' contents. | |
1647 | |
1648 void SystemDictionary::always_strong_oops_do(OopClosure* blk) { | |
1649 blk->do_oop(&_java_system_loader); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1650 blk->do_oop(&_system_loader_lock_obj); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1651 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1652 dictionary()->always_strong_oops_do(blk); |
6864
dd2b66d09ccd
8000659: NPG: ClassCastExceptions are unexpectedly thrown when testing nashorn
stefank
parents:
6822
diff
changeset
|
1653 |
dd2b66d09ccd
8000659: NPG: ClassCastExceptions are unexpectedly thrown when testing nashorn
stefank
parents:
6822
diff
changeset
|
1654 // Visit extra methods |
dd2b66d09ccd
8000659: NPG: ClassCastExceptions are unexpectedly thrown when testing nashorn
stefank
parents:
6822
diff
changeset
|
1655 invoke_method_table()->oops_do(blk); |
0 | 1656 } |
1657 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1658 void SystemDictionary::always_strong_classes_do(KlassClosure* closure) { |
0 | 1659 // Follow all system classes and temporary placeholders in dictionary |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1660 dictionary()->always_strong_classes_do(closure); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1661 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1662 // Placeholders. These represent classes we're actively loading. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1663 placeholders()->classes_do(closure); |
0 | 1664 } |
1665 | |
4864
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1666 // Calculate a "good" systemdictionary size based |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1667 // on predicted or current loaded classes count |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1668 int SystemDictionary::calculate_systemdictionary_size(int classcount) { |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1669 int newsize = _old_default_sdsize; |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1670 if ((classcount > 0) && !DumpSharedSpaces) { |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1671 int desiredsize = classcount/_average_depth_goal; |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1672 for (newsize = _primelist[_sdgeneration]; _sdgeneration < _prime_array_size -1; |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1673 newsize = _primelist[++_sdgeneration]) { |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1674 if (desiredsize <= newsize) { |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1675 break; |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1676 } |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1677 } |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1678 } |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1679 return newsize; |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1680 } |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
1681 // Assumes classes in the SystemDictionary are only unloaded at a safepoint |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
1682 // Note: anonymous classes are not in the SD. |
0 | 1683 bool SystemDictionary::do_unloading(BoolObjectClosure* is_alive) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1684 // First, mark for unload all ClassLoaderData referencing a dead class loader. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1685 bool has_dead_loaders = ClassLoaderDataGraph::do_unloading(is_alive); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1686 bool unloading_occurred = false; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1687 if (has_dead_loaders) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1688 unloading_occurred = dictionary()->do_unloading(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1689 constraints()->purge_loader_constraints(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1690 resolution_errors()->purge_resolution_errors(); |
0 | 1691 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1692 return unloading_occurred; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1693 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1694 |
0 | 1695 void SystemDictionary::oops_do(OopClosure* f) { |
1696 f->do_oop(&_java_system_loader); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1697 f->do_oop(&_system_loader_lock_obj); |
0 | 1698 |
1699 // Adjust dictionary | |
1700 dictionary()->oops_do(f); | |
1701 | |
710 | 1702 // Visit extra methods |
1903 | 1703 invoke_method_table()->oops_do(f); |
0 | 1704 } |
1705 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1706 // Extended Class redefinition support. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1707 // If one of these classes is replaced, we need to replace it in these places. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1708 // KlassClosure::do_klass should take the address of a class but we can |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1709 // change that later. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1710 void SystemDictionary::preloaded_classes_do(KlassClosure* f) { |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1711 for (int k = (int)FIRST_WKID; k < (int)WKID_LIMIT; k++) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1712 f->do_klass(_well_known_klasses[k]); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1713 } |
0 | 1714 |
1715 { | |
1716 for (int i = 0; i < T_VOID+1; i++) { | |
1717 if (_box_klasses[i] != NULL) { | |
1718 assert(i >= T_BOOLEAN, "checking"); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1719 f->do_klass(_box_klasses[i]); |
0 | 1720 } |
1721 } | |
1722 } | |
1723 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1724 FilteredFieldsMap::classes_do(f); |
0 | 1725 } |
1726 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1727 void SystemDictionary::lazily_loaded_classes_do(KlassClosure* f) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1728 f->do_klass(_abstract_ownable_synchronizer_klass); |
0 | 1729 } |
1730 | |
1731 // Just the classes from defining class loaders | |
1732 // Don't iterate over placeholders | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1733 void SystemDictionary::classes_do(void f(Klass*)) { |
0 | 1734 dictionary()->classes_do(f); |
1735 } | |
1736 | |
1737 // Added for initialize_itable_for_klass | |
1738 // Just the classes from defining class loaders | |
1739 // Don't iterate over placeholders | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1740 void SystemDictionary::classes_do(void f(Klass*, TRAPS), TRAPS) { |
0 | 1741 dictionary()->classes_do(f, CHECK); |
1742 } | |
1743 | |
1744 // All classes, and their class loaders | |
1745 // Don't iterate over placeholders | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1746 void SystemDictionary::classes_do(void f(Klass*, ClassLoaderData*)) { |
0 | 1747 dictionary()->classes_do(f); |
1748 } | |
1749 | |
1750 // All classes, and their class loaders | |
1751 // (added for helpers that use HandleMarks and ResourceMarks) | |
1752 // Don't iterate over placeholders | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1753 void SystemDictionary::classes_do(void f(Klass*, ClassLoaderData*, TRAPS), TRAPS) { |
0 | 1754 dictionary()->classes_do(f, CHECK); |
1755 } | |
1756 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1757 void SystemDictionary::placeholders_do(void f(Symbol*)) { |
0 | 1758 placeholders()->entries_do(f); |
1759 } | |
1760 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1761 void SystemDictionary::methods_do(void f(Method*)) { |
0 | 1762 dictionary()->methods_do(f); |
1903 | 1763 invoke_method_table()->methods_do(f); |
0 | 1764 } |
1765 | |
1766 // ---------------------------------------------------------------------------- | |
1767 // Lazily load klasses | |
1768 | |
1769 void SystemDictionary::load_abstract_ownable_synchronizer_klass(TRAPS) { | |
1770 assert(JDK_Version::is_gte_jdk16x_version(), "Must be JDK 1.6 or later"); | |
1771 | |
1772 // if multiple threads calling this function, only one thread will load | |
1773 // the class. The other threads will find the loaded version once the | |
1774 // class is loaded. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1775 Klass* aos = _abstract_ownable_synchronizer_klass; |
0 | 1776 if (aos == NULL) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1777 Klass* k = resolve_or_fail(vmSymbols::java_util_concurrent_locks_AbstractOwnableSynchronizer(), true, CHECK); |
0 | 1778 // Force a fence to prevent any read before the write completes |
1779 OrderAccess::fence(); | |
1780 _abstract_ownable_synchronizer_klass = k; | |
1781 } | |
1782 } | |
1783 | |
1784 // ---------------------------------------------------------------------------- | |
1785 // Initialization | |
1786 | |
1787 void SystemDictionary::initialize(TRAPS) { | |
1788 // Allocate arrays | |
1789 assert(dictionary() == NULL, | |
1790 "SystemDictionary should only be initialized once"); | |
4864
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1791 _sdgeneration = 0; |
b2cd0ee8f778
7114376: Make system dictionary hashtable bucket array size configurable
acorn
parents:
4800
diff
changeset
|
1792 _dictionary = new Dictionary(calculate_systemdictionary_size(PredictedLoadedClassCount)); |
1903 | 1793 _placeholders = new PlaceholderTable(_nof_buckets); |
0 | 1794 _number_of_modifications = 0; |
1903 | 1795 _loader_constraints = new LoaderConstraintTable(_loader_constraint_size); |
1796 _resolution_errors = new ResolutionErrorTable(_resolution_error_size); | |
1797 _invoke_method_table = new SymbolPropertyTable(_invoke_method_size); | |
0 | 1798 |
1799 // Allocate private object used as system class loader lock | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1800 _system_loader_lock_obj = oopFactory::new_intArray(0, CHECK); |
0 | 1801 // Initialize basic classes |
1802 initialize_preloaded_classes(CHECK); | |
1803 } | |
1804 | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1805 // Compact table of directions on the initialization of klasses: |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1806 static const short wk_init_info[] = { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1807 #define WK_KLASS_INIT_INFO(name, symbol, option) \ |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1808 ( ((int)vmSymbols::VM_SYMBOL_ENUM_NAME(symbol) \ |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1809 << SystemDictionary::CEIL_LG_OPTION_LIMIT) \ |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1810 | (int)SystemDictionary::option ), |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1811 WK_KLASSES_DO(WK_KLASS_INIT_INFO) |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1812 #undef WK_KLASS_INIT_INFO |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1813 0 |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1814 }; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1815 |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1816 bool SystemDictionary::initialize_wk_klass(WKID id, int init_opt, TRAPS) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1817 assert(id >= (int)FIRST_WKID && id < (int)WKID_LIMIT, "oob"); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1818 int info = wk_init_info[id - FIRST_WKID]; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1819 int sid = (info >> CEIL_LG_OPTION_LIMIT); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1820 Symbol* symbol = vmSymbols::symbol_at((vmSymbols::SID)sid); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1821 Klass** klassp = &_well_known_klasses[id]; |
2460 | 1822 bool must_load = (init_opt < SystemDictionary::Opt); |
7951 | 1823 if ((*klassp) == NULL) { |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1824 if (must_load) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1825 (*klassp) = resolve_or_fail(symbol, true, CHECK_0); // load required class |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1826 } else { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1827 (*klassp) = resolve_or_null(symbol, CHECK_0); // load optional klass |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1828 } |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1829 } |
2460 | 1830 return ((*klassp) != NULL); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1831 } |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1832 |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1833 void SystemDictionary::initialize_wk_klasses_until(WKID limit_id, WKID &start_id, TRAPS) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1834 assert((int)start_id <= (int)limit_id, "IDs are out of order!"); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1835 for (int id = (int)start_id; id < (int)limit_id; id++) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1836 assert(id >= (int)FIRST_WKID && id < (int)WKID_LIMIT, "oob"); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1837 int info = wk_init_info[id - FIRST_WKID]; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1838 int sid = (info >> CEIL_LG_OPTION_LIMIT); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1839 int opt = (info & right_n_bits(CEIL_LG_OPTION_LIMIT)); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1840 |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1841 initialize_wk_klass((WKID)id, opt, CHECK); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1842 } |
710 | 1843 |
1844 // move the starting value forward to the limit: | |
1845 start_id = limit_id; | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1846 } |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1847 |
0 | 1848 void SystemDictionary::initialize_preloaded_classes(TRAPS) { |
1142 | 1849 assert(WK_KLASS(Object_klass) == NULL, "preloaded classes should only be initialized once"); |
0 | 1850 // Preload commonly used klasses |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1851 WKID scan = FIRST_WKID; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1852 // first do Object, then String, Class |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1853 if (UseSharedSpaces) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1854 initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Object_klass), scan, CHECK); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1855 // Initialize the constant pool for the Object_class |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1856 InstanceKlass* ik = InstanceKlass::cast(Object_klass()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1857 ik->constants()->restore_unshareable_info(CHECK); |
6733
fa6e618671d7
7195867: NPG: SAJDI tests fail with sun.jvm.hotspot.types.WrongTypeException: No suitable match for type
coleenp
parents:
6725
diff
changeset
|
1858 initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1859 } else { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1860 initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1861 } |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1862 |
6057 | 1863 // Calculate offsets for String and Class classes since they are loaded and |
1864 // can be used after this point. | |
1865 java_lang_String::compute_offsets(); | |
3938 | 1866 java_lang_Class::compute_offsets(); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1867 |
0 | 1868 // Fixup mirrors for classes loaded before java.lang.Class. |
1869 // These calls iterate over the objects currently in the perm gen | |
1870 // so calling them at this point is matters (not before when there | |
1871 // are fewer objects and not later after there are more objects | |
1872 // in the perm gen. | |
1873 Universe::initialize_basic_type_mirrors(CHECK); | |
1874 Universe::fixup_mirrors(CHECK); | |
1875 | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1876 // do a bunch more: |
1142 | 1877 initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Reference_klass), scan, CHECK); |
0 | 1878 |
1879 // Preload ref klasses and set reference types | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1880 InstanceKlass::cast(WK_KLASS(Reference_klass))->set_reference_type(REF_OTHER); |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6733
diff
changeset
|
1881 InstanceRefKlass::update_nonstatic_oop_maps(WK_KLASS(Reference_klass)); |
0 | 1882 |
1142 | 1883 initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(PhantomReference_klass), scan, CHECK); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1884 InstanceKlass::cast(WK_KLASS(SoftReference_klass))->set_reference_type(REF_SOFT); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1885 InstanceKlass::cast(WK_KLASS(WeakReference_klass))->set_reference_type(REF_WEAK); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1886 InstanceKlass::cast(WK_KLASS(FinalReference_klass))->set_reference_type(REF_FINAL); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1887 InstanceKlass::cast(WK_KLASS(PhantomReference_klass))->set_reference_type(REF_PHANTOM); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1888 |
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2357
diff
changeset
|
1889 // JSR 292 classes |
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2357
diff
changeset
|
1890 WKID jsr292_group_start = WK_KLASS_ENUM_NAME(MethodHandle_klass); |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
3785
diff
changeset
|
1891 WKID jsr292_group_end = WK_KLASS_ENUM_NAME(VolatileCallSite_klass); |
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2357
diff
changeset
|
1892 initialize_wk_klasses_until(jsr292_group_start, scan, CHECK); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
1893 if (EnableInvokeDynamic) { |
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2357
diff
changeset
|
1894 initialize_wk_klasses_through(jsr292_group_end, scan, CHECK); |
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2357
diff
changeset
|
1895 } else { |
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2357
diff
changeset
|
1896 // Skip the JSR 292 classes, if not enabled. |
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2357
diff
changeset
|
1897 scan = WKID(jsr292_group_end + 1); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
1898 } |
710 | 1899 |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1900 initialize_wk_klasses_until(WKID_LIMIT, scan, CHECK); |
0 | 1901 |
1142 | 1902 _box_klasses[T_BOOLEAN] = WK_KLASS(Boolean_klass); |
1903 _box_klasses[T_CHAR] = WK_KLASS(Character_klass); | |
1904 _box_klasses[T_FLOAT] = WK_KLASS(Float_klass); | |
1905 _box_klasses[T_DOUBLE] = WK_KLASS(Double_klass); | |
1906 _box_klasses[T_BYTE] = WK_KLASS(Byte_klass); | |
1907 _box_klasses[T_SHORT] = WK_KLASS(Short_klass); | |
1908 _box_klasses[T_INT] = WK_KLASS(Integer_klass); | |
1909 _box_klasses[T_LONG] = WK_KLASS(Long_klass); | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1910 //_box_klasses[T_OBJECT] = WK_KLASS(object_klass); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
22
diff
changeset
|
1911 //_box_klasses[T_ARRAY] = WK_KLASS(object_klass); |
0 | 1912 |
1913 { // Compute whether we should use loadClass or loadClassInternal when loading classes. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1914 Method* method = InstanceKlass::cast(ClassLoader_klass())->find_method(vmSymbols::loadClassInternal_name(), vmSymbols::string_class_signature()); |
0 | 1915 _has_loadClassInternal = (method != NULL); |
1916 } | |
1917 { // Compute whether we should use checkPackageAccess or NOT | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1918 Method* method = InstanceKlass::cast(ClassLoader_klass())->find_method(vmSymbols::checkPackageAccess_name(), vmSymbols::class_protectiondomain_signature()); |
0 | 1919 _has_checkPackageAccess = (method != NULL); |
1920 } | |
1921 } | |
1922 | |
1923 // Tells if a given klass is a box (wrapper class, such as java.lang.Integer). | |
1924 // If so, returns the basic type it holds. If not, returns T_OBJECT. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1925 BasicType SystemDictionary::box_klass_type(Klass* k) { |
0 | 1926 assert(k != NULL, ""); |
1927 for (int i = T_BOOLEAN; i < T_VOID+1; i++) { | |
1928 if (_box_klasses[i] == k) | |
1929 return (BasicType)i; | |
1930 } | |
1931 return T_OBJECT; | |
1932 } | |
1933 | |
1934 // Constraints on class loaders. The details of the algorithm can be | |
1935 // found in the OOPSLA'98 paper "Dynamic Class Loading in the Java | |
1936 // Virtual Machine" by Sheng Liang and Gilad Bracha. The basic idea is | |
1937 // that the system dictionary needs to maintain a set of contraints that | |
1938 // must be satisfied by all classes in the dictionary. | |
1939 // if defining is true, then LinkageError if already in systemDictionary | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1940 // if initiating loader, then ok if InstanceKlass matches existing entry |
0 | 1941 |
1942 void SystemDictionary::check_constraints(int d_index, unsigned int d_hash, | |
1943 instanceKlassHandle k, | |
1944 Handle class_loader, bool defining, | |
1945 TRAPS) { | |
1946 const char *linkage_error = NULL; | |
1947 { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1948 Symbol* name = k->name(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1949 ClassLoaderData *loader_data = class_loader_data(class_loader); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1950 |
0 | 1951 MutexLocker mu(SystemDictionary_lock, THREAD); |
1952 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1953 Klass* check = find_class(d_index, d_hash, name, loader_data); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1954 if (check != (Klass*)NULL) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1955 // if different InstanceKlass - duplicate class definition, |
0 | 1956 // else - ok, class loaded by a different thread in parallel, |
1957 // we should only have found it if it was done loading and ok to use | |
1958 // system dictionary only holds instance classes, placeholders | |
1959 // also holds array classes | |
1960 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1961 assert(check->oop_is_instance(), "noninstance in systemdictionary"); |
0 | 1962 if ((defining == true) || (k() != check)) { |
1963 linkage_error = "loader (instance of %s): attempted duplicate class " | |
1964 "definition for name: \"%s\""; | |
1965 } else { | |
1966 return; | |
1967 } | |
1968 } | |
1969 | |
1970 #ifdef ASSERT | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
1971 Symbol* ph_check = find_placeholder(name, loader_data); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
1972 assert(ph_check == NULL || ph_check == name, "invalid symbol"); |
0 | 1973 #endif |
1974 | |
1975 if (linkage_error == NULL) { | |
1976 if (constraints()->check_or_update(k, class_loader, name) == false) { | |
1977 linkage_error = "loader constraint violation: loader (instance of %s)" | |
1978 " previously initiated loading for a different type with name \"%s\""; | |
1979 } | |
1980 } | |
1981 } | |
1982 | |
1983 // Throw error now if needed (cannot throw while holding | |
1984 // SystemDictionary_lock because of rank ordering) | |
1985 | |
1986 if (linkage_error) { | |
1987 ResourceMark rm(THREAD); | |
1988 const char* class_loader_name = loader_name(class_loader()); | |
1989 char* type_name = k->name()->as_C_string(); | |
1990 size_t buflen = strlen(linkage_error) + strlen(class_loader_name) + | |
1991 strlen(type_name); | |
1992 char* buf = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, buflen); | |
1993 jio_snprintf(buf, buflen, linkage_error, class_loader_name, type_name); | |
1994 THROW_MSG(vmSymbols::java_lang_LinkageError(), buf); | |
1995 } | |
1996 } | |
1997 | |
1998 | |
1999 // Update system dictionary - done after check_constraint and add_to_hierachy | |
2000 // have been called. | |
2001 void SystemDictionary::update_dictionary(int d_index, unsigned int d_hash, | |
2002 int p_index, unsigned int p_hash, | |
2003 instanceKlassHandle k, | |
2004 Handle class_loader, | |
2005 TRAPS) { | |
2006 // Compile_lock prevents systemDictionary updates during compilations | |
2007 assert_locked_or_safepoint(Compile_lock); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2008 Symbol* name = k->name(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2009 ClassLoaderData *loader_data = class_loader_data(class_loader); |
0 | 2010 |
2011 { | |
2012 MutexLocker mu1(SystemDictionary_lock, THREAD); | |
2013 | |
2014 // See whether biased locking is enabled and if so set it for this | |
2015 // klass. | |
2016 // Note that this must be done past the last potential blocking | |
2017 // point / safepoint. We enable biased locking lazily using a | |
2018 // VM_Operation to iterate the SystemDictionary and installing the | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2019 // biasable mark word into each InstanceKlass's prototype header. |
0 | 2020 // To avoid race conditions where we accidentally miss enabling the |
2021 // optimization for one class in the process of being added to the | |
2022 // dictionary, we must not safepoint after the test of | |
2023 // BiasedLocking::enabled(). | |
2024 if (UseBiasedLocking && BiasedLocking::enabled()) { | |
2025 // Set biased locking bit for all loaded classes; it will be | |
2026 // cleared if revocation occurs too often for this type | |
2027 // NOTE that we must only do this when the class is initally | |
2028 // defined, not each time it is referenced from a new class loader | |
2029 if (k->class_loader() == class_loader()) { | |
2030 k->set_prototype_header(markOopDesc::biased_locking_prototype()); | |
2031 } | |
2032 } | |
2033 | |
4800
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
3938
diff
changeset
|
2034 // Assign a classid if one has not already been assigned. The |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
3938
diff
changeset
|
2035 // counter does not need to be atomically incremented since this |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
3938
diff
changeset
|
2036 // is only done while holding the SystemDictionary_lock. |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
3938
diff
changeset
|
2037 // All loaded classes get a unique ID. |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
3938
diff
changeset
|
2038 TRACE_INIT_ID(k); |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
3938
diff
changeset
|
2039 |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
2040 // Make a new system dictionary entry. |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2041 Klass* sd_check = find_class(d_index, d_hash, name, loader_data); |
0 | 2042 if (sd_check == NULL) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2043 dictionary()->add_klass(name, loader_data, k); |
0 | 2044 notice_modification(); |
2045 } | |
2046 #ifdef ASSERT | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2047 sd_check = find_class(d_index, d_hash, name, loader_data); |
0 | 2048 assert (sd_check != NULL, "should have entry in system dictionary"); |
7582
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
2049 // Note: there may be a placeholder entry: for circularity testing |
aefb345d3f5e
7199207: NPG: Crash in PlaceholderTable::verify after StackOverflow
acorn
parents:
7185
diff
changeset
|
2050 // or for parallel defines |
0 | 2051 #endif |
2052 SystemDictionary_lock->notify_all(); | |
2053 } | |
2054 } | |
2055 | |
2056 | |
2244
4f26f535a225
6354181: nsk.logging.stress.threads.scmhml001 fails assertion in "src/share/vm/oops/instanceKlass.cpp, 111"
never
parents:
2177
diff
changeset
|
2057 // Try to find a class name using the loader constraints. The |
4f26f535a225
6354181: nsk.logging.stress.threads.scmhml001 fails assertion in "src/share/vm/oops/instanceKlass.cpp, 111"
never
parents:
2177
diff
changeset
|
2058 // loader constraints might know about a class that isn't fully loaded |
4f26f535a225
6354181: nsk.logging.stress.threads.scmhml001 fails assertion in "src/share/vm/oops/instanceKlass.cpp, 111"
never
parents:
2177
diff
changeset
|
2059 // yet and these will be ignored. |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2060 Klass* SystemDictionary::find_constrained_instance_or_array_klass( |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2061 Symbol* class_name, Handle class_loader, TRAPS) { |
0 | 2062 |
2063 // First see if it has been loaded directly. | |
2064 // Force the protection domain to be null. (This removes protection checks.) | |
2065 Handle no_protection_domain; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2066 Klass* klass = find_instance_or_array_klass(class_name, class_loader, |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
2067 no_protection_domain, CHECK_NULL); |
0 | 2068 if (klass != NULL) |
2069 return klass; | |
2070 | |
2071 // Now look to see if it has been loaded elsewhere, and is subject to | |
2072 // a loader constraint that would require this loader to return the | |
2073 // klass that is already loaded. | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2074 if (FieldType::is_array(class_name)) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2075 // For array classes, their Klass*s are not kept in the |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2076 // constraint table. The element Klass*s are. |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2077 FieldArrayInfo fd; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2078 BasicType t = FieldType::get_array_info(class_name, fd, CHECK_(NULL)); |
0 | 2079 if (t != T_OBJECT) { |
2080 klass = Universe::typeArrayKlassObj(t); | |
2081 } else { | |
2082 MutexLocker mu(SystemDictionary_lock, THREAD); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2083 klass = constraints()->find_constrained_klass(fd.object_key(), class_loader); |
0 | 2084 } |
1336 | 2085 // If element class already loaded, allocate array klass |
0 | 2086 if (klass != NULL) { |
6983 | 2087 klass = klass->array_klass_or_null(fd.dimension()); |
0 | 2088 } |
2089 } else { | |
2090 MutexLocker mu(SystemDictionary_lock, THREAD); | |
2091 // Non-array classes are easy: simply check the constraint table. | |
2092 klass = constraints()->find_constrained_klass(class_name, class_loader); | |
2093 } | |
2094 | |
2095 return klass; | |
2096 } | |
2097 | |
2098 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2099 bool SystemDictionary::add_loader_constraint(Symbol* class_name, |
0 | 2100 Handle class_loader1, |
2101 Handle class_loader2, | |
2102 Thread* THREAD) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2103 ClassLoaderData* loader_data1 = class_loader_data(class_loader1); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2104 ClassLoaderData* loader_data2 = class_loader_data(class_loader2); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2105 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2106 Symbol* constraint_name = NULL; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2107 if (!FieldType::is_array(class_name)) { |
1336 | 2108 constraint_name = class_name; |
2109 } else { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2110 // For array classes, their Klass*s are not kept in the |
1336 | 2111 // constraint table. The element classes are. |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2112 FieldArrayInfo fd; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2113 BasicType t = FieldType::get_array_info(class_name, fd, CHECK_(false)); |
1336 | 2114 // primitive types always pass |
2115 if (t != T_OBJECT) { | |
2116 return true; | |
2117 } else { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2118 constraint_name = fd.object_key(); |
1336 | 2119 } |
2120 } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2121 unsigned int d_hash1 = dictionary()->compute_hash(constraint_name, loader_data1); |
0 | 2122 int d_index1 = dictionary()->hash_to_index(d_hash1); |
2123 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2124 unsigned int d_hash2 = dictionary()->compute_hash(constraint_name, loader_data2); |
0 | 2125 int d_index2 = dictionary()->hash_to_index(d_hash2); |
2126 { | |
1336 | 2127 MutexLocker mu_s(SystemDictionary_lock, THREAD); |
0 | 2128 |
1336 | 2129 // Better never do a GC while we're holding these oops |
2130 No_Safepoint_Verifier nosafepoint; | |
0 | 2131 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2132 Klass* klass1 = find_class(d_index1, d_hash1, constraint_name, loader_data1); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2133 Klass* klass2 = find_class(d_index2, d_hash2, constraint_name, loader_data2); |
1336 | 2134 return constraints()->add_entry(constraint_name, klass1, class_loader1, |
2135 klass2, class_loader2); | |
0 | 2136 } |
2137 } | |
2138 | |
2139 // Add entry to resolution error table to record the error when the first | |
2140 // attempt to resolve a reference to a class has failed. | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2141 void SystemDictionary::add_resolution_error(constantPoolHandle pool, int which, Symbol* error) { |
0 | 2142 unsigned int hash = resolution_errors()->compute_hash(pool, which); |
2143 int index = resolution_errors()->hash_to_index(hash); | |
2144 { | |
2145 MutexLocker ml(SystemDictionary_lock, Thread::current()); | |
2146 resolution_errors()->add_entry(index, hash, pool, which, error); | |
2147 } | |
2148 } | |
2149 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2150 // Delete a resolution error for RedefineClasses for a constant pool is going away |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2151 void SystemDictionary::delete_resolution_error(ConstantPool* pool) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2152 resolution_errors()->delete_entry(pool); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2153 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2154 |
0 | 2155 // Lookup resolution error table. Returns error if found, otherwise NULL. |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2156 Symbol* SystemDictionary::find_resolution_error(constantPoolHandle pool, int which) { |
0 | 2157 unsigned int hash = resolution_errors()->compute_hash(pool, which); |
2158 int index = resolution_errors()->hash_to_index(hash); | |
2159 { | |
2160 MutexLocker ml(SystemDictionary_lock, Thread::current()); | |
2161 ResolutionErrorEntry* entry = resolution_errors()->find_entry(index, hash, pool, which); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2162 return (entry != NULL) ? entry->error() : (Symbol*)NULL; |
0 | 2163 } |
2164 } | |
2165 | |
2166 | |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2167 // Signature constraints ensure that callers and callees agree about |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2168 // the meaning of type names in their signatures. This routine is the |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2169 // intake for constraints. It collects them from several places: |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2170 // |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2171 // * LinkResolver::resolve_method (if check_access is true) requires |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2172 // that the resolving class (the caller) and the defining class of |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2173 // the resolved method (the callee) agree on each type in the |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2174 // method's signature. |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2175 // |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2176 // * LinkResolver::resolve_interface_method performs exactly the same |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2177 // checks. |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2178 // |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2179 // * LinkResolver::resolve_field requires that the constant pool |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2180 // attempting to link to a field agree with the field's defining |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2181 // class about the type of the field signature. |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2182 // |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2183 // * klassVtable::initialize_vtable requires that, when a class |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2184 // overrides a vtable entry allocated by a superclass, that the |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2185 // overriding method (i.e., the callee) agree with the superclass |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2186 // on each type in the method's signature. |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2187 // |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2188 // * klassItable::initialize_itable requires that, when a class fills |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2189 // in its itables, for each non-abstract method installed in an |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2190 // itable, the method (i.e., the callee) agree with the interface |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2191 // on each type in the method's signature. |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2192 // |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2193 // All those methods have a boolean (check_access, checkconstraints) |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2194 // which turns off the checks. This is used from specialized contexts |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2195 // such as bootstrapping, dumping, and debugging. |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2196 // |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2197 // No direct constraint is placed between the class and its |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2198 // supertypes. Constraints are only placed along linked relations |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2199 // between callers and callees. When a method overrides or implements |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2200 // an abstract method in a supertype (superclass or interface), the |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2201 // constraints are placed as if the supertype were the caller to the |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2202 // overriding method. (This works well, since callers to the |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2203 // supertype have already established agreement between themselves and |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2204 // the supertype.) As a result of all this, a class can disagree with |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2205 // its supertype about the meaning of a type name, as long as that |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2206 // class neither calls a relevant method of the supertype, nor is |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2207 // called (perhaps via an override) from the supertype. |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2208 // |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2209 // |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2210 // SystemDictionary::check_signature_loaders(sig, l1, l2) |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2211 // |
0 | 2212 // Make sure all class components (including arrays) in the given |
2213 // signature will be resolved to the same class in both loaders. | |
2214 // Returns the name of the type that failed a loader constraint check, or | |
8840
cd3089a56438
8009731: Confusing error message for loader constraint violation
acorn
parents:
8751
diff
changeset
|
2215 // NULL if no constraint failed. No exception except OOME is thrown. |
1336 | 2216 // Arrays are not added to the loader constraint table, their elements are. |
8840
cd3089a56438
8009731: Confusing error message for loader constraint violation
acorn
parents:
8751
diff
changeset
|
2217 Symbol* SystemDictionary::check_signature_loaders(Symbol* signature, |
0 | 2218 Handle loader1, Handle loader2, |
2219 bool is_method, TRAPS) { | |
2220 // Nothing to do if loaders are the same. | |
2221 if (loader1() == loader2()) { | |
2222 return NULL; | |
2223 } | |
2224 | |
2225 SignatureStream sig_strm(signature, is_method); | |
2226 while (!sig_strm.is_done()) { | |
2227 if (sig_strm.is_object()) { | |
8840
cd3089a56438
8009731: Confusing error message for loader constraint violation
acorn
parents:
8751
diff
changeset
|
2228 Symbol* sig = sig_strm.as_symbol(CHECK_NULL); |
0 | 2229 if (!add_loader_constraint(sig, loader1, loader2, THREAD)) { |
8840
cd3089a56438
8009731: Confusing error message for loader constraint violation
acorn
parents:
8751
diff
changeset
|
2230 return sig; |
0 | 2231 } |
2232 } | |
2233 sig_strm.next(); | |
2234 } | |
2235 return NULL; | |
2236 } | |
2237 | |
2238 | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2239 methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2240 Symbol* signature, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2241 TRAPS) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2242 methodHandle empty; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2243 assert(EnableInvokeDynamic, ""); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2244 assert(MethodHandles::is_signature_polymorphic(iid) && |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2245 MethodHandles::is_signature_polymorphic_intrinsic(iid) && |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2246 iid != vmIntrinsics::_invokeGeneric, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2247 err_msg("must be a known MH intrinsic iid=%d: %s", iid, vmIntrinsics::name_at(iid))); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2248 |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2249 unsigned int hash = invoke_method_table()->compute_hash(signature, iid); |
710 | 2250 int index = invoke_method_table()->hash_to_index(hash); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2251 SymbolPropertyEntry* spe = invoke_method_table()->find_entry(index, hash, signature, iid); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2252 methodHandle m; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2253 if (spe == NULL || spe->method() == NULL) { |
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2254 spe = NULL; |
710 | 2255 // Must create lots of stuff here, but outside of the SystemDictionary lock. |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2256 m = Method::make_method_handle_intrinsic(iid, signature, CHECK_(empty)); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2257 CompileBroker::compile_method(m, InvocationEntryBci, CompLevel_highest_tier, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2258 methodHandle(), CompileThreshold, "MH", CHECK_(empty)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2259 |
710 | 2260 // Now grab the lock. We might have to throw away the new method, |
2261 // if a racing thread has managed to install one at the same time. | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2262 { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2263 MutexLocker ml(SystemDictionary_lock, THREAD); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2264 spe = invoke_method_table()->find_entry(index, hash, signature, iid); |
710 | 2265 if (spe == NULL) |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2266 spe = invoke_method_table()->add_entry(index, hash, signature, iid); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2267 if (spe->method() == NULL) |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2268 spe->set_method(m()); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2269 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2270 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2271 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2272 assert(spe != NULL && spe->method() != NULL, ""); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2273 return spe->method(); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2274 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2275 |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2276 // Helper for unpacking the return value from linkMethod and linkCallSite. |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2277 static methodHandle unpack_method_and_appendix(Handle mname, |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
2278 KlassHandle accessing_klass, |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2279 objArrayHandle appendix_box, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2280 Handle* appendix_result, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2281 TRAPS) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2282 methodHandle empty; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2283 if (mname.not_null()) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2284 Metadata* vmtarget = java_lang_invoke_MemberName::vmtarget(mname()); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2285 if (vmtarget != NULL && vmtarget->is_method()) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2286 Method* m = (Method*)vmtarget; |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2287 oop appendix = appendix_box->obj_at(0); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2288 if (TraceMethodHandles) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2289 #ifndef PRODUCT |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2290 tty->print("Linked method="INTPTR_FORMAT": ", m); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2291 m->print(); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2292 if (appendix != NULL) { tty->print("appendix = "); appendix->print(); } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2293 tty->cr(); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2294 #endif //PRODUCT |
3363
167b70ff3abc
6939861: JVM should handle more conversion operations
never
parents:
3245
diff
changeset
|
2295 } |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2296 (*appendix_result) = Handle(THREAD, appendix); |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
2297 // the target is stored in the cpCache and if a reference to this |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
2298 // MethodName is dropped we need a way to make sure the |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
2299 // class_loader containing this method is kept alive. |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
2300 // FIXME: the appendix might also preserve this dependency. |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
2301 ClassLoaderData* this_key = InstanceKlass::cast(accessing_klass())->class_loader_data(); |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
2302 this_key->record_dependency(m->method_holder(), CHECK_NULL); // Can throw OOM |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2303 return methodHandle(THREAD, m); |
710 | 2304 } |
2305 } | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2306 THROW_MSG_(vmSymbols::java_lang_LinkageError(), "bad value from MethodHandleNatives", empty); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2307 return empty; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2308 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2309 |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2310 methodHandle SystemDictionary::find_method_handle_invoker(Symbol* name, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2311 Symbol* signature, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2312 KlassHandle accessing_klass, |
6822
f6b0eb4e44cf
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
6751
diff
changeset
|
2313 Handle *appendix_result, |
f6b0eb4e44cf
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
6751
diff
changeset
|
2314 Handle *method_type_result, |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2315 TRAPS) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2316 methodHandle empty; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2317 assert(EnableInvokeDynamic, ""); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2318 assert(!THREAD->is_Compiler_thread(), ""); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2319 Handle method_type = |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2320 SystemDictionary::find_method_handle_type(signature, accessing_klass, CHECK_(empty)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2321 if (false) { // FIXME: Decide if the Java upcall should resolve signatures. |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2322 method_type = java_lang_String::create_from_symbol(signature, CHECK_(empty)); |
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2323 } |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2324 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2325 KlassHandle mh_klass = SystemDictionary::MethodHandle_klass(); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2326 int ref_kind = JVM_REF_invokeVirtual; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2327 Handle name_str = StringTable::intern(name, CHECK_(empty)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2328 objArrayHandle appendix_box = oopFactory::new_objArray(SystemDictionary::Object_klass(), 1, CHECK_(empty)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2329 assert(appendix_box->obj_at(0) == NULL, ""); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2330 |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2331 // call java.lang.invoke.MethodHandleNatives::linkMethod(... String, MethodType) -> MemberName |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2332 JavaCallArguments args; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2333 args.push_oop(accessing_klass()->java_mirror()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2334 args.push_int(ref_kind); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2335 args.push_oop(mh_klass()->java_mirror()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2336 args.push_oop(name_str()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2337 args.push_oop(method_type()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2338 args.push_oop(appendix_box()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2339 JavaValue result(T_OBJECT); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2340 JavaCalls::call_static(&result, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2341 SystemDictionary::MethodHandleNatives_klass(), |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2342 vmSymbols::linkMethod_name(), |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2343 vmSymbols::linkMethod_signature(), |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2344 &args, CHECK_(empty)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2345 Handle mname(THREAD, (oop) result.get_jobject()); |
6822
f6b0eb4e44cf
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
6751
diff
changeset
|
2346 (*method_type_result) = method_type; |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
2347 return unpack_method_and_appendix(mname, accessing_klass, appendix_box, appendix_result, THREAD); |
710 | 2348 } |
2349 | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2350 |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2351 // Ask Java code to find or construct a java.lang.invoke.MethodType for the given |
710 | 2352 // signature, as interpreted relative to the given class loader. |
2353 // Because of class loader constraints, all method handle usage must be | |
2354 // consistent with this loader. | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2355 Handle SystemDictionary::find_method_handle_type(Symbol* signature, |
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2356 KlassHandle accessing_klass, |
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1339
diff
changeset
|
2357 TRAPS) { |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2358 Handle empty; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2359 vmIntrinsics::ID null_iid = vmIntrinsics::_none; // distinct from all method handle invoker intrinsics |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2360 unsigned int hash = invoke_method_table()->compute_hash(signature, null_iid); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2361 int index = invoke_method_table()->hash_to_index(hash); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2362 SymbolPropertyEntry* spe = invoke_method_table()->find_entry(index, hash, signature, null_iid); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2363 if (spe != NULL && spe->method_type() != NULL) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2364 assert(java_lang_invoke_MethodType::is_instance(spe->method_type()), ""); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2365 return Handle(THREAD, spe->method_type()); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2366 } else if (THREAD->is_Compiler_thread()) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2367 warning("SystemDictionary::find_method_handle_type called from compiler thread"); // FIXME |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2368 return Handle(); // do not attempt from within compiler, unless it was cached |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2369 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2370 |
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2371 Handle class_loader, protection_domain; |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2372 bool is_on_bcp = true; // keep this true as long as we can materialize from the boot classloader |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2373 int npts = ArgumentCount(signature).size(); |
1142 | 2374 objArrayHandle pts = oopFactory::new_objArray(SystemDictionary::Class_klass(), npts, CHECK_(empty)); |
710 | 2375 int arg = 0; |
2376 Handle rt; // the return type from the signature | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2377 ResourceMark rm(THREAD); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2378 for (SignatureStream ss(signature); !ss.is_done(); ss.next()) { |
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2379 oop mirror = NULL; |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2380 if (is_on_bcp) { |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2381 // Note: class_loader & protection_domain are both null at this point. |
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2382 mirror = ss.as_java_mirror(class_loader, protection_domain, |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2383 SignatureStream::ReturnNull, CHECK_(empty)); |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2384 if (mirror == NULL) { |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2385 // fall back from BCP to accessing_klass |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2386 if (accessing_klass.not_null()) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2387 class_loader = Handle(THREAD, InstanceKlass::cast(accessing_klass())->class_loader()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2388 protection_domain = Handle(THREAD, InstanceKlass::cast(accessing_klass())->protection_domain()); |
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2389 } |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2390 is_on_bcp = false; |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2391 } |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2392 } |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2393 if (!is_on_bcp) { |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2394 // Resolve, throwing a real error if it doesn't work. |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2395 mirror = ss.as_java_mirror(class_loader, protection_domain, |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2396 SignatureStream::NCDFError, CHECK_(empty)); |
710 | 2397 } |
2398 if (ss.at_return_type()) | |
2399 rt = Handle(THREAD, mirror); | |
2400 else | |
2401 pts->obj_at_put(arg++, mirror); | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2402 |
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2403 // Check accessibility. |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2404 if (ss.is_object() && accessing_klass.not_null()) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2405 Klass* sel_klass = java_lang_Class::as_Klass(mirror); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2406 mirror = NULL; // safety |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2407 // Emulate ConstantPool::verify_constant_pool_resolve. |
6983 | 2408 if (sel_klass->oop_is_objArray()) |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6751
diff
changeset
|
2409 sel_klass = ObjArrayKlass::cast(sel_klass)->bottom_klass(); |
6983 | 2410 if (sel_klass->oop_is_instance()) { |
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2411 KlassHandle sel_kh(THREAD, sel_klass); |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2412 LinkResolver::check_klass_accessability(accessing_klass, sel_kh, CHECK_(empty)); |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2413 } |
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2414 } |
710 | 2415 } |
2416 assert(arg == npts, ""); | |
2417 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2418 // call java.lang.invoke.MethodHandleNatives::findMethodType(Class rt, Class[] pts) -> MethodType |
710 | 2419 JavaCallArguments args(Handle(THREAD, rt())); |
2420 args.push_oop(pts()); | |
2421 JavaValue result(T_OBJECT); | |
2422 JavaCalls::call_static(&result, | |
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1339
diff
changeset
|
2423 SystemDictionary::MethodHandleNatives_klass(), |
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1339
diff
changeset
|
2424 vmSymbols::findMethodHandleType_name(), |
2460 | 2425 vmSymbols::findMethodHandleType_signature(), |
710 | 2426 &args, CHECK_(empty)); |
1793
d257356e35f0
6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions
jrose
parents:
1660
diff
changeset
|
2427 Handle method_type(THREAD, (oop) result.get_jobject()); |
d257356e35f0
6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions
jrose
parents:
1660
diff
changeset
|
2428 |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2429 if (is_on_bcp) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2430 // We can cache this MethodType inside the JVM. |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2431 MutexLocker ml(SystemDictionary_lock, THREAD); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2432 spe = invoke_method_table()->find_entry(index, hash, signature, null_iid); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2433 if (spe == NULL) |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2434 spe = invoke_method_table()->add_entry(index, hash, signature, null_iid); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2435 if (spe->method_type() == NULL) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2436 spe->set_method_type(method_type()); |
1793
d257356e35f0
6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions
jrose
parents:
1660
diff
changeset
|
2437 } |
d257356e35f0
6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions
jrose
parents:
1660
diff
changeset
|
2438 } |
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
2439 |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2440 // report back to the caller with the MethodType |
1793
d257356e35f0
6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions
jrose
parents:
1660
diff
changeset
|
2441 return method_type; |
710 | 2442 } |
2443 | |
1602 | 2444 // Ask Java code to find or construct a method handle constant. |
2445 Handle SystemDictionary::link_method_handle_constant(KlassHandle caller, | |
2446 int ref_kind, //e.g., JVM_REF_invokeVirtual | |
2447 KlassHandle callee, | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2448 Symbol* name_sym, |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2449 Symbol* signature, |
1602 | 2450 TRAPS) { |
2451 Handle empty; | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2452 Handle name = java_lang_String::create_from_symbol(name_sym, CHECK_(empty)); |
1602 | 2453 Handle type; |
2454 if (signature->utf8_length() > 0 && signature->byte_at(0) == '(') { | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2455 type = find_method_handle_type(signature, caller, CHECK_(empty)); |
1602 | 2456 } else { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2457 ResourceMark rm(THREAD); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2458 SignatureStream ss(signature, false); |
1602 | 2459 if (!ss.is_done()) { |
2460 oop mirror = ss.as_java_mirror(caller->class_loader(), caller->protection_domain(), | |
2461 SignatureStream::NCDFError, CHECK_(empty)); | |
2462 type = Handle(THREAD, mirror); | |
2463 ss.next(); | |
2464 if (!ss.is_done()) type = Handle(); // error! | |
2465 } | |
2466 } | |
2467 if (type.is_null()) { | |
2468 THROW_MSG_(vmSymbols::java_lang_LinkageError(), "bad signature", empty); | |
2469 } | |
2470 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2471 // call java.lang.invoke.MethodHandleNatives::linkMethodHandleConstant(Class caller, int refKind, Class callee, String name, Object type) -> MethodHandle |
1602 | 2472 JavaCallArguments args; |
2473 args.push_oop(caller->java_mirror()); // the referring class | |
2474 args.push_int(ref_kind); | |
2475 args.push_oop(callee->java_mirror()); // the target class | |
2476 args.push_oop(name()); | |
2477 args.push_oop(type()); | |
2478 JavaValue result(T_OBJECT); | |
2479 JavaCalls::call_static(&result, | |
2480 SystemDictionary::MethodHandleNatives_klass(), | |
2481 vmSymbols::linkMethodHandleConstant_name(), | |
2460 | 2482 vmSymbols::linkMethodHandleConstant_signature(), |
1602 | 2483 &args, CHECK_(empty)); |
2484 return Handle(THREAD, (oop) result.get_jobject()); | |
2485 } | |
710 | 2486 |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2487 // Ask Java code to find or construct a java.lang.invoke.CallSite for the given |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2488 // name and signature, as interpreted relative to the given class loader. |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2489 methodHandle SystemDictionary::find_dynamic_call_site_invoker(KlassHandle caller, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2490 Handle bootstrap_specifier, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2491 Symbol* name, |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2492 Symbol* type, |
6822
f6b0eb4e44cf
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
6751
diff
changeset
|
2493 Handle *appendix_result, |
f6b0eb4e44cf
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
6751
diff
changeset
|
2494 Handle *method_type_result, |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2495 TRAPS) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2496 methodHandle empty; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2497 Handle bsm, info; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2498 if (java_lang_invoke_MethodHandle::is_instance(bootstrap_specifier())) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2499 bsm = bootstrap_specifier; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2500 } else { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2501 assert(bootstrap_specifier->is_objArray(), ""); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2502 objArrayHandle args(THREAD, (objArrayOop) bootstrap_specifier()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2503 int len = args->length(); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2504 assert(len >= 1, ""); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2505 bsm = Handle(THREAD, args->obj_at(0)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2506 if (len > 1) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2507 objArrayOop args1 = oopFactory::new_objArray(SystemDictionary::Object_klass(), len-1, CHECK_(empty)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2508 for (int i = 1; i < len; i++) |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2509 args1->obj_at_put(i-1, args->obj_at(i)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2510 info = Handle(THREAD, args1); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2511 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2512 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2513 guarantee(java_lang_invoke_MethodHandle::is_instance(bsm()), |
1660
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1602
diff
changeset
|
2514 "caller must supply a valid BSM"); |
083fde3b838e
6964498: JSR 292 invokedynamic sites need local bootstrap methods
jrose
parents:
1602
diff
changeset
|
2515 |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2516 Handle method_name = java_lang_String::create_from_symbol(name, CHECK_(empty)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2517 Handle method_type = find_method_handle_type(type, caller, CHECK_(empty)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2518 |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2519 objArrayHandle appendix_box = oopFactory::new_objArray(SystemDictionary::Object_klass(), 1, CHECK_(empty)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2520 assert(appendix_box->obj_at(0) == NULL, ""); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2521 |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2522 // call java.lang.invoke.MethodHandleNatives::linkCallSite(caller, bsm, name, mtype, info, &appendix) |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2523 JavaCallArguments args; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2524 args.push_oop(caller->java_mirror()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2525 args.push_oop(bsm()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2526 args.push_oop(method_name()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2527 args.push_oop(method_type()); |
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1339
diff
changeset
|
2528 args.push_oop(info()); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2529 args.push_oop(appendix_box); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2530 JavaValue result(T_OBJECT); |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2531 JavaCalls::call_static(&result, |
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1339
diff
changeset
|
2532 SystemDictionary::MethodHandleNatives_klass(), |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2533 vmSymbols::linkCallSite_name(), |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2534 vmSymbols::linkCallSite_signature(), |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2535 &args, CHECK_(empty)); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6217
diff
changeset
|
2536 Handle mname(THREAD, (oop) result.get_jobject()); |
6822
f6b0eb4e44cf
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
6751
diff
changeset
|
2537 (*method_type_result) = method_type; |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
6983
diff
changeset
|
2538 return unpack_method_and_appendix(mname, caller, appendix_box, appendix_result, THREAD); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2539 } |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2540 |
0 | 2541 // Since the identity hash code for symbols changes when the symbols are |
2542 // moved from the regular perm gen (hash in the mark word) to the shared | |
2543 // spaces (hash is the address), the classes loaded into the dictionary | |
2544 // may be in the wrong buckets. | |
2545 | |
2546 void SystemDictionary::reorder_dictionary() { | |
2547 dictionary()->reorder_dictionary(); | |
2548 } | |
2549 | |
2550 | |
2551 void SystemDictionary::copy_buckets(char** top, char* end) { | |
2552 dictionary()->copy_buckets(top, end); | |
2553 } | |
2554 | |
2555 | |
2556 void SystemDictionary::copy_table(char** top, char* end) { | |
2557 dictionary()->copy_table(top, end); | |
2558 } | |
2559 | |
2560 | |
2561 void SystemDictionary::reverse() { | |
2562 dictionary()->reverse(); | |
2563 } | |
2564 | |
2565 int SystemDictionary::number_of_classes() { | |
2566 return dictionary()->number_of_entries(); | |
2567 } | |
2568 | |
2569 | |
2570 // ---------------------------------------------------------------------------- | |
2571 #ifndef PRODUCT | |
2572 | |
2573 void SystemDictionary::print() { | |
2574 dictionary()->print(); | |
2575 | |
2576 // Placeholders | |
2577 GCMutexLocker mu(SystemDictionary_lock); | |
2578 placeholders()->print(); | |
2579 | |
2580 // loader constraints - print under SD_lock | |
2581 constraints()->print(); | |
2582 } | |
2583 | |
2584 #endif | |
2585 | |
2586 void SystemDictionary::verify() { | |
2587 guarantee(dictionary() != NULL, "Verify of system dictionary failed"); | |
2588 guarantee(constraints() != NULL, | |
2589 "Verify of loader constraints failed"); | |
2590 guarantee(dictionary()->number_of_entries() >= 0 && | |
2591 placeholders()->number_of_entries() >= 0, | |
2592 "Verify of system dictionary failed"); | |
2593 | |
2594 // Verify dictionary | |
2595 dictionary()->verify(); | |
2596 | |
2597 GCMutexLocker mu(SystemDictionary_lock); | |
2598 placeholders()->verify(); | |
2599 | |
2600 // Verify constraint table | |
2601 guarantee(constraints() != NULL, "Verify of loader constraints failed"); | |
1258
38836cf1d8d2
6920977: G1: guarantee(k == probe->klass(),"klass should be in dictionary") fails
tonyp
parents:
1142
diff
changeset
|
2602 constraints()->verify(dictionary(), placeholders()); |
0 | 2603 } |
2604 | |
2605 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2606 void SystemDictionary::verify_obj_klass_present(Symbol* class_name, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2607 ClassLoaderData* loader_data) { |
0 | 2608 GCMutexLocker mu(SystemDictionary_lock); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2609 Symbol* name; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2610 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2611 Klass* probe = find_class(class_name, loader_data); |
0 | 2612 if (probe == NULL) { |
2613 probe = SystemDictionary::find_shared_class(class_name); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2614 if (probe == NULL) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2615 name = find_placeholder(class_name, loader_data); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2616 } |
0 | 2617 } |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2618 guarantee(probe != NULL || name != NULL, |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2001
diff
changeset
|
2619 "Loaded klasses should be in SystemDictionary"); |
0 | 2620 } |
2621 | |
2622 #ifndef PRODUCT | |
2623 | |
2624 // statistics code | |
2625 class ClassStatistics: AllStatic { | |
2626 private: | |
2627 static int nclasses; // number of classes | |
2628 static int nmethods; // number of methods | |
2629 static int nmethoddata; // number of methodData | |
2630 static int class_size; // size of class objects in words | |
2631 static int method_size; // size of method objects in words | |
2632 static int debug_size; // size of debug info in methods | |
2633 static int methoddata_size; // size of methodData objects in words | |
2634 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2635 static void do_class(Klass* k) { |
0 | 2636 nclasses++; |
2637 class_size += k->size(); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2638 if (k->oop_is_instance()) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2639 InstanceKlass* ik = (InstanceKlass*)k; |
0 | 2640 class_size += ik->methods()->size(); |
2641 class_size += ik->constants()->size(); | |
2642 class_size += ik->local_interfaces()->size(); | |
2643 class_size += ik->transitive_interfaces()->size(); | |
2644 // We do not have to count implementors, since we only store one! | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2645 // SSS: How should these be accounted now that they have moved? |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2646 // class_size += ik->fields()->length(); |
0 | 2647 } |
2648 } | |
2649 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2650 static void do_method(Method* m) { |
0 | 2651 nmethods++; |
2652 method_size += m->size(); | |
2653 // class loader uses same objArray for empty vectors, so don't count these | |
2654 if (m->has_stackmap_table()) { | |
2655 method_size += m->stackmap_data()->size(); | |
2656 } | |
2657 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2658 MethodData* mdo = m->method_data(); |
0 | 2659 if (mdo != NULL) { |
2660 nmethoddata++; | |
2661 methoddata_size += mdo->size(); | |
2662 } | |
2663 } | |
2664 | |
2665 public: | |
2666 static void print() { | |
2667 SystemDictionary::classes_do(do_class); | |
2668 SystemDictionary::methods_do(do_method); | |
2669 tty->print_cr("Class statistics:"); | |
2670 tty->print_cr("%d classes (%d bytes)", nclasses, class_size * oopSize); | |
2671 tty->print_cr("%d methods (%d bytes = %d base + %d debug info)", nmethods, | |
2672 (method_size + debug_size) * oopSize, method_size * oopSize, debug_size * oopSize); | |
2673 tty->print_cr("%d methoddata (%d bytes)", nmethoddata, methoddata_size * oopSize); | |
2674 } | |
2675 }; | |
2676 | |
2677 | |
2678 int ClassStatistics::nclasses = 0; | |
2679 int ClassStatistics::nmethods = 0; | |
2680 int ClassStatistics::nmethoddata = 0; | |
2681 int ClassStatistics::class_size = 0; | |
2682 int ClassStatistics::method_size = 0; | |
2683 int ClassStatistics::debug_size = 0; | |
2684 int ClassStatistics::methoddata_size = 0; | |
2685 | |
2686 void SystemDictionary::print_class_statistics() { | |
2687 ResourceMark rm; | |
2688 ClassStatistics::print(); | |
2689 } | |
2690 | |
2691 | |
2692 class MethodStatistics: AllStatic { | |
2693 public: | |
2694 enum { | |
2695 max_parameter_size = 10 | |
2696 }; | |
2697 private: | |
2698 | |
2699 static int _number_of_methods; | |
2700 static int _number_of_final_methods; | |
2701 static int _number_of_static_methods; | |
2702 static int _number_of_native_methods; | |
2703 static int _number_of_synchronized_methods; | |
2704 static int _number_of_profiled_methods; | |
2705 static int _number_of_bytecodes; | |
2706 static int _parameter_size_profile[max_parameter_size]; | |
2707 static int _bytecodes_profile[Bytecodes::number_of_java_codes]; | |
2708 | |
2709 static void initialize() { | |
2710 _number_of_methods = 0; | |
2711 _number_of_final_methods = 0; | |
2712 _number_of_static_methods = 0; | |
2713 _number_of_native_methods = 0; | |
2714 _number_of_synchronized_methods = 0; | |
2715 _number_of_profiled_methods = 0; | |
2716 _number_of_bytecodes = 0; | |
2717 for (int i = 0; i < max_parameter_size ; i++) _parameter_size_profile[i] = 0; | |
2718 for (int j = 0; j < Bytecodes::number_of_java_codes; j++) _bytecodes_profile [j] = 0; | |
2719 }; | |
2720 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6266
diff
changeset
|
2721 static void do_method(Method* m) { |
0 | 2722 _number_of_methods++; |
2723 // collect flag info | |
2724 if (m->is_final() ) _number_of_final_methods++; | |
2725 if (m->is_static() ) _number_of_static_methods++; | |
2726 if (m->is_native() ) _number_of_native_methods++; | |
2727 if (m->is_synchronized()) _number_of_synchronized_methods++; | |
2728 if (m->method_data() != NULL) _number_of_profiled_methods++; | |
2729 // collect parameter size info (add one for receiver, if any) | |
2730 _parameter_size_profile[MIN2(m->size_of_parameters() + (m->is_static() ? 0 : 1), max_parameter_size - 1)]++; | |
2731 // collect bytecodes info | |
2732 { | |
2733 Thread *thread = Thread::current(); | |
2734 HandleMark hm(thread); | |
2735 BytecodeStream s(methodHandle(thread, m)); | |
2736 Bytecodes::Code c; | |
2737 while ((c = s.next()) >= 0) { | |
2738 _number_of_bytecodes++; | |
2739 _bytecodes_profile[c]++; | |
2740 } | |
2741 } | |
2742 } | |
2743 | |
2744 public: | |
2745 static void print() { | |
2746 initialize(); | |
2747 SystemDictionary::methods_do(do_method); | |
2748 // generate output | |
2749 tty->cr(); | |
2750 tty->print_cr("Method statistics (static):"); | |
2751 // flag distribution | |
2752 tty->cr(); | |
2753 tty->print_cr("%6d final methods %6.1f%%", _number_of_final_methods , _number_of_final_methods * 100.0F / _number_of_methods); | |
2754 tty->print_cr("%6d static methods %6.1f%%", _number_of_static_methods , _number_of_static_methods * 100.0F / _number_of_methods); | |
2755 tty->print_cr("%6d native methods %6.1f%%", _number_of_native_methods , _number_of_native_methods * 100.0F / _number_of_methods); | |
2756 tty->print_cr("%6d synchronized methods %6.1f%%", _number_of_synchronized_methods, _number_of_synchronized_methods * 100.0F / _number_of_methods); | |
2757 tty->print_cr("%6d profiled methods %6.1f%%", _number_of_profiled_methods, _number_of_profiled_methods * 100.0F / _number_of_methods); | |
2758 // parameter size profile | |
2759 tty->cr(); | |
2760 { int tot = 0; | |
2761 int avg = 0; | |
2762 for (int i = 0; i < max_parameter_size; i++) { | |
2763 int n = _parameter_size_profile[i]; | |
2764 tot += n; | |
2765 avg += n*i; | |
2766 tty->print_cr("parameter size = %1d: %6d methods %5.1f%%", i, n, n * 100.0F / _number_of_methods); | |
2767 } | |
2768 assert(tot == _number_of_methods, "should be the same"); | |
2769 tty->print_cr(" %6d methods 100.0%%", _number_of_methods); | |
2770 tty->print_cr("(average parameter size = %3.1f including receiver, if any)", (float)avg / _number_of_methods); | |
2771 } | |
2772 // bytecodes profile | |
2773 tty->cr(); | |
2774 { int tot = 0; | |
2775 for (int i = 0; i < Bytecodes::number_of_java_codes; i++) { | |
2776 if (Bytecodes::is_defined(i)) { | |
2777 Bytecodes::Code c = Bytecodes::cast(i); | |
2778 int n = _bytecodes_profile[c]; | |
2779 tot += n; | |
2780 tty->print_cr("%9d %7.3f%% %s", n, n * 100.0F / _number_of_bytecodes, Bytecodes::name(c)); | |
2781 } | |
2782 } | |
2783 assert(tot == _number_of_bytecodes, "should be the same"); | |
2784 tty->print_cr("%9d 100.000%%", _number_of_bytecodes); | |
2785 } | |
2786 tty->cr(); | |
2787 } | |
2788 }; | |
2789 | |
2790 int MethodStatistics::_number_of_methods; | |
2791 int MethodStatistics::_number_of_final_methods; | |
2792 int MethodStatistics::_number_of_static_methods; | |
2793 int MethodStatistics::_number_of_native_methods; | |
2794 int MethodStatistics::_number_of_synchronized_methods; | |
2795 int MethodStatistics::_number_of_profiled_methods; | |
2796 int MethodStatistics::_number_of_bytecodes; | |
2797 int MethodStatistics::_parameter_size_profile[MethodStatistics::max_parameter_size]; | |
2798 int MethodStatistics::_bytecodes_profile[Bytecodes::number_of_java_codes]; | |
2799 | |
2800 | |
2801 void SystemDictionary::print_method_statistics() { | |
2802 MethodStatistics::print(); | |
2803 } | |
2804 | |
2805 #endif // PRODUCT |