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