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