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