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