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