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