Mercurial > hg > truffle
annotate src/share/vm/classfile/javaClasses.cpp @ 7090:05ce1defa4f9
Common out some parts of UnsafeLoad/Store in UnsafeAccess
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Thu, 29 Nov 2012 13:24:08 +0100 |
parents | 2cb439954abf |
children | 291ffc492eb6 |
rev | line source |
---|---|
0 | 1 /* |
6057 | 2 * Copyright (c) 1997, 2012, 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:
1507
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1507
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:
1507
diff
changeset
|
21 * questions. |
0 | 22 * |
23 */ | |
24 | |
1972 | 25 #include "precompiled.hpp" |
6162 | 26 #include "classfile/altHashing.hpp" |
1972 | 27 #include "classfile/javaClasses.hpp" |
28 #include "classfile/symbolTable.hpp" | |
29 #include "classfile/vmSymbols.hpp" | |
30 #include "code/debugInfo.hpp" | |
31 #include "code/pcDesc.hpp" | |
3900
a32de5085326
7079673: JSR 292: C1 should inline bytecoded method handle adapters
twisti
parents:
3820
diff
changeset
|
32 #include "compiler/compilerOracle.hpp" |
1972 | 33 #include "interpreter/interpreter.hpp" |
34 #include "memory/oopFactory.hpp" | |
35 #include "memory/resourceArea.hpp" | |
36 #include "memory/universe.inline.hpp" | |
3938 | 37 #include "oops/fieldStreams.hpp" |
1972 | 38 #include "oops/instanceKlass.hpp" |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
39 #include "oops/instanceMirrorKlass.hpp" |
1972 | 40 #include "oops/klass.hpp" |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
41 #include "oops/method.hpp" |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
42 #include "oops/symbol.hpp" |
1972 | 43 #include "oops/typeArrayOop.hpp" |
44 #include "runtime/fieldDescriptor.hpp" | |
45 #include "runtime/handles.inline.hpp" | |
46 #include "runtime/interfaceSupport.hpp" | |
47 #include "runtime/java.hpp" | |
48 #include "runtime/javaCalls.hpp" | |
49 #include "runtime/safepoint.hpp" | |
50 #include "runtime/vframe.hpp" | |
51 #include "utilities/preserveException.hpp" | |
52 #ifdef TARGET_OS_FAMILY_linux | |
53 # include "thread_linux.inline.hpp" | |
54 #endif | |
55 #ifdef TARGET_OS_FAMILY_solaris | |
56 # include "thread_solaris.inline.hpp" | |
57 #endif | |
58 #ifdef TARGET_OS_FAMILY_windows | |
59 # include "thread_windows.inline.hpp" | |
60 #endif | |
3960 | 61 #ifdef TARGET_OS_FAMILY_bsd |
62 # include "thread_bsd.inline.hpp" | |
63 #endif | |
0 | 64 |
3938 | 65 #define INJECTED_FIELD_COMPUTE_OFFSET(klass, name, signature, may_be_java) \ |
66 klass::_##name##_offset = JavaClasses::compute_injected_offset(JavaClasses::klass##_##name##_enum); | |
67 | |
68 #define DECLARE_INJECTED_FIELD(klass, name, signature, may_be_java) \ | |
69 { SystemDictionary::WK_KLASS_ENUM_NAME(klass), vmSymbols::VM_SYMBOL_ENUM_NAME(name##_name), vmSymbols::VM_SYMBOL_ENUM_NAME(signature), may_be_java }, | |
70 | |
71 InjectedField JavaClasses::_injected_fields[] = { | |
72 ALL_INJECTED_FIELDS(DECLARE_INJECTED_FIELD) | |
73 }; | |
74 | |
75 int JavaClasses::compute_injected_offset(InjectedFieldID id) { | |
76 return _injected_fields[id].compute_offset(); | |
77 } | |
78 | |
79 | |
80 InjectedField* JavaClasses::get_injected(Symbol* class_name, int* field_count) { | |
81 *field_count = 0; | |
82 | |
83 vmSymbols::SID sid = vmSymbols::find_sid(class_name); | |
84 if (sid == vmSymbols::NO_SID) { | |
85 // Only well known classes can inject fields | |
86 return NULL; | |
87 } | |
88 | |
89 int count = 0; | |
90 int start = -1; | |
91 | |
92 #define LOOKUP_INJECTED_FIELD(klass, name, signature, may_be_java) \ | |
93 if (sid == vmSymbols::VM_SYMBOL_ENUM_NAME(klass)) { \ | |
94 count++; \ | |
95 if (start == -1) start = klass##_##name##_enum; \ | |
96 } | |
97 ALL_INJECTED_FIELDS(LOOKUP_INJECTED_FIELD); | |
98 #undef LOOKUP_INJECTED_FIELD | |
99 | |
100 if (start != -1) { | |
101 *field_count = count; | |
102 return _injected_fields + start; | |
103 } | |
104 return NULL; | |
105 } | |
106 | |
107 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
108 static bool find_field(InstanceKlass* ik, |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
109 Symbol* name_symbol, Symbol* signature_symbol, |
710 | 110 fieldDescriptor* fd, |
111 bool allow_super = false) { | |
112 if (allow_super) | |
113 return ik->find_field(name_symbol, signature_symbol, fd) != NULL; | |
114 else | |
115 return ik->find_local_field(name_symbol, signature_symbol, fd); | |
116 } | |
117 | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
118 // Helpful routine for computing field offsets at run time rather than hardcoding them |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
119 static void |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
120 compute_offset(int &dest_offset, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
121 Klass* klass_oop, Symbol* name_symbol, Symbol* signature_symbol, |
710 | 122 bool allow_super = false) { |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
123 fieldDescriptor fd; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
124 InstanceKlass* ik = InstanceKlass::cast(klass_oop); |
710 | 125 if (!find_field(ik, name_symbol, signature_symbol, &fd, allow_super)) { |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
126 ResourceMark rm; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
127 tty->print_cr("Invalid layout of %s at %s", ik->external_name(), name_symbol->as_C_string()); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
128 #ifndef PRODUCT |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
129 klass_oop->print(); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
130 tty->print_cr("all fields:"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
131 for (AllFieldStream fs(InstanceKlass::cast(klass_oop)); !fs.done(); fs.next()) { |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
132 tty->print_cr(" name: %s, sig: %s, flags: %08x", fs.name()->as_C_string(), fs.signature()->as_C_string(), fs.access_flags().as_int()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
133 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
134 #endif //PRODUCT |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
135 fatal("Invalid layout of preloaded class"); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
136 } |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
137 dest_offset = fd.offset(); |
0 | 138 } |
139 | |
140 // Same as above but for "optional" offsets that might not be present in certain JDK versions | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
141 static void |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
142 compute_optional_offset(int& dest_offset, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
143 Klass* klass_oop, Symbol* name_symbol, Symbol* signature_symbol, |
710 | 144 bool allow_super = false) { |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
145 fieldDescriptor fd; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
146 InstanceKlass* ik = InstanceKlass::cast(klass_oop); |
710 | 147 if (find_field(ik, name_symbol, signature_symbol, &fd, allow_super)) { |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
148 dest_offset = fd.offset(); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
149 } |
0 | 150 } |
151 | |
710 | 152 |
6057 | 153 int java_lang_String::value_offset = 0; |
154 int java_lang_String::offset_offset = 0; | |
155 int java_lang_String::count_offset = 0; | |
156 int java_lang_String::hash_offset = 0; | |
157 | |
158 bool java_lang_String::initialized = false; | |
159 | |
160 void java_lang_String::compute_offsets() { | |
161 assert(!initialized, "offsets should be initialized only once"); | |
162 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
163 Klass* k = SystemDictionary::String_klass(); |
6057 | 164 compute_offset(value_offset, k, vmSymbols::value_name(), vmSymbols::char_array_signature()); |
165 compute_optional_offset(offset_offset, k, vmSymbols::offset_name(), vmSymbols::int_signature()); | |
166 compute_optional_offset(count_offset, k, vmSymbols::count_name(), vmSymbols::int_signature()); | |
167 compute_optional_offset(hash_offset, k, vmSymbols::hash_name(), vmSymbols::int_signature()); | |
168 | |
169 initialized = true; | |
170 } | |
171 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
172 Handle java_lang_String::basic_create(int length, TRAPS) { |
6057 | 173 assert(initialized, "Must be initialized"); |
0 | 174 // Create the String object first, so there's a chance that the String |
175 // and the char array it points to end up in the same cache line. | |
176 oop obj; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
177 obj = InstanceKlass::cast(SystemDictionary::String_klass())->allocate_instance(CHECK_NH); |
0 | 178 |
179 // Create the char array. The String object must be handlized here | |
180 // because GC can happen as a result of the allocation attempt. | |
181 Handle h_obj(THREAD, obj); | |
182 typeArrayOop buffer; | |
183 buffer = oopFactory::new_charArray(length, CHECK_NH); | |
184 | |
185 // Point the String at the char array | |
186 obj = h_obj(); | |
187 set_value(obj, buffer); | |
188 // No need to zero the offset, allocation zero'ed the entire String object | |
189 assert(offset(obj) == 0, "initial String offset should be zero"); | |
190 //set_offset(obj, 0); | |
191 set_count(obj, length); | |
192 | |
193 return h_obj; | |
194 } | |
195 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
196 Handle java_lang_String::create_from_unicode(jchar* unicode, int length, TRAPS) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
197 Handle h_obj = basic_create(length, CHECK_NH); |
0 | 198 typeArrayOop buffer = value(h_obj()); |
199 for (int index = 0; index < length; index++) { | |
200 buffer->char_at_put(index, unicode[index]); | |
201 } | |
202 return h_obj; | |
203 } | |
204 | |
205 oop java_lang_String::create_oop_from_unicode(jchar* unicode, int length, TRAPS) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
206 Handle h_obj = create_from_unicode(unicode, length, CHECK_0); |
0 | 207 return h_obj(); |
208 } | |
209 | |
210 Handle java_lang_String::create_from_str(const char* utf8_str, TRAPS) { | |
211 if (utf8_str == NULL) { | |
212 return Handle(); | |
213 } | |
214 int length = UTF8::unicode_length(utf8_str); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
215 Handle h_obj = basic_create(length, CHECK_NH); |
0 | 216 if (length > 0) { |
217 UTF8::convert_to_unicode(utf8_str, value(h_obj())->char_at_addr(0), length); | |
218 } | |
219 return h_obj; | |
220 } | |
221 | |
222 oop java_lang_String::create_oop_from_str(const char* utf8_str, TRAPS) { | |
223 Handle h_obj = create_from_str(utf8_str, CHECK_0); | |
224 return h_obj(); | |
225 } | |
226 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
227 Handle java_lang_String::create_from_symbol(Symbol* symbol, TRAPS) { |
0 | 228 int length = UTF8::unicode_length((char*)symbol->bytes(), symbol->utf8_length()); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
229 Handle h_obj = basic_create(length, CHECK_NH); |
0 | 230 if (length > 0) { |
231 UTF8::convert_to_unicode((char*)symbol->bytes(), value(h_obj())->char_at_addr(0), length); | |
232 } | |
233 return h_obj; | |
234 } | |
235 | |
236 // Converts a C string to a Java String based on current encoding | |
237 Handle java_lang_String::create_from_platform_dependent_str(const char* str, TRAPS) { | |
238 assert(str != NULL, "bad arguments"); | |
239 | |
240 typedef jstring (*to_java_string_fn_t)(JNIEnv*, const char *); | |
241 static to_java_string_fn_t _to_java_string_fn = NULL; | |
242 | |
243 if (_to_java_string_fn == NULL) { | |
244 void *lib_handle = os::native_java_library(); | |
1980
828eafbd85cc
6348631: remove the use of the HPI library from Hotspot
ikrylov
parents:
1972
diff
changeset
|
245 _to_java_string_fn = CAST_TO_FN_PTR(to_java_string_fn_t, os::dll_lookup(lib_handle, "NewStringPlatform")); |
0 | 246 if (_to_java_string_fn == NULL) { |
247 fatal("NewStringPlatform missing"); | |
248 } | |
249 } | |
250 | |
251 jstring js = NULL; | |
252 { JavaThread* thread = (JavaThread*)THREAD; | |
253 assert(thread->is_Java_thread(), "must be java thread"); | |
22
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
254 HandleMark hm(thread); |
0 | 255 ThreadToNativeFromVM ttn(thread); |
256 js = (_to_java_string_fn)(thread->jni_environment(), str); | |
257 } | |
258 return Handle(THREAD, JNIHandles::resolve(js)); | |
259 } | |
260 | |
22
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
261 // Converts a Java String to a native C string that can be used for |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
262 // native OS calls. |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
263 char* java_lang_String::as_platform_dependent_str(Handle java_string, TRAPS) { |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
264 |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
265 typedef char* (*to_platform_string_fn_t)(JNIEnv*, jstring, bool*); |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
266 static to_platform_string_fn_t _to_platform_string_fn = NULL; |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
267 |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
268 if (_to_platform_string_fn == NULL) { |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
269 void *lib_handle = os::native_java_library(); |
1980
828eafbd85cc
6348631: remove the use of the HPI library from Hotspot
ikrylov
parents:
1972
diff
changeset
|
270 _to_platform_string_fn = CAST_TO_FN_PTR(to_platform_string_fn_t, os::dll_lookup(lib_handle, "GetStringPlatformChars")); |
22
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
271 if (_to_platform_string_fn == NULL) { |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
272 fatal("GetStringPlatformChars missing"); |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
273 } |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
274 } |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
275 |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
276 char *native_platform_string; |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
277 { JavaThread* thread = (JavaThread*)THREAD; |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
278 assert(thread->is_Java_thread(), "must be java thread"); |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
279 JNIEnv *env = thread->jni_environment(); |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
280 jstring js = (jstring) JNIHandles::make_local(env, java_string()); |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
281 bool is_copy; |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
282 HandleMark hm(thread); |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
283 ThreadToNativeFromVM ttn(thread); |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
284 native_platform_string = (_to_platform_string_fn)(env, js, &is_copy); |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
285 assert(is_copy == JNI_TRUE, "is_copy value changed"); |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
286 JNIHandles::destroy_local(js); |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
287 } |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
288 return native_platform_string; |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
289 } |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
290 |
0 | 291 Handle java_lang_String::char_converter(Handle java_string, jchar from_char, jchar to_char, TRAPS) { |
292 oop obj = java_string(); | |
293 // Typical usage is to convert all '/' to '.' in string. | |
294 typeArrayOop value = java_lang_String::value(obj); | |
295 int offset = java_lang_String::offset(obj); | |
296 int length = java_lang_String::length(obj); | |
297 | |
298 // First check if any from_char exist | |
299 int index; // Declared outside, used later | |
300 for (index = 0; index < length; index++) { | |
301 if (value->char_at(index + offset) == from_char) { | |
302 break; | |
303 } | |
304 } | |
305 if (index == length) { | |
306 // No from_char, so do not copy. | |
307 return java_string; | |
308 } | |
309 | |
310 // Create new UNICODE buffer. Must handlize value because GC | |
311 // may happen during String and char array creation. | |
312 typeArrayHandle h_value(THREAD, value); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
313 Handle string = basic_create(length, CHECK_NH); |
0 | 314 |
315 typeArrayOop from_buffer = h_value(); | |
316 typeArrayOop to_buffer = java_lang_String::value(string()); | |
317 | |
318 // Copy contents | |
319 for (index = 0; index < length; index++) { | |
320 jchar c = from_buffer->char_at(index + offset); | |
321 if (c == from_char) { | |
322 c = to_char; | |
323 } | |
324 to_buffer->char_at_put(index, c); | |
325 } | |
326 return string; | |
327 } | |
328 | |
329 jchar* java_lang_String::as_unicode_string(oop java_string, int& length) { | |
330 typeArrayOop value = java_lang_String::value(java_string); | |
331 int offset = java_lang_String::offset(java_string); | |
332 length = java_lang_String::length(java_string); | |
333 | |
334 jchar* result = NEW_RESOURCE_ARRAY(jchar, length); | |
335 for (int index = 0; index < length; index++) { | |
336 result[index] = value->char_at(index + offset); | |
337 } | |
338 return result; | |
339 } | |
340 | |
6162 | 341 unsigned int java_lang_String::to_hash(oop java_string) { |
342 int length = java_lang_String::length(java_string); | |
343 // Zero length string will hash to zero with String.toHash() function. | |
344 if (length == 0) return 0; | |
345 | |
2418
352622fd140a
7032129: Native memory usage grow unexpectedly for vm/oom/*InternedString tests
never
parents:
2416
diff
changeset
|
346 typeArrayOop value = java_lang_String::value(java_string); |
352622fd140a
7032129: Native memory usage grow unexpectedly for vm/oom/*InternedString tests
never
parents:
2416
diff
changeset
|
347 int offset = java_lang_String::offset(java_string); |
6162 | 348 return java_lang_String::to_hash(value->char_at_addr(offset), length); |
349 } | |
350 | |
6972
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
351 char* java_lang_String::as_quoted_ascii(oop java_string) { |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
352 typeArrayOop value = java_lang_String::value(java_string); |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
353 int offset = java_lang_String::offset(java_string); |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
354 int length = java_lang_String::length(java_string); |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
355 |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
356 jchar* base = (length == 0) ? NULL : value->char_at_addr(offset); |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
357 if (base == NULL) return NULL; |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
358 |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
359 int result_length = UNICODE::quoted_ascii_length(base, length) + 1; |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
360 char* result = NEW_RESOURCE_ARRAY(char, result_length); |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
361 UNICODE::as_quoted_ascii(base, length, result, result_length); |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
362 assert(result_length >= length + 1, "must not be shorter"); |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
363 assert(result_length == (int)strlen(result) + 1, "must match"); |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
364 return result; |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
365 } |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
366 |
6162 | 367 unsigned int java_lang_String::hash_string(oop java_string) { |
2418
352622fd140a
7032129: Native memory usage grow unexpectedly for vm/oom/*InternedString tests
never
parents:
2416
diff
changeset
|
368 int length = java_lang_String::length(java_string); |
6162 | 369 // Zero length string doesn't hash necessarily hash to zero. |
370 if (length == 0) { | |
371 return StringTable::hash_string(NULL, 0); | |
372 } | |
373 | |
374 typeArrayOop value = java_lang_String::value(java_string); | |
375 int offset = java_lang_String::offset(java_string); | |
376 return StringTable::hash_string(value->char_at_addr(offset), length); | |
2418
352622fd140a
7032129: Native memory usage grow unexpectedly for vm/oom/*InternedString tests
never
parents:
2416
diff
changeset
|
377 } |
352622fd140a
7032129: Native memory usage grow unexpectedly for vm/oom/*InternedString tests
never
parents:
2416
diff
changeset
|
378 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
379 Symbol* java_lang_String::as_symbol(Handle java_string, TRAPS) { |
0 | 380 oop obj = java_string(); |
381 typeArrayOop value = java_lang_String::value(obj); | |
382 int offset = java_lang_String::offset(obj); | |
383 int length = java_lang_String::length(obj); | |
949
489a4f8dcd0f
6865583: Verbose CIPrintMethodCodes asserts when ldc an empty String
twisti
parents:
931
diff
changeset
|
384 jchar* base = (length == 0) ? NULL : value->char_at_addr(offset); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
385 Symbol* sym = SymbolTable::lookup_unicode(base, length, THREAD); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
386 return sym; |
0 | 387 } |
388 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
389 Symbol* java_lang_String::as_symbol_or_null(oop java_string) { |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
390 typeArrayOop value = java_lang_String::value(java_string); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
391 int offset = java_lang_String::offset(java_string); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
392 int length = java_lang_String::length(java_string); |
949
489a4f8dcd0f
6865583: Verbose CIPrintMethodCodes asserts when ldc an empty String
twisti
parents:
931
diff
changeset
|
393 jchar* base = (length == 0) ? NULL : value->char_at_addr(offset); |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
394 return SymbolTable::probe_unicode(base, length); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
395 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
396 |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
397 |
0 | 398 int java_lang_String::utf8_length(oop java_string) { |
399 typeArrayOop value = java_lang_String::value(java_string); | |
400 int offset = java_lang_String::offset(java_string); | |
401 int length = java_lang_String::length(java_string); | |
402 jchar* position = (length == 0) ? NULL : value->char_at_addr(offset); | |
403 return UNICODE::utf8_length(position, length); | |
404 } | |
405 | |
406 char* java_lang_String::as_utf8_string(oop java_string) { | |
407 typeArrayOop value = java_lang_String::value(java_string); | |
408 int offset = java_lang_String::offset(java_string); | |
409 int length = java_lang_String::length(java_string); | |
410 jchar* position = (length == 0) ? NULL : value->char_at_addr(offset); | |
411 return UNICODE::as_utf8(position, length); | |
412 } | |
413 | |
1989
017cd8bce8a8
6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
sla
parents:
1980
diff
changeset
|
414 char* java_lang_String::as_utf8_string(oop java_string, char* buf, int buflen) { |
017cd8bce8a8
6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
sla
parents:
1980
diff
changeset
|
415 typeArrayOop value = java_lang_String::value(java_string); |
017cd8bce8a8
6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
sla
parents:
1980
diff
changeset
|
416 int offset = java_lang_String::offset(java_string); |
017cd8bce8a8
6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
sla
parents:
1980
diff
changeset
|
417 int length = java_lang_String::length(java_string); |
017cd8bce8a8
6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
sla
parents:
1980
diff
changeset
|
418 jchar* position = (length == 0) ? NULL : value->char_at_addr(offset); |
017cd8bce8a8
6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
sla
parents:
1980
diff
changeset
|
419 return UNICODE::as_utf8(position, length, buf, buflen); |
017cd8bce8a8
6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
sla
parents:
1980
diff
changeset
|
420 } |
017cd8bce8a8
6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
sla
parents:
1980
diff
changeset
|
421 |
0 | 422 char* java_lang_String::as_utf8_string(oop java_string, int start, int len) { |
423 typeArrayOop value = java_lang_String::value(java_string); | |
424 int offset = java_lang_String::offset(java_string); | |
425 int length = java_lang_String::length(java_string); | |
426 assert(start + len <= length, "just checking"); | |
427 jchar* position = value->char_at_addr(offset + start); | |
428 return UNICODE::as_utf8(position, len); | |
429 } | |
430 | |
431 bool java_lang_String::equals(oop java_string, jchar* chars, int len) { | |
6867 | 432 assert(java_string->klass() == SystemDictionary::String_klass(), |
0 | 433 "must be java_string"); |
434 typeArrayOop value = java_lang_String::value(java_string); | |
435 int offset = java_lang_String::offset(java_string); | |
436 int length = java_lang_String::length(java_string); | |
437 if (length != len) { | |
438 return false; | |
439 } | |
440 for (int i = 0; i < len; i++) { | |
441 if (value->char_at(i + offset) != chars[i]) { | |
442 return false; | |
443 } | |
444 } | |
445 return true; | |
446 } | |
447 | |
448 void java_lang_String::print(Handle java_string, outputStream* st) { | |
449 oop obj = java_string(); | |
1142 | 450 assert(obj->klass() == SystemDictionary::String_klass(), "must be java_string"); |
0 | 451 typeArrayOop value = java_lang_String::value(obj); |
452 int offset = java_lang_String::offset(obj); | |
453 int length = java_lang_String::length(obj); | |
454 | |
455 int end = MIN2(length, 100); | |
456 if (value == NULL) { | |
457 // This can happen if, e.g., printing a String | |
458 // object before its initializer has been called | |
459 st->print_cr("NULL"); | |
460 } else { | |
461 st->print("\""); | |
462 for (int index = 0; index < length; index++) { | |
463 st->print("%c", value->char_at(index + offset)); | |
464 } | |
465 st->print("\""); | |
466 } | |
467 } | |
468 | |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
469 static void initialize_static_field(fieldDescriptor* fd, TRAPS) { |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
470 Handle mirror (THREAD, fd->field_holder()->java_mirror()); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
471 assert(mirror.not_null() && fd->is_static(), "just checking"); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
472 if (fd->has_initial_value()) { |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
473 BasicType t = fd->field_type(); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
474 switch (t) { |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
475 case T_BYTE: |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
476 mirror()->byte_field_put(fd->offset(), fd->int_initial_value()); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
477 break; |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
478 case T_BOOLEAN: |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
479 mirror()->bool_field_put(fd->offset(), fd->int_initial_value()); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
480 break; |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
481 case T_CHAR: |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
482 mirror()->char_field_put(fd->offset(), fd->int_initial_value()); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
483 break; |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
484 case T_SHORT: |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
485 mirror()->short_field_put(fd->offset(), fd->int_initial_value()); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
486 break; |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
487 case T_INT: |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
488 mirror()->int_field_put(fd->offset(), fd->int_initial_value()); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
489 break; |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
490 case T_FLOAT: |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
491 mirror()->float_field_put(fd->offset(), fd->float_initial_value()); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
492 break; |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
493 case T_DOUBLE: |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
494 mirror()->double_field_put(fd->offset(), fd->double_initial_value()); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
495 break; |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
496 case T_LONG: |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
497 mirror()->long_field_put(fd->offset(), fd->long_initial_value()); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
498 break; |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
499 case T_OBJECT: |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
500 { |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
501 #ifdef ASSERT |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
502 TempNewSymbol sym = SymbolTable::new_symbol("Ljava/lang/String;", CHECK); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
503 assert(fd->signature() == sym, "just checking"); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
504 #endif |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
505 oop string = fd->string_initial_value(CHECK); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
506 mirror()->obj_field_put(fd->offset(), string); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
507 } |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
508 break; |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
509 default: |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
510 THROW_MSG(vmSymbols::java_lang_ClassFormatError(), |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
511 "Illegal ConstantValue attribute in class file"); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
512 } |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
513 } |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
514 } |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
515 |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
516 |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
517 void java_lang_Class::fixup_mirror(KlassHandle k, TRAPS) { |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
518 assert(InstanceMirrorKlass::offset_of_static_fields() != 0, "must have been computed already"); |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
519 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
520 // If the offset was read from the shared archive, it was fixed up already |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
521 if (!k->is_shared()) { |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
522 if (k->oop_is_instance()) { |
3938 | 523 // During bootstrap, java.lang.Class wasn't loaded so static field |
524 // offsets were computed without the size added it. Go back and | |
525 // update all the static field offsets to included the size. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
526 for (JavaFieldStream fs(InstanceKlass::cast(k())); !fs.done(); fs.next()) { |
3938 | 527 if (fs.access_flags().is_static()) { |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
528 int real_offset = fs.offset() + InstanceMirrorKlass::offset_of_static_fields(); |
3938 | 529 fs.set_offset(real_offset); |
530 } | |
531 } | |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
532 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
533 } |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
534 create_mirror(k, CHECK); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
535 } |
0 | 536 |
537 oop java_lang_Class::create_mirror(KlassHandle k, TRAPS) { | |
538 assert(k->java_mirror() == NULL, "should only assign mirror once"); | |
539 // Use this moment of initialization to cache modifier_flags also, | |
540 // to support Class.getModifiers(). Instance classes recalculate | |
541 // the cached flags after the class file is parsed, but before the | |
542 // class is put into the system dictionary. | |
543 int computed_modifiers = k->compute_modifier_flags(CHECK_0); | |
544 k->set_modifier_flags(computed_modifiers); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
545 // Class_klass has to be loaded because it is used to allocate |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
546 // the mirror. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
547 if (SystemDictionary::Class_klass_loaded()) { |
0 | 548 // Allocate mirror (java.lang.Class instance) |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
549 Handle mirror = InstanceMirrorKlass::cast(SystemDictionary::Class_klass())->allocate_instance(k, CHECK_0); |
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
550 |
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
551 InstanceMirrorKlass* mk = InstanceMirrorKlass::cast(mirror->klass()); |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
552 java_lang_Class::set_static_oop_field_count(mirror(), mk->compute_static_oop_field_count(mirror())); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
553 |
0 | 554 // It might also have a component mirror. This mirror must already exist. |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
555 if (k->oop_is_array()) { |
0 | 556 Handle comp_mirror; |
557 if (k->oop_is_typeArray()) { | |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
558 BasicType type = TypeArrayKlass::cast(k())->element_type(); |
0 | 559 comp_mirror = Universe::java_mirror(type); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
560 } else { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
561 assert(k->oop_is_objArray(), "Must be"); |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
562 Klass* element_klass = ObjArrayKlass::cast(k())->element_klass(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
563 assert(element_klass != NULL, "Must have an element klass"); |
6983 | 564 comp_mirror = element_klass->java_mirror(); |
0 | 565 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
566 assert(comp_mirror.not_null(), "must have a mirror"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
567 |
0 | 568 // Two-way link between the array klass and its component mirror: |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
569 ArrayKlass::cast(k())->set_component_mirror(comp_mirror()); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
570 set_array_klass(comp_mirror(), k()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
571 } else { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
572 assert(k->oop_is_instance(), "Must be"); |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
573 // Initialize static fields |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
574 InstanceKlass::cast(k())->do_local_static_fields(&initialize_static_field, CHECK_NULL); |
0 | 575 } |
576 return mirror(); | |
577 } else { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
578 if (fixup_mirror_list() == NULL) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
579 GrowableArray<Klass*>* list = |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
580 new (ResourceObj::C_HEAP, mtClass) GrowableArray<Klass*>(40, true); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
581 set_fixup_mirror_list(list); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
582 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
583 fixup_mirror_list()->push(k()); |
0 | 584 return NULL; |
585 } | |
586 } | |
587 | |
588 | |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
589 |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
590 int java_lang_Class::oop_size(oop java_class) { |
3938 | 591 assert(_oop_size_offset != 0, "must be set"); |
592 return java_class->int_field(_oop_size_offset); | |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
593 } |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
594 void java_lang_Class::set_oop_size(oop java_class, int size) { |
3938 | 595 assert(_oop_size_offset != 0, "must be set"); |
596 java_class->int_field_put(_oop_size_offset, size); | |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
597 } |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
598 int java_lang_Class::static_oop_field_count(oop java_class) { |
3938 | 599 assert(_static_oop_field_count_offset != 0, "must be set"); |
600 return java_class->int_field(_static_oop_field_count_offset); | |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
601 } |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
602 void java_lang_Class::set_static_oop_field_count(oop java_class, int size) { |
3938 | 603 assert(_static_oop_field_count_offset != 0, "must be set"); |
604 java_class->int_field_put(_static_oop_field_count_offset, size); | |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
605 } |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
606 |
0 | 607 oop java_lang_Class::create_basic_type_mirror(const char* basic_type_name, BasicType type, TRAPS) { |
608 // This should be improved by adding a field at the Java level or by | |
609 // introducing a new VM klass (see comment in ClassFileParser) | |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
610 oop java_class = InstanceMirrorKlass::cast(SystemDictionary::Class_klass())->allocate_instance(NULL, CHECK_0); |
0 | 611 if (type != T_VOID) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
612 Klass* aklass = Universe::typeArrayKlassObj(type); |
0 | 613 assert(aklass != NULL, "correct bootstrap"); |
614 set_array_klass(java_class, aklass); | |
615 } | |
4009 | 616 #ifdef ASSERT |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
617 InstanceMirrorKlass* mk = InstanceMirrorKlass::cast(SystemDictionary::Class_klass()); |
4009 | 618 assert(java_lang_Class::static_oop_field_count(java_class) == 0, "should have been zeroed by allocation"); |
619 #endif | |
0 | 620 return java_class; |
621 } | |
622 | |
6948
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
623 #ifdef GRAAL |
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
624 oop java_lang_Class::graal_mirror(oop java_class) { |
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
625 assert(_graal_mirror_offset != 0, "must be set"); |
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
626 return java_class->obj_field(_graal_mirror_offset); |
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
627 } |
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
628 #endif |
0 | 629 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
630 Klass* java_lang_Class::as_Klass(oop java_class) { |
0 | 631 //%note memory_2 |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
632 assert(java_lang_Class::is_instance(java_class), "must be a Class object"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
633 Klass* k = ((Klass*)java_class->metadata_field(_klass_offset)); |
0 | 634 assert(k == NULL || k->is_klass(), "type check"); |
635 return k; | |
636 } | |
637 | |
638 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
639 void java_lang_Class::set_klass(oop java_class, Klass* klass) { |
4009 | 640 assert(java_lang_Class::is_instance(java_class), "must be a Class object"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
641 java_class->metadata_field_put(_klass_offset, klass); |
4009 | 642 } |
643 | |
644 | |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
645 void java_lang_Class::print_signature(oop java_class, outputStream* st) { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
646 assert(java_lang_Class::is_instance(java_class), "must be a Class object"); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
647 Symbol* name = NULL; |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
648 bool is_instance = false; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
649 if (is_primitive(java_class)) { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
650 name = vmSymbols::type_signature(primitive_type(java_class)); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
651 } else { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
652 Klass* k = as_Klass(java_class); |
6983 | 653 is_instance = k->oop_is_instance(); |
654 name = k->name(); | |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
655 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
656 if (name == NULL) { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
657 st->print("<null>"); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
658 return; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
659 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
660 if (is_instance) st->print("L"); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
661 st->write((char*) name->base(), (int) name->utf8_length()); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
662 if (is_instance) st->print(";"); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
663 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
664 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
665 Symbol* java_lang_Class::as_signature(oop java_class, bool intern_if_not_found, TRAPS) { |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
666 assert(java_lang_Class::is_instance(java_class), "must be a Class object"); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
667 Symbol* name; |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
668 if (is_primitive(java_class)) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
669 name = vmSymbols::type_signature(primitive_type(java_class)); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
670 // Because this can create a new symbol, the caller has to decrement |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
671 // the refcount, so make adjustment here and below for symbols returned |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
672 // that are not created or incremented due to a successful lookup. |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
673 name->increment_refcount(); |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
674 } else { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
675 Klass* k = as_Klass(java_class); |
6983 | 676 if (!k->oop_is_instance()) { |
677 name = k->name(); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
678 name->increment_refcount(); |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
679 } else { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
680 ResourceMark rm; |
6983 | 681 const char* sigstr = k->signature_name(); |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
682 int siglen = (int) strlen(sigstr); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
683 if (!intern_if_not_found) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
684 name = SymbolTable::probe(sigstr, siglen); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
685 } else { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
686 name = SymbolTable::new_symbol(sigstr, siglen, THREAD); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
687 } |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
688 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
689 } |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
690 return name; |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
691 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
692 |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
693 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
694 Klass* java_lang_Class::array_klass(oop java_class) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
695 Klass* k = ((Klass*)java_class->metadata_field(_array_klass_offset)); |
6983 | 696 assert(k == NULL || k->is_klass() && k->oop_is_array(), "should be array klass"); |
0 | 697 return k; |
698 } | |
699 | |
700 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
701 void java_lang_Class::set_array_klass(oop java_class, Klass* klass) { |
6983 | 702 assert(klass->is_klass() && klass->oop_is_array(), "should be array klass"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
703 java_class->metadata_field_put(_array_klass_offset, klass); |
0 | 704 } |
705 | |
706 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
707 Method* java_lang_Class::resolved_constructor(oop java_class) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
708 Metadata* constructor = java_class->metadata_field(_resolved_constructor_offset); |
0 | 709 assert(constructor == NULL || constructor->is_method(), "should be method"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
710 return ((Method*)constructor); |
0 | 711 } |
712 | |
713 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
714 void java_lang_Class::set_resolved_constructor(oop java_class, Method* constructor) { |
0 | 715 assert(constructor->is_method(), "should be method"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
716 java_class->metadata_field_put(_resolved_constructor_offset, constructor); |
0 | 717 } |
718 | |
719 | |
720 bool java_lang_Class::is_primitive(oop java_class) { | |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
721 // should assert: |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
722 //assert(java_lang_Class::is_instance(java_class), "must be a Class object"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
723 bool is_primitive = (java_class->metadata_field(_klass_offset) == NULL); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
724 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
725 #ifdef ASSERT |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
726 if (is_primitive) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
727 Klass* k = ((Klass*)java_class->metadata_field(_array_klass_offset)); |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
728 assert(k == NULL || is_java_primitive(ArrayKlass::cast(k)->element_type()), |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
729 "Should be either the T_VOID primitive or a java primitive"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
730 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
731 #endif |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
732 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
733 return is_primitive; |
0 | 734 } |
735 | |
736 | |
737 BasicType java_lang_Class::primitive_type(oop java_class) { | |
738 assert(java_lang_Class::is_primitive(java_class), "just checking"); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
739 Klass* ak = ((Klass*)java_class->metadata_field(_array_klass_offset)); |
0 | 740 BasicType type = T_VOID; |
741 if (ak != NULL) { | |
742 // Note: create_basic_type_mirror above initializes ak to a non-null value. | |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
743 type = ArrayKlass::cast(ak)->element_type(); |
0 | 744 } else { |
745 assert(java_class == Universe::void_mirror(), "only valid non-array primitive"); | |
746 } | |
747 assert(Universe::java_mirror(type) == java_class, "must be consistent"); | |
748 return type; | |
749 } | |
750 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
751 BasicType java_lang_Class::as_BasicType(oop java_class, Klass** reference_klass) { |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
752 assert(java_lang_Class::is_instance(java_class), "must be a Class object"); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
753 if (is_primitive(java_class)) { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
754 if (reference_klass != NULL) |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
755 (*reference_klass) = NULL; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
756 return primitive_type(java_class); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
757 } else { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
758 if (reference_klass != NULL) |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
759 (*reference_klass) = as_Klass(java_class); |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
760 return T_OBJECT; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
761 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
762 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
763 |
0 | 764 |
765 oop java_lang_Class::primitive_mirror(BasicType t) { | |
766 oop mirror = Universe::java_mirror(t); | |
1142 | 767 assert(mirror != NULL && mirror->is_a(SystemDictionary::Class_klass()), "must be a Class"); |
0 | 768 assert(java_lang_Class::is_primitive(mirror), "must be primitive"); |
769 return mirror; | |
770 } | |
771 | |
772 bool java_lang_Class::offsets_computed = false; | |
773 int java_lang_Class::classRedefinedCount_offset = -1; | |
774 | |
775 void java_lang_Class::compute_offsets() { | |
776 assert(!offsets_computed, "offsets should be initialized only once"); | |
777 offsets_computed = true; | |
778 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
779 Klass* klass_oop = SystemDictionary::Class_klass(); |
0 | 780 // The classRedefinedCount field is only present starting in 1.5, |
781 // so don't go fatal. | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
782 compute_optional_offset(classRedefinedCount_offset, |
3938 | 783 klass_oop, vmSymbols::classRedefinedCount_name(), vmSymbols::int_signature()); |
784 | |
785 CLASS_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET); | |
0 | 786 } |
787 | |
788 int java_lang_Class::classRedefinedCount(oop the_class_mirror) { | |
789 if (!JDK_Version::is_gte_jdk15x_version() | |
790 || classRedefinedCount_offset == -1) { | |
791 // The classRedefinedCount field is only present starting in 1.5. | |
792 // If we don't have an offset for it then just return -1 as a marker. | |
793 return -1; | |
794 } | |
795 | |
796 return the_class_mirror->int_field(classRedefinedCount_offset); | |
797 } | |
798 | |
799 void java_lang_Class::set_classRedefinedCount(oop the_class_mirror, int value) { | |
800 if (!JDK_Version::is_gte_jdk15x_version() | |
801 || classRedefinedCount_offset == -1) { | |
802 // The classRedefinedCount field is only present starting in 1.5. | |
803 // If we don't have an offset for it then nothing to set. | |
804 return; | |
805 } | |
806 | |
807 the_class_mirror->int_field_put(classRedefinedCount_offset, value); | |
808 } | |
809 | |
810 | |
811 // Note: JDK1.1 and before had a privateInfo_offset field which was used for the | |
812 // platform thread structure, and a eetop offset which was used for thread | |
813 // local storage (and unused by the HotSpot VM). In JDK1.2 the two structures | |
814 // merged, so in the HotSpot VM we just use the eetop field for the thread | |
815 // instead of the privateInfo_offset. | |
816 // | |
817 // Note: The stackSize field is only present starting in 1.4. | |
818 | |
819 int java_lang_Thread::_name_offset = 0; | |
820 int java_lang_Thread::_group_offset = 0; | |
821 int java_lang_Thread::_contextClassLoader_offset = 0; | |
822 int java_lang_Thread::_inheritedAccessControlContext_offset = 0; | |
823 int java_lang_Thread::_priority_offset = 0; | |
824 int java_lang_Thread::_eetop_offset = 0; | |
825 int java_lang_Thread::_daemon_offset = 0; | |
826 int java_lang_Thread::_stillborn_offset = 0; | |
827 int java_lang_Thread::_stackSize_offset = 0; | |
828 int java_lang_Thread::_tid_offset = 0; | |
829 int java_lang_Thread::_thread_status_offset = 0; | |
830 int java_lang_Thread::_park_blocker_offset = 0; | |
831 int java_lang_Thread::_park_event_offset = 0 ; | |
832 | |
833 | |
834 void java_lang_Thread::compute_offsets() { | |
835 assert(_group_offset == 0, "offsets should be initialized only once"); | |
836 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
837 Klass* k = SystemDictionary::Thread_klass(); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
838 compute_offset(_name_offset, k, vmSymbols::name_name(), vmSymbols::char_array_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
839 compute_offset(_group_offset, k, vmSymbols::group_name(), vmSymbols::threadgroup_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
840 compute_offset(_contextClassLoader_offset, k, vmSymbols::contextClassLoader_name(), vmSymbols::classloader_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
841 compute_offset(_inheritedAccessControlContext_offset, k, vmSymbols::inheritedAccessControlContext_name(), vmSymbols::accesscontrolcontext_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
842 compute_offset(_priority_offset, k, vmSymbols::priority_name(), vmSymbols::int_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
843 compute_offset(_daemon_offset, k, vmSymbols::daemon_name(), vmSymbols::bool_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
844 compute_offset(_eetop_offset, k, vmSymbols::eetop_name(), vmSymbols::long_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
845 compute_offset(_stillborn_offset, k, vmSymbols::stillborn_name(), vmSymbols::bool_signature()); |
0 | 846 // The stackSize field is only present starting in 1.4, so don't go fatal. |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
847 compute_optional_offset(_stackSize_offset, k, vmSymbols::stackSize_name(), vmSymbols::long_signature()); |
0 | 848 // The tid and thread_status fields are only present starting in 1.5, so don't go fatal. |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
849 compute_optional_offset(_tid_offset, k, vmSymbols::thread_id_name(), vmSymbols::long_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
850 compute_optional_offset(_thread_status_offset, k, vmSymbols::thread_status_name(), vmSymbols::int_signature()); |
0 | 851 // The parkBlocker field is only present starting in 1.6, so don't go fatal. |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
852 compute_optional_offset(_park_blocker_offset, k, vmSymbols::park_blocker_name(), vmSymbols::object_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
853 compute_optional_offset(_park_event_offset, k, vmSymbols::park_event_name(), |
0 | 854 vmSymbols::long_signature()); |
855 } | |
856 | |
857 | |
858 JavaThread* java_lang_Thread::thread(oop java_thread) { | |
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
859 return (JavaThread*)java_thread->address_field(_eetop_offset); |
0 | 860 } |
861 | |
862 | |
863 void java_lang_Thread::set_thread(oop java_thread, JavaThread* thread) { | |
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
864 java_thread->address_field_put(_eetop_offset, (address)thread); |
0 | 865 } |
866 | |
867 | |
868 typeArrayOop java_lang_Thread::name(oop java_thread) { | |
869 oop name = java_thread->obj_field(_name_offset); | |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
870 assert(name == NULL || (name->is_typeArray() && TypeArrayKlass::cast(name->klass())->element_type() == T_CHAR), "just checking"); |
0 | 871 return typeArrayOop(name); |
872 } | |
873 | |
874 | |
875 void java_lang_Thread::set_name(oop java_thread, typeArrayOop name) { | |
876 assert(java_thread->obj_field(_name_offset) == NULL, "name should be NULL"); | |
877 java_thread->obj_field_put(_name_offset, name); | |
878 } | |
879 | |
880 | |
881 ThreadPriority java_lang_Thread::priority(oop java_thread) { | |
882 return (ThreadPriority)java_thread->int_field(_priority_offset); | |
883 } | |
884 | |
885 | |
886 void java_lang_Thread::set_priority(oop java_thread, ThreadPriority priority) { | |
887 java_thread->int_field_put(_priority_offset, priority); | |
888 } | |
889 | |
890 | |
891 oop java_lang_Thread::threadGroup(oop java_thread) { | |
892 return java_thread->obj_field(_group_offset); | |
893 } | |
894 | |
895 | |
896 bool java_lang_Thread::is_stillborn(oop java_thread) { | |
897 return java_thread->bool_field(_stillborn_offset) != 0; | |
898 } | |
899 | |
900 | |
901 // We never have reason to turn the stillborn bit off | |
902 void java_lang_Thread::set_stillborn(oop java_thread) { | |
903 java_thread->bool_field_put(_stillborn_offset, true); | |
904 } | |
905 | |
906 | |
907 bool java_lang_Thread::is_alive(oop java_thread) { | |
908 JavaThread* thr = java_lang_Thread::thread(java_thread); | |
909 return (thr != NULL); | |
910 } | |
911 | |
912 | |
913 bool java_lang_Thread::is_daemon(oop java_thread) { | |
914 return java_thread->bool_field(_daemon_offset) != 0; | |
915 } | |
916 | |
917 | |
918 void java_lang_Thread::set_daemon(oop java_thread) { | |
919 java_thread->bool_field_put(_daemon_offset, true); | |
920 } | |
921 | |
922 oop java_lang_Thread::context_class_loader(oop java_thread) { | |
923 return java_thread->obj_field(_contextClassLoader_offset); | |
924 } | |
925 | |
926 oop java_lang_Thread::inherited_access_control_context(oop java_thread) { | |
927 return java_thread->obj_field(_inheritedAccessControlContext_offset); | |
928 } | |
929 | |
930 | |
931 jlong java_lang_Thread::stackSize(oop java_thread) { | |
932 // The stackSize field is only present starting in 1.4 | |
933 if (_stackSize_offset > 0) { | |
934 assert(JDK_Version::is_gte_jdk14x_version(), "sanity check"); | |
935 return java_thread->long_field(_stackSize_offset); | |
936 } else { | |
937 return 0; | |
938 } | |
939 } | |
940 | |
941 // Write the thread status value to threadStatus field in java.lang.Thread java class. | |
942 void java_lang_Thread::set_thread_status(oop java_thread, | |
943 java_lang_Thread::ThreadStatus status) { | |
944 assert(JavaThread::current()->thread_state() == _thread_in_vm, "Java Thread is not running in vm"); | |
945 // The threadStatus is only present starting in 1.5 | |
946 if (_thread_status_offset > 0) { | |
947 java_thread->int_field_put(_thread_status_offset, status); | |
948 } | |
949 } | |
950 | |
951 // Read thread status value from threadStatus field in java.lang.Thread java class. | |
952 java_lang_Thread::ThreadStatus java_lang_Thread::get_thread_status(oop java_thread) { | |
953 assert(Thread::current()->is_VM_thread() || | |
954 JavaThread::current()->thread_state() == _thread_in_vm, | |
955 "Java Thread is not running in vm"); | |
956 // The threadStatus is only present starting in 1.5 | |
957 if (_thread_status_offset > 0) { | |
958 return (java_lang_Thread::ThreadStatus)java_thread->int_field(_thread_status_offset); | |
959 } else { | |
960 // All we can easily figure out is if it is alive, but that is | |
961 // enough info for a valid unknown status. | |
962 // These aren't restricted to valid set ThreadStatus values, so | |
963 // use JVMTI values and cast. | |
964 JavaThread* thr = java_lang_Thread::thread(java_thread); | |
965 if (thr == NULL) { | |
966 // the thread hasn't run yet or is in the process of exiting | |
967 return NEW; | |
968 } | |
969 return (java_lang_Thread::ThreadStatus)JVMTI_THREAD_STATE_ALIVE; | |
970 } | |
971 } | |
972 | |
973 | |
974 jlong java_lang_Thread::thread_id(oop java_thread) { | |
975 // The thread ID field is only present starting in 1.5 | |
976 if (_tid_offset > 0) { | |
977 return java_thread->long_field(_tid_offset); | |
978 } else { | |
979 return 0; | |
980 } | |
981 } | |
982 | |
983 oop java_lang_Thread::park_blocker(oop java_thread) { | |
242 | 984 assert(JDK_Version::current().supports_thread_park_blocker() && |
985 _park_blocker_offset != 0, "Must support parkBlocker field"); | |
0 | 986 |
987 if (_park_blocker_offset > 0) { | |
988 return java_thread->obj_field(_park_blocker_offset); | |
989 } | |
990 | |
991 return NULL; | |
992 } | |
993 | |
994 jlong java_lang_Thread::park_event(oop java_thread) { | |
995 if (_park_event_offset > 0) { | |
996 return java_thread->long_field(_park_event_offset); | |
997 } | |
998 return 0; | |
999 } | |
1000 | |
1001 bool java_lang_Thread::set_park_event(oop java_thread, jlong ptr) { | |
1002 if (_park_event_offset > 0) { | |
1003 java_thread->long_field_put(_park_event_offset, ptr); | |
1004 return true; | |
1005 } | |
1006 return false; | |
1007 } | |
1008 | |
1009 | |
1010 const char* java_lang_Thread::thread_status_name(oop java_thread) { | |
1011 assert(JDK_Version::is_gte_jdk15x_version() && _thread_status_offset != 0, "Must have thread status"); | |
1012 ThreadStatus status = (java_lang_Thread::ThreadStatus)java_thread->int_field(_thread_status_offset); | |
1013 switch (status) { | |
1014 case NEW : return "NEW"; | |
1015 case RUNNABLE : return "RUNNABLE"; | |
1016 case SLEEPING : return "TIMED_WAITING (sleeping)"; | |
1017 case IN_OBJECT_WAIT : return "WAITING (on object monitor)"; | |
1018 case IN_OBJECT_WAIT_TIMED : return "TIMED_WAITING (on object monitor)"; | |
1019 case PARKED : return "WAITING (parking)"; | |
1020 case PARKED_TIMED : return "TIMED_WAITING (parking)"; | |
1021 case BLOCKED_ON_MONITOR_ENTER : return "BLOCKED (on object monitor)"; | |
1022 case TERMINATED : return "TERMINATED"; | |
1023 default : return "UNKNOWN"; | |
1024 }; | |
1025 } | |
1026 int java_lang_ThreadGroup::_parent_offset = 0; | |
1027 int java_lang_ThreadGroup::_name_offset = 0; | |
1028 int java_lang_ThreadGroup::_threads_offset = 0; | |
1029 int java_lang_ThreadGroup::_groups_offset = 0; | |
1030 int java_lang_ThreadGroup::_maxPriority_offset = 0; | |
1031 int java_lang_ThreadGroup::_destroyed_offset = 0; | |
1032 int java_lang_ThreadGroup::_daemon_offset = 0; | |
1033 int java_lang_ThreadGroup::_vmAllowSuspension_offset = 0; | |
1034 int java_lang_ThreadGroup::_nthreads_offset = 0; | |
1035 int java_lang_ThreadGroup::_ngroups_offset = 0; | |
1036 | |
1037 oop java_lang_ThreadGroup::parent(oop java_thread_group) { | |
1038 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
1039 return java_thread_group->obj_field(_parent_offset); | |
1040 } | |
1041 | |
1042 // ("name as oop" accessor is not necessary) | |
1043 | |
1044 typeArrayOop java_lang_ThreadGroup::name(oop java_thread_group) { | |
1045 oop name = java_thread_group->obj_field(_name_offset); | |
1046 // ThreadGroup.name can be null | |
1047 return name == NULL ? (typeArrayOop)NULL : java_lang_String::value(name); | |
1048 } | |
1049 | |
1050 int java_lang_ThreadGroup::nthreads(oop java_thread_group) { | |
1051 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
1052 return java_thread_group->int_field(_nthreads_offset); | |
1053 } | |
1054 | |
1055 objArrayOop java_lang_ThreadGroup::threads(oop java_thread_group) { | |
1056 oop threads = java_thread_group->obj_field(_threads_offset); | |
1057 assert(threads != NULL, "threadgroups should have threads"); | |
1058 assert(threads->is_objArray(), "just checking"); // Todo: Add better type checking code | |
1059 return objArrayOop(threads); | |
1060 } | |
1061 | |
1062 int java_lang_ThreadGroup::ngroups(oop java_thread_group) { | |
1063 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
1064 return java_thread_group->int_field(_ngroups_offset); | |
1065 } | |
1066 | |
1067 objArrayOop java_lang_ThreadGroup::groups(oop java_thread_group) { | |
1068 oop groups = java_thread_group->obj_field(_groups_offset); | |
1069 assert(groups == NULL || groups->is_objArray(), "just checking"); // Todo: Add better type checking code | |
1070 return objArrayOop(groups); | |
1071 } | |
1072 | |
1073 ThreadPriority java_lang_ThreadGroup::maxPriority(oop java_thread_group) { | |
1074 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
1075 return (ThreadPriority) java_thread_group->int_field(_maxPriority_offset); | |
1076 } | |
1077 | |
1078 bool java_lang_ThreadGroup::is_destroyed(oop java_thread_group) { | |
1079 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
1080 return java_thread_group->bool_field(_destroyed_offset) != 0; | |
1081 } | |
1082 | |
1083 bool java_lang_ThreadGroup::is_daemon(oop java_thread_group) { | |
1084 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
1085 return java_thread_group->bool_field(_daemon_offset) != 0; | |
1086 } | |
1087 | |
1088 bool java_lang_ThreadGroup::is_vmAllowSuspension(oop java_thread_group) { | |
1089 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
1090 return java_thread_group->bool_field(_vmAllowSuspension_offset) != 0; | |
1091 } | |
1092 | |
1093 void java_lang_ThreadGroup::compute_offsets() { | |
1094 assert(_parent_offset == 0, "offsets should be initialized only once"); | |
1095 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1096 Klass* k = SystemDictionary::ThreadGroup_klass(); |
0 | 1097 |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1098 compute_offset(_parent_offset, k, vmSymbols::parent_name(), vmSymbols::threadgroup_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1099 compute_offset(_name_offset, k, vmSymbols::name_name(), vmSymbols::string_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1100 compute_offset(_threads_offset, k, vmSymbols::threads_name(), vmSymbols::thread_array_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1101 compute_offset(_groups_offset, k, vmSymbols::groups_name(), vmSymbols::threadgroup_array_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1102 compute_offset(_maxPriority_offset, k, vmSymbols::maxPriority_name(), vmSymbols::int_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1103 compute_offset(_destroyed_offset, k, vmSymbols::destroyed_name(), vmSymbols::bool_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1104 compute_offset(_daemon_offset, k, vmSymbols::daemon_name(), vmSymbols::bool_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1105 compute_offset(_vmAllowSuspension_offset, k, vmSymbols::vmAllowSuspension_name(), vmSymbols::bool_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1106 compute_offset(_nthreads_offset, k, vmSymbols::nthreads_name(), vmSymbols::int_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1107 compute_offset(_ngroups_offset, k, vmSymbols::ngroups_name(), vmSymbols::int_signature()); |
0 | 1108 } |
1109 | |
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1110 oop java_lang_Throwable::unassigned_stacktrace() { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1111 InstanceKlass* ik = InstanceKlass::cast(SystemDictionary::Throwable_klass()); |
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1112 address addr = ik->static_field_addr(static_unassigned_stacktrace_offset); |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1113 if (UseCompressedOops) { |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1114 return oopDesc::load_decode_heap_oop((narrowOop *)addr); |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1115 } else { |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1116 return oopDesc::load_decode_heap_oop((oop*)addr); |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1117 } |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1118 } |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1119 |
0 | 1120 oop java_lang_Throwable::backtrace(oop throwable) { |
1121 return throwable->obj_field_acquire(backtrace_offset); | |
1122 } | |
1123 | |
1124 | |
1125 void java_lang_Throwable::set_backtrace(oop throwable, oop value) { | |
1126 throwable->release_obj_field_put(backtrace_offset, value); | |
1127 } | |
1128 | |
1129 | |
1130 oop java_lang_Throwable::message(oop throwable) { | |
1131 return throwable->obj_field(detailMessage_offset); | |
1132 } | |
1133 | |
1134 | |
1135 oop java_lang_Throwable::message(Handle throwable) { | |
1136 return throwable->obj_field(detailMessage_offset); | |
1137 } | |
1138 | |
1139 | |
1140 void java_lang_Throwable::set_message(oop throwable, oop value) { | |
1141 throwable->obj_field_put(detailMessage_offset, value); | |
1142 } | |
1143 | |
1144 | |
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1145 void java_lang_Throwable::set_stacktrace(oop throwable, oop st_element_array) { |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1146 throwable->obj_field_put(stackTrace_offset, st_element_array); |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1147 } |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1148 |
0 | 1149 void java_lang_Throwable::clear_stacktrace(oop throwable) { |
1150 assert(JDK_Version::is_gte_jdk14x_version(), "should only be called in >= 1.4"); | |
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1151 set_stacktrace(throwable, NULL); |
0 | 1152 } |
1153 | |
1154 | |
1155 void java_lang_Throwable::print(oop throwable, outputStream* st) { | |
1156 ResourceMark rm; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1157 Klass* k = throwable->klass(); |
0 | 1158 assert(k != NULL, "just checking"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1159 st->print("%s", InstanceKlass::cast(k)->external_name()); |
0 | 1160 oop msg = message(throwable); |
1161 if (msg != NULL) { | |
1162 st->print(": %s", java_lang_String::as_utf8_string(msg)); | |
1163 } | |
1164 } | |
1165 | |
1166 | |
1167 void java_lang_Throwable::print(Handle throwable, outputStream* st) { | |
1168 ResourceMark rm; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1169 Klass* k = throwable->klass(); |
0 | 1170 assert(k != NULL, "just checking"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1171 st->print("%s", InstanceKlass::cast(k)->external_name()); |
0 | 1172 oop msg = message(throwable); |
1173 if (msg != NULL) { | |
1174 st->print(": %s", java_lang_String::as_utf8_string(msg)); | |
1175 } | |
1176 } | |
1177 | |
1178 // Print stack trace element to resource allocated buffer | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1179 char* java_lang_Throwable::print_stack_element_to_buffer(Method* method, int bci) { |
0 | 1180 // Get strings and string lengths |
6940
18fb7da42534
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
6867
diff
changeset
|
1181 InstanceKlass* klass = method->method_holder(); |
0 | 1182 const char* klass_name = klass->external_name(); |
1183 int buf_len = (int)strlen(klass_name); | |
1184 char* source_file_name; | |
1185 if (klass->source_file_name() == NULL) { | |
1186 source_file_name = NULL; | |
1187 } else { | |
1188 source_file_name = klass->source_file_name()->as_C_string(); | |
1189 buf_len += (int)strlen(source_file_name); | |
1190 } | |
1191 char* method_name = method->name()->as_C_string(); | |
1192 buf_len += (int)strlen(method_name); | |
1193 | |
1194 // Allocate temporary buffer with extra space for formatting and line number | |
1195 char* buf = NEW_RESOURCE_ARRAY(char, buf_len + 64); | |
1196 | |
1197 // Print stack trace line in buffer | |
1198 sprintf(buf, "\tat %s.%s", klass_name, method_name); | |
1199 if (method->is_native()) { | |
1200 strcat(buf, "(Native Method)"); | |
1201 } else { | |
1202 int line_number = method->line_number_from_bci(bci); | |
1203 if (source_file_name != NULL && (line_number != -1)) { | |
1204 // Sourcename and linenumber | |
1205 sprintf(buf + (int)strlen(buf), "(%s:%d)", source_file_name, line_number); | |
1206 } else if (source_file_name != NULL) { | |
1207 // Just sourcename | |
1208 sprintf(buf + (int)strlen(buf), "(%s)", source_file_name); | |
1209 } else { | |
1210 // Neither soucename and linenumber | |
1211 sprintf(buf + (int)strlen(buf), "(Unknown Source)"); | |
1212 } | |
1213 nmethod* nm = method->code(); | |
1214 if (WizardMode && nm != NULL) { | |
3960 | 1215 sprintf(buf + (int)strlen(buf), "(nmethod " INTPTR_FORMAT ")", (intptr_t)nm); |
0 | 1216 } |
1217 } | |
1218 | |
1219 return buf; | |
1220 } | |
1221 | |
1222 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1223 void java_lang_Throwable::print_stack_element(Handle stream, Method* method, int bci) { |
0 | 1224 ResourceMark rm; |
1225 char* buf = print_stack_element_to_buffer(method, bci); | |
1226 print_to_stream(stream, buf); | |
1227 } | |
1228 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1229 void java_lang_Throwable::print_stack_element(outputStream *st, Method* method, int bci) { |
0 | 1230 ResourceMark rm; |
1231 char* buf = print_stack_element_to_buffer(method, bci); | |
1232 st->print_cr("%s", buf); | |
1233 } | |
1234 | |
1235 void java_lang_Throwable::print_to_stream(Handle stream, const char* str) { | |
1236 if (stream.is_null()) { | |
1237 tty->print_cr("%s", str); | |
1238 } else { | |
1239 EXCEPTION_MARK; | |
1240 JavaValue result(T_VOID); | |
1241 Handle arg (THREAD, oopFactory::new_charArray(str, THREAD)); | |
1242 if (!HAS_PENDING_EXCEPTION) { | |
1243 JavaCalls::call_virtual(&result, | |
1244 stream, | |
1245 KlassHandle(THREAD, stream->klass()), | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
1246 vmSymbols::println_name(), |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
1247 vmSymbols::char_array_void_signature(), |
0 | 1248 arg, |
1249 THREAD); | |
1250 } | |
1251 // Ignore any exceptions. we are in the middle of exception handling. Same as classic VM. | |
1252 if (HAS_PENDING_EXCEPTION) CLEAR_PENDING_EXCEPTION; | |
1253 } | |
1254 | |
1255 } | |
1256 | |
1257 | |
1258 const char* java_lang_Throwable::no_stack_trace_message() { | |
1259 return "\t<<no stack trace available>>"; | |
1260 } | |
1261 | |
1262 | |
1263 // Currently used only for exceptions occurring during startup | |
1264 void java_lang_Throwable::print_stack_trace(oop throwable, outputStream* st) { | |
1265 Thread *THREAD = Thread::current(); | |
1266 Handle h_throwable(THREAD, throwable); | |
1267 while (h_throwable.not_null()) { | |
1268 objArrayHandle result (THREAD, objArrayOop(backtrace(h_throwable()))); | |
1269 if (result.is_null()) { | |
1270 st->print_cr(no_stack_trace_message()); | |
1271 return; | |
1272 } | |
1273 | |
1274 while (result.not_null()) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1275 typeArrayHandle methods (THREAD, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1276 typeArrayOop(result->obj_at(trace_methods_offset))); |
0 | 1277 typeArrayHandle bcis (THREAD, |
1278 typeArrayOop(result->obj_at(trace_bcis_offset))); | |
1279 | |
1280 if (methods.is_null() || bcis.is_null()) { | |
1281 st->print_cr(no_stack_trace_message()); | |
1282 return; | |
1283 } | |
1284 | |
1285 int length = methods()->length(); | |
1286 for (int index = 0; index < length; index++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1287 Method* method = ((Method*)methods()->metadata_at(index)); |
0 | 1288 if (method == NULL) goto handle_cause; |
1289 int bci = bcis->ushort_at(index); | |
1290 print_stack_element(st, method, bci); | |
1291 } | |
1292 result = objArrayHandle(THREAD, objArrayOop(result->obj_at(trace_next_offset))); | |
1293 } | |
1294 handle_cause: | |
1295 { | |
1296 EXCEPTION_MARK; | |
1297 JavaValue result(T_OBJECT); | |
1298 JavaCalls::call_virtual(&result, | |
1299 h_throwable, | |
1300 KlassHandle(THREAD, h_throwable->klass()), | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
1301 vmSymbols::getCause_name(), |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
1302 vmSymbols::void_throwable_signature(), |
0 | 1303 THREAD); |
1304 // Ignore any exceptions. we are in the middle of exception handling. Same as classic VM. | |
1305 if (HAS_PENDING_EXCEPTION) { | |
1306 CLEAR_PENDING_EXCEPTION; | |
1307 h_throwable = Handle(); | |
1308 } else { | |
1309 h_throwable = Handle(THREAD, (oop) result.get_jobject()); | |
1310 if (h_throwable.not_null()) { | |
1311 st->print("Caused by: "); | |
1312 print(h_throwable, st); | |
1313 st->cr(); | |
1314 } | |
1315 } | |
1316 } | |
1317 } | |
1318 } | |
1319 | |
1320 | |
1321 void java_lang_Throwable::print_stack_trace(oop throwable, oop print_stream) { | |
1322 // Note: this is no longer used in Merlin, but we support it for compatibility. | |
1323 Thread *thread = Thread::current(); | |
1324 Handle stream(thread, print_stream); | |
1325 objArrayHandle result (thread, objArrayOop(backtrace(throwable))); | |
1326 if (result.is_null()) { | |
1327 print_to_stream(stream, no_stack_trace_message()); | |
1328 return; | |
1329 } | |
1330 | |
1331 while (result.not_null()) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1332 typeArrayHandle methods(thread, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1333 typeArrayOop(result->obj_at(trace_methods_offset))); |
0 | 1334 typeArrayHandle bcis (thread, |
1335 typeArrayOop(result->obj_at(trace_bcis_offset))); | |
1336 | |
1337 if (methods.is_null() || bcis.is_null()) { | |
1338 print_to_stream(stream, no_stack_trace_message()); | |
1339 return; | |
1340 } | |
1341 | |
1342 int length = methods()->length(); | |
1343 for (int index = 0; index < length; index++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1344 Method* method = ((Method*)methods()->metadata_at(index)); |
0 | 1345 if (method == NULL) return; |
1346 int bci = bcis->ushort_at(index); | |
1347 print_stack_element(stream, method, bci); | |
1348 } | |
1349 result = objArrayHandle(thread, objArrayOop(result->obj_at(trace_next_offset))); | |
1350 } | |
1351 } | |
1352 | |
1353 // This class provides a simple wrapper over the internal structure of | |
1354 // exception backtrace to insulate users of the backtrace from needing | |
1355 // to know what it looks like. | |
1356 class BacktraceBuilder: public StackObj { | |
1357 private: | |
1358 Handle _backtrace; | |
1359 objArrayOop _head; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1360 typeArrayOop _methods; |
0 | 1361 typeArrayOop _bcis; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1362 objArrayOop _mirrors; |
0 | 1363 int _index; |
1364 No_Safepoint_Verifier _nsv; | |
1365 | |
1366 public: | |
1367 | |
1368 enum { | |
1369 trace_methods_offset = java_lang_Throwable::trace_methods_offset, | |
1370 trace_bcis_offset = java_lang_Throwable::trace_bcis_offset, | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1371 trace_mirrors_offset = java_lang_Throwable::trace_mirrors_offset, |
0 | 1372 trace_next_offset = java_lang_Throwable::trace_next_offset, |
1373 trace_size = java_lang_Throwable::trace_size, | |
1374 trace_chunk_size = java_lang_Throwable::trace_chunk_size | |
1375 }; | |
1376 | |
1377 // constructor for new backtrace | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1378 BacktraceBuilder(TRAPS): _methods(NULL), _bcis(NULL), _head(NULL), _mirrors(NULL) { |
0 | 1379 expand(CHECK); |
1380 _backtrace = _head; | |
1381 _index = 0; | |
1382 } | |
1383 | |
1384 void expand(TRAPS) { | |
1385 objArrayHandle old_head(THREAD, _head); | |
1386 Pause_No_Safepoint_Verifier pnsv(&_nsv); | |
1387 | |
1388 objArrayOop head = oopFactory::new_objectArray(trace_size, CHECK); | |
1389 objArrayHandle new_head(THREAD, head); | |
1390 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1391 typeArrayOop methods = oopFactory::new_metaDataArray(trace_chunk_size, CHECK); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1392 typeArrayHandle new_methods(THREAD, methods); |
0 | 1393 |
1394 typeArrayOop bcis = oopFactory::new_shortArray(trace_chunk_size, CHECK); | |
1395 typeArrayHandle new_bcis(THREAD, bcis); | |
1396 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1397 objArrayOop mirrors = oopFactory::new_objectArray(trace_chunk_size, CHECK); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1398 objArrayHandle new_mirrors(THREAD, mirrors); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1399 |
0 | 1400 if (!old_head.is_null()) { |
1401 old_head->obj_at_put(trace_next_offset, new_head()); | |
1402 } | |
1403 new_head->obj_at_put(trace_methods_offset, new_methods()); | |
1404 new_head->obj_at_put(trace_bcis_offset, new_bcis()); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1405 new_head->obj_at_put(trace_mirrors_offset, new_mirrors()); |
0 | 1406 |
1407 _head = new_head(); | |
1408 _methods = new_methods(); | |
1409 _bcis = new_bcis(); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1410 _mirrors = new_mirrors(); |
0 | 1411 _index = 0; |
1412 } | |
1413 | |
1414 oop backtrace() { | |
1415 return _backtrace(); | |
1416 } | |
1417 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1418 inline void push(Method* method, int bci, TRAPS) { |
4817
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1419 // Smear the -1 bci to 0 since the array only holds unsigned |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1420 // shorts. The later line number lookup would just smear the -1 |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1421 // to a 0 even if it could be recorded. |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1422 if (bci == SynchronizationEntryBCI) bci = 0; |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1423 assert(bci == (jushort)bci, "doesn't fit"); |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1424 |
0 | 1425 if (_index >= trace_chunk_size) { |
1426 methodHandle mhandle(THREAD, method); | |
1427 expand(CHECK); | |
1428 method = mhandle(); | |
1429 } | |
1430 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1431 _methods->metadata_at_put(_index, method); |
0 | 1432 _bcis->ushort_at_put(_index, bci); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1433 // we need to save the mirrors in the backtrace to keep the methods from |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1434 // being unloaded if their class loader is unloaded while we still have |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1435 // this stack trace. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1436 _mirrors->obj_at_put(_index, method->method_holder()->java_mirror()); |
0 | 1437 _index++; |
1438 } | |
1439 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1440 Method* current_method() { |
0 | 1441 assert(_index >= 0 && _index < trace_chunk_size, "out of range"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1442 return ((Method*)_methods->metadata_at(_index)); |
0 | 1443 } |
1444 | |
1445 jushort current_bci() { | |
1446 assert(_index >= 0 && _index < trace_chunk_size, "out of range"); | |
1447 return _bcis->ushort_at(_index); | |
1448 } | |
1449 }; | |
1450 | |
1451 | |
3272
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1452 void java_lang_Throwable::fill_in_stack_trace(Handle throwable, methodHandle method, TRAPS) { |
0 | 1453 if (!StackTraceInThrowable) return; |
1454 ResourceMark rm(THREAD); | |
1455 | |
1456 // Start out by clearing the backtrace for this object, in case the VM | |
1457 // runs out of memory while allocating the stack trace | |
1458 set_backtrace(throwable(), NULL); | |
1459 if (JDK_Version::is_gte_jdk14x_version()) { | |
1460 // New since 1.4, clear lazily constructed Java level stacktrace if | |
1461 // refilling occurs | |
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1462 // This is unnecessary in 1.7+ but harmless |
0 | 1463 clear_stacktrace(throwable()); |
1464 } | |
1465 | |
1466 int max_depth = MaxJavaStackTraceDepth; | |
1467 JavaThread* thread = (JavaThread*)THREAD; | |
1468 BacktraceBuilder bt(CHECK); | |
1469 | |
3272
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1470 // If there is no Java frame just return the method that was being called |
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1471 // with bci 0 |
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1472 if (!thread->has_last_Java_frame()) { |
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1473 if (max_depth >= 1 && method() != NULL) { |
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1474 bt.push(method(), 0, CHECK); |
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1475 set_backtrace(throwable(), bt.backtrace()); |
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1476 } |
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1477 return; |
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1478 } |
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1479 |
0 | 1480 // Instead of using vframe directly, this version of fill_in_stack_trace |
1481 // basically handles everything by hand. This significantly improved the | |
1482 // speed of this method call up to 28.5% on Solaris sparc. 27.1% on Windows. | |
1483 // See bug 6333838 for more details. | |
1484 // The "ASSERT" here is to verify this method generates the exactly same stack | |
1485 // trace as utilizing vframe. | |
1486 #ifdef ASSERT | |
1487 vframeStream st(thread); | |
1488 methodHandle st_method(THREAD, st.method()); | |
1489 #endif | |
1490 int total_count = 0; | |
1491 RegisterMap map(thread, false); | |
1492 int decode_offset = 0; | |
1493 nmethod* nm = NULL; | |
1494 bool skip_fillInStackTrace_check = false; | |
1495 bool skip_throwableInit_check = false; | |
6267
977007096840
7187290: nightly failures after JSR 292 lazy method handle update
twisti
parents:
6266
diff
changeset
|
1496 bool skip_hidden = !ShowHiddenFrames; |
0 | 1497 |
1498 for (frame fr = thread->last_frame(); max_depth != total_count;) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1499 Method* method = NULL; |
0 | 1500 int bci = 0; |
1501 | |
1502 // Compiled java method case. | |
1503 if (decode_offset != 0) { | |
1504 DebugInfoReadStream stream(nm, decode_offset); | |
1505 decode_offset = stream.read_int(); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1506 method = (Method*)nm->metadata_at(stream.read_int()); |
931
72088be4b386
6873116: Modify reexecute implementation to use pcDesc to record the reexecute bit
cfang
parents:
900
diff
changeset
|
1507 bci = stream.read_bci(); |
0 | 1508 } else { |
1509 if (fr.is_first_frame()) break; | |
1510 address pc = fr.pc(); | |
1511 if (fr.is_interpreted_frame()) { | |
1512 intptr_t bcx = fr.interpreter_frame_bcx(); | |
1513 method = fr.interpreter_frame_method(); | |
1514 bci = fr.is_bci(bcx) ? bcx : method->bci_from((address)bcx); | |
1515 fr = fr.sender(&map); | |
1516 } else { | |
1517 CodeBlob* cb = fr.cb(); | |
1518 // HMMM QQQ might be nice to have frame return nm as NULL if cb is non-NULL | |
1519 // but non nmethod | |
1520 fr = fr.sender(&map); | |
1521 if (cb == NULL || !cb->is_nmethod()) { | |
1522 continue; | |
1523 } | |
1524 nm = (nmethod*)cb; | |
1525 if (nm->method()->is_native()) { | |
1526 method = nm->method(); | |
1527 bci = 0; | |
1528 } else { | |
1529 PcDesc* pd = nm->pc_desc_at(pc); | |
1530 decode_offset = pd->scope_decode_offset(); | |
1531 // if decode_offset is not equal to 0, it will execute the | |
1532 // "compiled java method case" at the beginning of the loop. | |
1533 continue; | |
1534 } | |
1535 } | |
1536 } | |
1537 #ifdef ASSERT | |
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1538 assert(st_method() == method && st.bci() == bci, |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1539 "Wrong stack trace"); |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1540 st.next(); |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1541 // vframeStream::method isn't GC-safe so store off a copy |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1542 // of the Method* in case we GC. |
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1543 if (!st.at_end()) { |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1544 st_method = st.method(); |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1545 } |
0 | 1546 #endif |
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1547 |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1548 // the format of the stacktrace will be: |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1549 // - 1 or more fillInStackTrace frames for the exception class (skipped) |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1550 // - 0 or more <init> methods for the exception class (skipped) |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1551 // - rest of the stack |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1552 |
0 | 1553 if (!skip_fillInStackTrace_check) { |
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1554 if ((method->name() == vmSymbols::fillInStackTrace_name() || |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1555 method->name() == vmSymbols::fillInStackTrace0_name()) && |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1556 throwable->is_a(method->method_holder())) { |
0 | 1557 continue; |
1558 } | |
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1559 else { |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1560 skip_fillInStackTrace_check = true; // gone past them all |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1561 } |
0 | 1562 } |
1563 if (!skip_throwableInit_check) { | |
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1564 assert(skip_fillInStackTrace_check, "logic error in backtrace filtering"); |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1565 |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1566 // skip <init> methods of the exception class and superclasses |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1567 // This is simlar to classic VM. |
0 | 1568 if (method->name() == vmSymbols::object_initializer_name() && |
1569 throwable->is_a(method->method_holder())) { | |
1570 continue; | |
1571 } else { | |
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1572 // there are none or we've seen them all - either way stop checking |
0 | 1573 skip_throwableInit_check = true; |
1574 } | |
1575 } | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
1576 if (method->is_hidden()) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
1577 if (skip_hidden) continue; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
1578 } |
0 | 1579 bt.push(method, bci, CHECK); |
1580 total_count++; | |
1581 } | |
1582 | |
1583 // Put completed stack trace into throwable object | |
1584 set_backtrace(throwable(), bt.backtrace()); | |
1585 } | |
1586 | |
3272
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1587 void java_lang_Throwable::fill_in_stack_trace(Handle throwable, methodHandle method) { |
0 | 1588 // No-op if stack trace is disabled |
1589 if (!StackTraceInThrowable) { | |
1590 return; | |
1591 } | |
1592 | |
1593 // Disable stack traces for some preallocated out of memory errors | |
1594 if (!Universe::should_fill_in_stack_trace(throwable)) { | |
1595 return; | |
1596 } | |
1597 | |
1598 PRESERVE_EXCEPTION_MARK; | |
1599 | |
1600 JavaThread* thread = JavaThread::active(); | |
3272
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1601 fill_in_stack_trace(throwable, method, thread); |
0 | 1602 // ignore exceptions thrown during stack trace filling |
1603 CLEAR_PENDING_EXCEPTION; | |
1604 } | |
1605 | |
1606 void java_lang_Throwable::allocate_backtrace(Handle throwable, TRAPS) { | |
1607 // Allocate stack trace - backtrace is created but not filled in | |
1608 | |
1609 // No-op if stack trace is disabled | |
1610 if (!StackTraceInThrowable) return; | |
1611 | |
1612 objArrayOop h_oop = oopFactory::new_objectArray(trace_size, CHECK); | |
1613 objArrayHandle backtrace (THREAD, h_oop); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1614 typeArrayOop m_oop = oopFactory::new_metaDataArray(trace_chunk_size, CHECK); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1615 typeArrayHandle methods (THREAD, m_oop); |
0 | 1616 typeArrayOop b = oopFactory::new_shortArray(trace_chunk_size, CHECK); |
1617 typeArrayHandle bcis(THREAD, b); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1618 objArrayOop mirror_oop = oopFactory::new_objectArray(trace_chunk_size, CHECK); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1619 objArrayHandle mirrors (THREAD, mirror_oop); |
0 | 1620 |
1621 // backtrace has space for one chunk (next is NULL) | |
1622 backtrace->obj_at_put(trace_methods_offset, methods()); | |
1623 backtrace->obj_at_put(trace_bcis_offset, bcis()); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1624 backtrace->obj_at_put(trace_mirrors_offset, mirrors()); |
0 | 1625 set_backtrace(throwable(), backtrace()); |
1626 } | |
1627 | |
1628 | |
1629 void java_lang_Throwable::fill_in_stack_trace_of_preallocated_backtrace(Handle throwable) { | |
1630 // Fill in stack trace into preallocated backtrace (no GC) | |
1631 | |
1632 // No-op if stack trace is disabled | |
1633 if (!StackTraceInThrowable) return; | |
1634 | |
1142 | 1635 assert(throwable->is_a(SystemDictionary::Throwable_klass()), "sanity check"); |
0 | 1636 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1637 objArrayOop backtrace = (objArrayOop)java_lang_Throwable::backtrace(throwable()); |
0 | 1638 assert(backtrace != NULL, "backtrace not preallocated"); |
1639 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1640 oop m = backtrace->obj_at(trace_methods_offset); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1641 typeArrayOop methods = typeArrayOop(m); |
0 | 1642 assert(methods != NULL && methods->length() > 0, "method array not preallocated"); |
1643 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1644 oop b = backtrace->obj_at(trace_bcis_offset); |
0 | 1645 typeArrayOop bcis = typeArrayOop(b); |
1646 assert(bcis != NULL, "bci array not preallocated"); | |
1647 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1648 oop mr = backtrace->obj_at(trace_mirrors_offset); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1649 objArrayOop mirrors = objArrayOop(mr); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1650 assert(mirrors != NULL, "bci array not preallocated"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1651 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1652 assert(methods->length() == bcis->length() && |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1653 methods->length() == mirrors->length(), |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1654 "method and bci arrays should match"); |
0 | 1655 |
1656 JavaThread* thread = JavaThread::current(); | |
1657 ResourceMark rm(thread); | |
1658 vframeStream st(thread); | |
1659 | |
1660 // Unlike fill_in_stack_trace we do not skip fillInStackTrace or throwable init | |
1661 // methods as preallocated errors aren't created by "java" code. | |
1662 | |
1663 // fill in as much stack trace as possible | |
1664 int max_chunks = MIN2(methods->length(), (int)MaxJavaStackTraceDepth); | |
1665 int chunk_count = 0; | |
1666 | |
1667 for (;!st.at_end(); st.next()) { | |
4817
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1668 // Add entry and smear the -1 bci to 0 since the array only holds |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1669 // unsigned shorts. The later line number lookup would just smear |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1670 // the -1 to a 0 even if it could be recorded. |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1671 int bci = st.bci(); |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1672 if (bci == SynchronizationEntryBCI) bci = 0; |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1673 assert(bci == (jushort)bci, "doesn't fit"); |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1674 bcis->ushort_at_put(chunk_count, bci); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1675 methods->metadata_at_put(chunk_count, st.method()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1676 mirrors->obj_at_put(chunk_count, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1677 st.method()->method_holder()->java_mirror()); |
0 | 1678 |
1679 chunk_count++; | |
1680 | |
1681 // Bail-out for deep stacks | |
1682 if (chunk_count >= max_chunks) break; | |
1683 } | |
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1684 |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1685 // For Java 7+ we support the Throwable immutability protocol defined for Java 7. This support |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1686 // was missing in 7u0 so in 7u0 there is a workaround in the Throwable class. That workaround |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1687 // can be removed in a JDK using this JVM version |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1688 if (JDK_Version::is_gte_jdk17x_version()) { |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1689 java_lang_Throwable::set_stacktrace(throwable(), java_lang_Throwable::unassigned_stacktrace()); |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1690 assert(java_lang_Throwable::unassigned_stacktrace() != NULL, "not initialized"); |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1691 } |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1692 |
0 | 1693 } |
1694 | |
1695 | |
1696 int java_lang_Throwable::get_stack_trace_depth(oop throwable, TRAPS) { | |
1697 if (throwable == NULL) { | |
1698 THROW_0(vmSymbols::java_lang_NullPointerException()); | |
1699 } | |
1700 objArrayOop chunk = objArrayOop(backtrace(throwable)); | |
1701 int depth = 0; | |
1702 if (chunk != NULL) { | |
1703 // Iterate over chunks and count full ones | |
1704 while (true) { | |
1705 objArrayOop next = objArrayOop(chunk->obj_at(trace_next_offset)); | |
1706 if (next == NULL) break; | |
1707 depth += trace_chunk_size; | |
1708 chunk = next; | |
1709 } | |
1710 assert(chunk != NULL && chunk->obj_at(trace_next_offset) == NULL, "sanity check"); | |
1711 // Count element in remaining partial chunk | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1712 typeArrayOop methods = typeArrayOop(chunk->obj_at(trace_methods_offset)); |
0 | 1713 typeArrayOop bcis = typeArrayOop(chunk->obj_at(trace_bcis_offset)); |
1714 assert(methods != NULL && bcis != NULL, "sanity check"); | |
1715 for (int i = 0; i < methods->length(); i++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1716 if (methods->metadata_at(i) == NULL) break; |
0 | 1717 depth++; |
1718 } | |
1719 } | |
1720 return depth; | |
1721 } | |
1722 | |
1723 | |
1724 oop java_lang_Throwable::get_stack_trace_element(oop throwable, int index, TRAPS) { | |
1725 if (throwable == NULL) { | |
1726 THROW_0(vmSymbols::java_lang_NullPointerException()); | |
1727 } | |
1728 if (index < 0) { | |
1729 THROW_(vmSymbols::java_lang_IndexOutOfBoundsException(), NULL); | |
1730 } | |
1731 // Compute how many chunks to skip and index into actual chunk | |
1732 objArrayOop chunk = objArrayOop(backtrace(throwable)); | |
1733 int skip_chunks = index / trace_chunk_size; | |
1734 int chunk_index = index % trace_chunk_size; | |
1735 while (chunk != NULL && skip_chunks > 0) { | |
1736 chunk = objArrayOop(chunk->obj_at(trace_next_offset)); | |
1737 skip_chunks--; | |
1738 } | |
1739 if (chunk == NULL) { | |
1740 THROW_(vmSymbols::java_lang_IndexOutOfBoundsException(), NULL); | |
1741 } | |
1742 // Get method,bci from chunk | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1743 typeArrayOop methods = typeArrayOop(chunk->obj_at(trace_methods_offset)); |
0 | 1744 typeArrayOop bcis = typeArrayOop(chunk->obj_at(trace_bcis_offset)); |
1745 assert(methods != NULL && bcis != NULL, "sanity check"); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1746 methodHandle method(THREAD, ((Method*)methods->metadata_at(chunk_index))); |
0 | 1747 int bci = bcis->ushort_at(chunk_index); |
1748 // Chunk can be partial full | |
1749 if (method.is_null()) { | |
1750 THROW_(vmSymbols::java_lang_IndexOutOfBoundsException(), NULL); | |
1751 } | |
1752 | |
1753 oop element = java_lang_StackTraceElement::create(method, bci, CHECK_0); | |
1754 return element; | |
1755 } | |
1756 | |
1757 oop java_lang_StackTraceElement::create(methodHandle method, int bci, TRAPS) { | |
1758 // SystemDictionary::stackTraceElement_klass() will be null for pre-1.4 JDKs | |
1759 assert(JDK_Version::is_gte_jdk14x_version(), "should only be called in >= 1.4"); | |
1760 | |
1761 // Allocate java.lang.StackTraceElement instance | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1762 Klass* k = SystemDictionary::StackTraceElement_klass(); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1763 assert(k != NULL, "must be loaded in 1.4+"); |
0 | 1764 instanceKlassHandle ik (THREAD, k); |
1765 if (ik->should_be_initialized()) { | |
1766 ik->initialize(CHECK_0); | |
1767 } | |
1768 | |
1769 Handle element = ik->allocate_instance_handle(CHECK_0); | |
1770 // Fill in class name | |
1771 ResourceMark rm(THREAD); | |
6940
18fb7da42534
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
6867
diff
changeset
|
1772 const char* str = method->method_holder()->external_name(); |
0 | 1773 oop classname = StringTable::intern((char*) str, CHECK_0); |
1774 java_lang_StackTraceElement::set_declaringClass(element(), classname); | |
1775 // Fill in method name | |
1776 oop methodname = StringTable::intern(method->name(), CHECK_0); | |
1777 java_lang_StackTraceElement::set_methodName(element(), methodname); | |
1778 // Fill in source file name | |
6940
18fb7da42534
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
6867
diff
changeset
|
1779 Symbol* source = method->method_holder()->source_file_name(); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
1780 if (ShowHiddenFrames && source == NULL) |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
1781 source = vmSymbols::unknown_class_name(); |
0 | 1782 oop filename = StringTable::intern(source, CHECK_0); |
1783 java_lang_StackTraceElement::set_fileName(element(), filename); | |
1784 // File in source line number | |
1785 int line_number; | |
1786 if (method->is_native()) { | |
1787 // Negative value different from -1 below, enabling Java code in | |
1788 // class java.lang.StackTraceElement to distinguish "native" from | |
1789 // "no LineNumberTable". | |
1790 line_number = -2; | |
1791 } else { | |
1792 // Returns -1 if no LineNumberTable, and otherwise actual line number | |
1793 line_number = method->line_number_from_bci(bci); | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
1794 if (line_number == -1 && ShowHiddenFrames) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
1795 line_number = bci + 1000000; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
1796 } |
0 | 1797 } |
1798 java_lang_StackTraceElement::set_lineNumber(element(), line_number); | |
1799 | |
1800 return element(); | |
1801 } | |
1802 | |
1803 | |
1804 void java_lang_reflect_AccessibleObject::compute_offsets() { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1805 Klass* k = SystemDictionary::reflect_AccessibleObject_klass(); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1806 compute_offset(override_offset, k, vmSymbols::override_name(), vmSymbols::bool_signature()); |
0 | 1807 } |
1808 | |
1809 jboolean java_lang_reflect_AccessibleObject::override(oop reflect) { | |
1810 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1811 return (jboolean) reflect->bool_field(override_offset); | |
1812 } | |
1813 | |
1814 void java_lang_reflect_AccessibleObject::set_override(oop reflect, jboolean value) { | |
1815 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1816 reflect->bool_field_put(override_offset, (int) value); | |
1817 } | |
1818 | |
1819 void java_lang_reflect_Method::compute_offsets() { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1820 Klass* k = SystemDictionary::reflect_Method_klass(); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1821 compute_offset(clazz_offset, k, vmSymbols::clazz_name(), vmSymbols::class_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1822 compute_offset(name_offset, k, vmSymbols::name_name(), vmSymbols::string_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1823 compute_offset(returnType_offset, k, vmSymbols::returnType_name(), vmSymbols::class_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1824 compute_offset(parameterTypes_offset, k, vmSymbols::parameterTypes_name(), vmSymbols::class_array_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1825 compute_offset(exceptionTypes_offset, k, vmSymbols::exceptionTypes_name(), vmSymbols::class_array_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1826 compute_offset(slot_offset, k, vmSymbols::slot_name(), vmSymbols::int_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1827 compute_offset(modifiers_offset, k, vmSymbols::modifiers_name(), vmSymbols::int_signature()); |
0 | 1828 // The generic signature and annotations fields are only present in 1.5 |
1829 signature_offset = -1; | |
1830 annotations_offset = -1; | |
1831 parameter_annotations_offset = -1; | |
1832 annotation_default_offset = -1; | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1833 compute_optional_offset(signature_offset, k, vmSymbols::signature_name(), vmSymbols::string_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1834 compute_optional_offset(annotations_offset, k, vmSymbols::annotations_name(), vmSymbols::byte_array_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1835 compute_optional_offset(parameter_annotations_offset, k, vmSymbols::parameter_annotations_name(), vmSymbols::byte_array_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1836 compute_optional_offset(annotation_default_offset, k, vmSymbols::annotation_default_name(), vmSymbols::byte_array_signature()); |
0 | 1837 } |
1838 | |
1839 Handle java_lang_reflect_Method::create(TRAPS) { | |
1840 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1841 Klass* klass = SystemDictionary::reflect_Method_klass(); |
0 | 1842 // This class is eagerly initialized during VM initialization, since we keep a refence |
1843 // to one of the methods | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1844 assert(InstanceKlass::cast(klass)->is_initialized(), "must be initialized"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1845 return InstanceKlass::cast(klass)->allocate_instance_handle(CHECK_NH); |
0 | 1846 } |
1847 | |
1848 oop java_lang_reflect_Method::clazz(oop reflect) { | |
1849 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1850 return reflect->obj_field(clazz_offset); | |
1851 } | |
1852 | |
1853 void java_lang_reflect_Method::set_clazz(oop reflect, oop value) { | |
1854 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1855 reflect->obj_field_put(clazz_offset, value); | |
1856 } | |
1857 | |
1858 int java_lang_reflect_Method::slot(oop reflect) { | |
1859 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1860 return reflect->int_field(slot_offset); | |
1861 } | |
1862 | |
1863 void java_lang_reflect_Method::set_slot(oop reflect, int value) { | |
1864 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1865 reflect->int_field_put(slot_offset, value); | |
1866 } | |
1867 | |
1868 oop java_lang_reflect_Method::name(oop method) { | |
1869 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1870 return method->obj_field(name_offset); | |
1871 } | |
1872 | |
1873 void java_lang_reflect_Method::set_name(oop method, oop value) { | |
1874 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1875 method->obj_field_put(name_offset, value); | |
1876 } | |
1877 | |
1878 oop java_lang_reflect_Method::return_type(oop method) { | |
1879 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1880 return method->obj_field(returnType_offset); | |
1881 } | |
1882 | |
1883 void java_lang_reflect_Method::set_return_type(oop method, oop value) { | |
1884 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1885 method->obj_field_put(returnType_offset, value); | |
1886 } | |
1887 | |
1888 oop java_lang_reflect_Method::parameter_types(oop method) { | |
1889 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1890 return method->obj_field(parameterTypes_offset); | |
1891 } | |
1892 | |
1893 void java_lang_reflect_Method::set_parameter_types(oop method, oop value) { | |
1894 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1895 method->obj_field_put(parameterTypes_offset, value); | |
1896 } | |
1897 | |
1898 oop java_lang_reflect_Method::exception_types(oop method) { | |
1899 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1900 return method->obj_field(exceptionTypes_offset); | |
1901 } | |
1902 | |
1903 void java_lang_reflect_Method::set_exception_types(oop method, oop value) { | |
1904 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1905 method->obj_field_put(exceptionTypes_offset, value); | |
1906 } | |
1907 | |
1908 int java_lang_reflect_Method::modifiers(oop method) { | |
1909 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1910 return method->int_field(modifiers_offset); | |
1911 } | |
1912 | |
1913 void java_lang_reflect_Method::set_modifiers(oop method, int value) { | |
1914 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1915 method->int_field_put(modifiers_offset, value); | |
1916 } | |
1917 | |
1918 bool java_lang_reflect_Method::has_signature_field() { | |
1919 return (signature_offset >= 0); | |
1920 } | |
1921 | |
1922 oop java_lang_reflect_Method::signature(oop method) { | |
1923 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1924 assert(has_signature_field(), "signature field must be present"); | |
1925 return method->obj_field(signature_offset); | |
1926 } | |
1927 | |
1928 void java_lang_reflect_Method::set_signature(oop method, oop value) { | |
1929 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1930 assert(has_signature_field(), "signature field must be present"); | |
1931 method->obj_field_put(signature_offset, value); | |
1932 } | |
1933 | |
1934 bool java_lang_reflect_Method::has_annotations_field() { | |
1935 return (annotations_offset >= 0); | |
1936 } | |
1937 | |
1938 oop java_lang_reflect_Method::annotations(oop method) { | |
1939 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1940 assert(has_annotations_field(), "annotations field must be present"); | |
1941 return method->obj_field(annotations_offset); | |
1942 } | |
1943 | |
1944 void java_lang_reflect_Method::set_annotations(oop method, oop value) { | |
1945 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1946 assert(has_annotations_field(), "annotations field must be present"); | |
1947 method->obj_field_put(annotations_offset, value); | |
1948 } | |
1949 | |
1950 bool java_lang_reflect_Method::has_parameter_annotations_field() { | |
1951 return (parameter_annotations_offset >= 0); | |
1952 } | |
1953 | |
1954 oop java_lang_reflect_Method::parameter_annotations(oop method) { | |
1955 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1956 assert(has_parameter_annotations_field(), "parameter annotations field must be present"); | |
1957 return method->obj_field(parameter_annotations_offset); | |
1958 } | |
1959 | |
1960 void java_lang_reflect_Method::set_parameter_annotations(oop method, oop value) { | |
1961 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1962 assert(has_parameter_annotations_field(), "parameter annotations field must be present"); | |
1963 method->obj_field_put(parameter_annotations_offset, value); | |
1964 } | |
1965 | |
1966 bool java_lang_reflect_Method::has_annotation_default_field() { | |
1967 return (annotation_default_offset >= 0); | |
1968 } | |
1969 | |
1970 oop java_lang_reflect_Method::annotation_default(oop method) { | |
1971 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1972 assert(has_annotation_default_field(), "annotation default field must be present"); | |
1973 return method->obj_field(annotation_default_offset); | |
1974 } | |
1975 | |
1976 void java_lang_reflect_Method::set_annotation_default(oop method, oop value) { | |
1977 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1978 assert(has_annotation_default_field(), "annotation default field must be present"); | |
1979 method->obj_field_put(annotation_default_offset, value); | |
1980 } | |
1981 | |
1982 void java_lang_reflect_Constructor::compute_offsets() { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1983 Klass* k = SystemDictionary::reflect_Constructor_klass(); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1984 compute_offset(clazz_offset, k, vmSymbols::clazz_name(), vmSymbols::class_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1985 compute_offset(parameterTypes_offset, k, vmSymbols::parameterTypes_name(), vmSymbols::class_array_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1986 compute_offset(exceptionTypes_offset, k, vmSymbols::exceptionTypes_name(), vmSymbols::class_array_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1987 compute_offset(slot_offset, k, vmSymbols::slot_name(), vmSymbols::int_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1988 compute_offset(modifiers_offset, k, vmSymbols::modifiers_name(), vmSymbols::int_signature()); |
0 | 1989 // The generic signature and annotations fields are only present in 1.5 |
1990 signature_offset = -1; | |
1991 annotations_offset = -1; | |
1992 parameter_annotations_offset = -1; | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1993 compute_optional_offset(signature_offset, k, vmSymbols::signature_name(), vmSymbols::string_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1994 compute_optional_offset(annotations_offset, k, vmSymbols::annotations_name(), vmSymbols::byte_array_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1995 compute_optional_offset(parameter_annotations_offset, k, vmSymbols::parameter_annotations_name(), vmSymbols::byte_array_signature()); |
0 | 1996 } |
1997 | |
1998 Handle java_lang_reflect_Constructor::create(TRAPS) { | |
1999 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2000 Symbol* name = vmSymbols::java_lang_reflect_Constructor(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2001 Klass* k = SystemDictionary::resolve_or_fail(name, true, CHECK_NH); |
0 | 2002 instanceKlassHandle klass (THREAD, k); |
2003 // Ensure it is initialized | |
2004 klass->initialize(CHECK_NH); | |
2005 return klass->allocate_instance_handle(CHECK_NH); | |
2006 } | |
2007 | |
2008 oop java_lang_reflect_Constructor::clazz(oop reflect) { | |
2009 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2010 return reflect->obj_field(clazz_offset); | |
2011 } | |
2012 | |
2013 void java_lang_reflect_Constructor::set_clazz(oop reflect, oop value) { | |
2014 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2015 reflect->obj_field_put(clazz_offset, value); | |
2016 } | |
2017 | |
2018 oop java_lang_reflect_Constructor::parameter_types(oop constructor) { | |
2019 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2020 return constructor->obj_field(parameterTypes_offset); | |
2021 } | |
2022 | |
2023 void java_lang_reflect_Constructor::set_parameter_types(oop constructor, oop value) { | |
2024 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2025 constructor->obj_field_put(parameterTypes_offset, value); | |
2026 } | |
2027 | |
2028 oop java_lang_reflect_Constructor::exception_types(oop constructor) { | |
2029 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2030 return constructor->obj_field(exceptionTypes_offset); | |
2031 } | |
2032 | |
2033 void java_lang_reflect_Constructor::set_exception_types(oop constructor, oop value) { | |
2034 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2035 constructor->obj_field_put(exceptionTypes_offset, value); | |
2036 } | |
2037 | |
2038 int java_lang_reflect_Constructor::slot(oop reflect) { | |
2039 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2040 return reflect->int_field(slot_offset); | |
2041 } | |
2042 | |
2043 void java_lang_reflect_Constructor::set_slot(oop reflect, int value) { | |
2044 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2045 reflect->int_field_put(slot_offset, value); | |
2046 } | |
2047 | |
2048 int java_lang_reflect_Constructor::modifiers(oop constructor) { | |
2049 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2050 return constructor->int_field(modifiers_offset); | |
2051 } | |
2052 | |
2053 void java_lang_reflect_Constructor::set_modifiers(oop constructor, int value) { | |
2054 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2055 constructor->int_field_put(modifiers_offset, value); | |
2056 } | |
2057 | |
2058 bool java_lang_reflect_Constructor::has_signature_field() { | |
2059 return (signature_offset >= 0); | |
2060 } | |
2061 | |
2062 oop java_lang_reflect_Constructor::signature(oop constructor) { | |
2063 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2064 assert(has_signature_field(), "signature field must be present"); | |
2065 return constructor->obj_field(signature_offset); | |
2066 } | |
2067 | |
2068 void java_lang_reflect_Constructor::set_signature(oop constructor, oop value) { | |
2069 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2070 assert(has_signature_field(), "signature field must be present"); | |
2071 constructor->obj_field_put(signature_offset, value); | |
2072 } | |
2073 | |
2074 bool java_lang_reflect_Constructor::has_annotations_field() { | |
2075 return (annotations_offset >= 0); | |
2076 } | |
2077 | |
2078 oop java_lang_reflect_Constructor::annotations(oop constructor) { | |
2079 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2080 assert(has_annotations_field(), "annotations field must be present"); | |
2081 return constructor->obj_field(annotations_offset); | |
2082 } | |
2083 | |
2084 void java_lang_reflect_Constructor::set_annotations(oop constructor, oop value) { | |
2085 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2086 assert(has_annotations_field(), "annotations field must be present"); | |
2087 constructor->obj_field_put(annotations_offset, value); | |
2088 } | |
2089 | |
2090 bool java_lang_reflect_Constructor::has_parameter_annotations_field() { | |
2091 return (parameter_annotations_offset >= 0); | |
2092 } | |
2093 | |
2094 oop java_lang_reflect_Constructor::parameter_annotations(oop method) { | |
2095 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2096 assert(has_parameter_annotations_field(), "parameter annotations field must be present"); | |
2097 return method->obj_field(parameter_annotations_offset); | |
2098 } | |
2099 | |
2100 void java_lang_reflect_Constructor::set_parameter_annotations(oop method, oop value) { | |
2101 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2102 assert(has_parameter_annotations_field(), "parameter annotations field must be present"); | |
2103 method->obj_field_put(parameter_annotations_offset, value); | |
2104 } | |
2105 | |
2106 void java_lang_reflect_Field::compute_offsets() { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2107 Klass* k = SystemDictionary::reflect_Field_klass(); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2108 compute_offset(clazz_offset, k, vmSymbols::clazz_name(), vmSymbols::class_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2109 compute_offset(name_offset, k, vmSymbols::name_name(), vmSymbols::string_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2110 compute_offset(type_offset, k, vmSymbols::type_name(), vmSymbols::class_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2111 compute_offset(slot_offset, k, vmSymbols::slot_name(), vmSymbols::int_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2112 compute_offset(modifiers_offset, k, vmSymbols::modifiers_name(), vmSymbols::int_signature()); |
0 | 2113 // The generic signature and annotations fields are only present in 1.5 |
2114 signature_offset = -1; | |
2115 annotations_offset = -1; | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2116 compute_optional_offset(signature_offset, k, vmSymbols::signature_name(), vmSymbols::string_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2117 compute_optional_offset(annotations_offset, k, vmSymbols::annotations_name(), vmSymbols::byte_array_signature()); |
0 | 2118 } |
2119 | |
2120 Handle java_lang_reflect_Field::create(TRAPS) { | |
2121 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2122 Symbol* name = vmSymbols::java_lang_reflect_Field(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2123 Klass* k = SystemDictionary::resolve_or_fail(name, true, CHECK_NH); |
0 | 2124 instanceKlassHandle klass (THREAD, k); |
2125 // Ensure it is initialized | |
2126 klass->initialize(CHECK_NH); | |
2127 return klass->allocate_instance_handle(CHECK_NH); | |
2128 } | |
2129 | |
2130 oop java_lang_reflect_Field::clazz(oop reflect) { | |
2131 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2132 return reflect->obj_field(clazz_offset); | |
2133 } | |
2134 | |
2135 void java_lang_reflect_Field::set_clazz(oop reflect, oop value) { | |
2136 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2137 reflect->obj_field_put(clazz_offset, value); | |
2138 } | |
2139 | |
2140 oop java_lang_reflect_Field::name(oop field) { | |
2141 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2142 return field->obj_field(name_offset); | |
2143 } | |
2144 | |
2145 void java_lang_reflect_Field::set_name(oop field, oop value) { | |
2146 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2147 field->obj_field_put(name_offset, value); | |
2148 } | |
2149 | |
2150 oop java_lang_reflect_Field::type(oop field) { | |
2151 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2152 return field->obj_field(type_offset); | |
2153 } | |
2154 | |
2155 void java_lang_reflect_Field::set_type(oop field, oop value) { | |
2156 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2157 field->obj_field_put(type_offset, value); | |
2158 } | |
2159 | |
2160 int java_lang_reflect_Field::slot(oop reflect) { | |
2161 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2162 return reflect->int_field(slot_offset); | |
2163 } | |
2164 | |
2165 void java_lang_reflect_Field::set_slot(oop reflect, int value) { | |
2166 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2167 reflect->int_field_put(slot_offset, value); | |
2168 } | |
2169 | |
2170 int java_lang_reflect_Field::modifiers(oop field) { | |
2171 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2172 return field->int_field(modifiers_offset); | |
2173 } | |
2174 | |
2175 void java_lang_reflect_Field::set_modifiers(oop field, int value) { | |
2176 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2177 field->int_field_put(modifiers_offset, value); | |
2178 } | |
2179 | |
2180 bool java_lang_reflect_Field::has_signature_field() { | |
2181 return (signature_offset >= 0); | |
2182 } | |
2183 | |
2184 oop java_lang_reflect_Field::signature(oop field) { | |
2185 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2186 assert(has_signature_field(), "signature field must be present"); | |
2187 return field->obj_field(signature_offset); | |
2188 } | |
2189 | |
2190 void java_lang_reflect_Field::set_signature(oop field, oop value) { | |
2191 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2192 assert(has_signature_field(), "signature field must be present"); | |
2193 field->obj_field_put(signature_offset, value); | |
2194 } | |
2195 | |
2196 bool java_lang_reflect_Field::has_annotations_field() { | |
2197 return (annotations_offset >= 0); | |
2198 } | |
2199 | |
2200 oop java_lang_reflect_Field::annotations(oop field) { | |
2201 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2202 assert(has_annotations_field(), "annotations field must be present"); | |
2203 return field->obj_field(annotations_offset); | |
2204 } | |
2205 | |
2206 void java_lang_reflect_Field::set_annotations(oop field, oop value) { | |
2207 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2208 assert(has_annotations_field(), "annotations field must be present"); | |
2209 field->obj_field_put(annotations_offset, value); | |
2210 } | |
2211 | |
2212 | |
2213 void sun_reflect_ConstantPool::compute_offsets() { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2214 Klass* k = SystemDictionary::reflect_ConstantPool_klass(); |
0 | 2215 // This null test can be removed post beta |
2216 if (k != NULL) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2217 // The field is called ConstantPool* in the sun.reflect.ConstantPool class. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2218 compute_offset(_oop_offset, k, vmSymbols::ConstantPool_name(), vmSymbols::object_signature()); |
0 | 2219 } |
2220 } | |
2221 | |
2222 | |
2223 Handle sun_reflect_ConstantPool::create(TRAPS) { | |
2224 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2225 Klass* k = SystemDictionary::reflect_ConstantPool_klass(); |
0 | 2226 instanceKlassHandle klass (THREAD, k); |
2227 // Ensure it is initialized | |
2228 klass->initialize(CHECK_NH); | |
2229 return klass->allocate_instance_handle(CHECK_NH); | |
2230 } | |
2231 | |
2232 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2233 void sun_reflect_ConstantPool::set_cp(oop reflect, ConstantPool* value) { |
0 | 2234 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2235 oop mirror = value->pool_holder()->java_mirror(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2236 // Save the mirror to get back the constant pool. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2237 reflect->obj_field_put(_oop_offset, mirror); |
0 | 2238 } |
2239 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2240 ConstantPool* sun_reflect_ConstantPool::get_cp(oop reflect) { |
0 | 2241 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2242 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2243 oop mirror = reflect->obj_field(_oop_offset); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2244 Klass* k = java_lang_Class::as_Klass(mirror); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2245 assert(k->oop_is_instance(), "Must be"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2246 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2247 // Get the constant pool back from the klass. Since class redefinition |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2248 // merges the new constant pool into the old, this is essentially the |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2249 // same constant pool as the original. If constant pool merging is |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2250 // no longer done in the future, this will have to change to save |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2251 // the original. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2252 return InstanceKlass::cast(k)->constants(); |
0 | 2253 } |
2254 | |
2255 void sun_reflect_UnsafeStaticFieldAccessorImpl::compute_offsets() { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2256 Klass* k = SystemDictionary::reflect_UnsafeStaticFieldAccessorImpl_klass(); |
0 | 2257 // This null test can be removed post beta |
2258 if (k != NULL) { | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2259 compute_offset(_base_offset, k, |
0 | 2260 vmSymbols::base_name(), vmSymbols::object_signature()); |
2261 } | |
2262 } | |
2263 | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2264 oop java_lang_boxing_object::initialize_and_allocate(BasicType type, TRAPS) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2265 Klass* k = SystemDictionary::box_klass(type); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2266 if (k == NULL) return NULL; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2267 instanceKlassHandle h (THREAD, k); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2268 if (!h->is_initialized()) h->initialize(CHECK_0); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2269 return h->allocate_instance(THREAD); |
0 | 2270 } |
2271 | |
2272 | |
2273 oop java_lang_boxing_object::create(BasicType type, jvalue* value, TRAPS) { | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2274 oop box = initialize_and_allocate(type, CHECK_0); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2275 if (box == NULL) return NULL; |
0 | 2276 switch (type) { |
2277 case T_BOOLEAN: | |
2278 box->bool_field_put(value_offset, value->z); | |
2279 break; | |
2280 case T_CHAR: | |
2281 box->char_field_put(value_offset, value->c); | |
2282 break; | |
2283 case T_FLOAT: | |
2284 box->float_field_put(value_offset, value->f); | |
2285 break; | |
2286 case T_DOUBLE: | |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
2287 box->double_field_put(long_value_offset, value->d); |
0 | 2288 break; |
2289 case T_BYTE: | |
2290 box->byte_field_put(value_offset, value->b); | |
2291 break; | |
2292 case T_SHORT: | |
2293 box->short_field_put(value_offset, value->s); | |
2294 break; | |
2295 case T_INT: | |
2296 box->int_field_put(value_offset, value->i); | |
2297 break; | |
2298 case T_LONG: | |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
2299 box->long_field_put(long_value_offset, value->j); |
0 | 2300 break; |
2301 default: | |
2302 return NULL; | |
2303 } | |
2304 return box; | |
2305 } | |
2306 | |
2307 | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2308 BasicType java_lang_boxing_object::basic_type(oop box) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2309 if (box == NULL) return T_ILLEGAL; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2310 BasicType type = SystemDictionary::box_klass_type(box->klass()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2311 if (type == T_OBJECT) // 'unknown' value returned by SD::bkt |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2312 return T_ILLEGAL; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2313 return type; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2314 } |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2315 |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2316 |
0 | 2317 BasicType java_lang_boxing_object::get_value(oop box, jvalue* value) { |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2318 BasicType type = SystemDictionary::box_klass_type(box->klass()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2319 switch (type) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2320 case T_BOOLEAN: |
0 | 2321 value->z = box->bool_field(value_offset); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2322 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2323 case T_CHAR: |
0 | 2324 value->c = box->char_field(value_offset); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2325 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2326 case T_FLOAT: |
0 | 2327 value->f = box->float_field(value_offset); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2328 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2329 case T_DOUBLE: |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
2330 value->d = box->double_field(long_value_offset); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2331 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2332 case T_BYTE: |
0 | 2333 value->b = box->byte_field(value_offset); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2334 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2335 case T_SHORT: |
0 | 2336 value->s = box->short_field(value_offset); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2337 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2338 case T_INT: |
0 | 2339 value->i = box->int_field(value_offset); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2340 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2341 case T_LONG: |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
2342 value->j = box->long_field(long_value_offset); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2343 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2344 default: |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2345 return T_ILLEGAL; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2346 } // end switch |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2347 return type; |
0 | 2348 } |
2349 | |
2350 | |
2351 BasicType java_lang_boxing_object::set_value(oop box, jvalue* value) { | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2352 BasicType type = SystemDictionary::box_klass_type(box->klass()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2353 switch (type) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2354 case T_BOOLEAN: |
0 | 2355 box->bool_field_put(value_offset, value->z); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2356 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2357 case T_CHAR: |
0 | 2358 box->char_field_put(value_offset, value->c); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2359 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2360 case T_FLOAT: |
0 | 2361 box->float_field_put(value_offset, value->f); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2362 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2363 case T_DOUBLE: |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
2364 box->double_field_put(long_value_offset, value->d); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2365 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2366 case T_BYTE: |
0 | 2367 box->byte_field_put(value_offset, value->b); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2368 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2369 case T_SHORT: |
0 | 2370 box->short_field_put(value_offset, value->s); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2371 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2372 case T_INT: |
0 | 2373 box->int_field_put(value_offset, value->i); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2374 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2375 case T_LONG: |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
2376 box->long_field_put(long_value_offset, value->j); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2377 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2378 default: |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2379 return T_ILLEGAL; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2380 } // end switch |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2381 return type; |
0 | 2382 } |
2383 | |
2384 | |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2385 void java_lang_boxing_object::print(BasicType type, jvalue* value, outputStream* st) { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2386 switch (type) { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2387 case T_BOOLEAN: st->print("%s", value->z ? "true" : "false"); break; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2388 case T_CHAR: st->print("%d", value->c); break; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2389 case T_BYTE: st->print("%d", value->b); break; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2390 case T_SHORT: st->print("%d", value->s); break; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2391 case T_INT: st->print("%d", value->i); break; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2392 case T_LONG: st->print(INT64_FORMAT, value->j); break; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2393 case T_FLOAT: st->print("%f", value->f); break; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2394 case T_DOUBLE: st->print("%lf", value->d); break; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2395 default: st->print("type %d?", type); break; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2396 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2397 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2398 |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2399 |
0 | 2400 // Support for java_lang_ref_Reference |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2401 HeapWord *java_lang_ref_Reference::pending_list_lock_addr() { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2402 InstanceKlass* ik = InstanceKlass::cast(SystemDictionary::Reference_klass()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2403 address addr = ik->static_field_addr(static_lock_offset); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2404 return (HeapWord*) addr; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2405 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2406 |
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2407 oop java_lang_ref_Reference::pending_list_lock() { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2408 InstanceKlass* ik = InstanceKlass::cast(SystemDictionary::Reference_klass()); |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2409 address addr = ik->static_field_addr(static_lock_offset); |
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2410 if (UseCompressedOops) { |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2411 return oopDesc::load_decode_heap_oop((narrowOop *)addr); |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2412 } else { |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2413 return oopDesc::load_decode_heap_oop((oop*)addr); |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2414 } |
0 | 2415 } |
2416 | |
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2417 HeapWord *java_lang_ref_Reference::pending_list_addr() { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2418 InstanceKlass* ik = InstanceKlass::cast(SystemDictionary::Reference_klass()); |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2419 address addr = ik->static_field_addr(static_pending_offset); |
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2420 // XXX This might not be HeapWord aligned, almost rather be char *. |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2421 return (HeapWord*)addr; |
0 | 2422 } |
2423 | |
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2424 oop java_lang_ref_Reference::pending_list() { |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2425 char *addr = (char *)pending_list_addr(); |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2426 if (UseCompressedOops) { |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2427 return oopDesc::load_decode_heap_oop((narrowOop *)addr); |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2428 } else { |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2429 return oopDesc::load_decode_heap_oop((oop*)addr); |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2430 } |
0 | 2431 } |
2432 | |
2433 | |
2434 // Support for java_lang_ref_SoftReference | |
2435 | |
2436 jlong java_lang_ref_SoftReference::timestamp(oop ref) { | |
2437 return ref->long_field(timestamp_offset); | |
2438 } | |
2439 | |
2440 jlong java_lang_ref_SoftReference::clock() { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2441 InstanceKlass* ik = InstanceKlass::cast(SystemDictionary::SoftReference_klass()); |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2442 jlong* offset = (jlong*)ik->static_field_addr(static_clock_offset); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2443 return *offset; |
0 | 2444 } |
2445 | |
2446 void java_lang_ref_SoftReference::set_clock(jlong value) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2447 InstanceKlass* ik = InstanceKlass::cast(SystemDictionary::SoftReference_klass()); |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2448 jlong* offset = (jlong*)ik->static_field_addr(static_clock_offset); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2449 *offset = value; |
0 | 2450 } |
2451 | |
2452 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2453 // Support for java_lang_invoke_MethodHandle |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2454 |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2455 int java_lang_invoke_MethodHandle::_type_offset; |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2456 int java_lang_invoke_MethodHandle::_form_offset; |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2457 |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2458 int java_lang_invoke_MemberName::_clazz_offset; |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2459 int java_lang_invoke_MemberName::_name_offset; |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2460 int java_lang_invoke_MemberName::_type_offset; |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2461 int java_lang_invoke_MemberName::_flags_offset; |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2462 int java_lang_invoke_MemberName::_vmtarget_offset; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2463 int java_lang_invoke_MemberName::_vmloader_offset; |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2464 int java_lang_invoke_MemberName::_vmindex_offset; |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2465 |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2466 int java_lang_invoke_LambdaForm::_vmentry_offset; |
3905
c26de9aef2ed
7071307: MethodHandle bimorphic inlining should consider the frequency
never
parents:
3900
diff
changeset
|
2467 |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2468 void java_lang_invoke_MethodHandle::compute_offsets() { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2469 Klass* klass_oop = SystemDictionary::MethodHandle_klass(); |
3938 | 2470 if (klass_oop != NULL && EnableInvokeDynamic) { |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2471 compute_offset(_type_offset, klass_oop, vmSymbols::type_name(), vmSymbols::java_lang_invoke_MethodType_signature()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2472 compute_optional_offset(_form_offset, klass_oop, vmSymbols::form_name(), vmSymbols::java_lang_invoke_LambdaForm_signature()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2473 if (_form_offset == 0) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2474 EnableInvokeDynamic = false; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2475 } |
710 | 2476 } |
2477 } | |
2478 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2479 void java_lang_invoke_MemberName::compute_offsets() { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2480 Klass* klass_oop = SystemDictionary::MemberName_klass(); |
3938 | 2481 if (klass_oop != NULL && EnableInvokeDynamic) { |
2482 compute_offset(_clazz_offset, klass_oop, vmSymbols::clazz_name(), vmSymbols::class_signature()); | |
2483 compute_offset(_name_offset, klass_oop, vmSymbols::name_name(), vmSymbols::string_signature()); | |
2484 compute_offset(_type_offset, klass_oop, vmSymbols::type_name(), vmSymbols::object_signature()); | |
2485 compute_offset(_flags_offset, klass_oop, vmSymbols::flags_name(), vmSymbols::int_signature()); | |
2486 MEMBERNAME_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET); | |
710 | 2487 } |
2488 } | |
2489 | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2490 void java_lang_invoke_LambdaForm::compute_offsets() { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2491 Klass* klass_oop = SystemDictionary::LambdaForm_klass(); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2492 if (klass_oop != NULL && EnableInvokeDynamic) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2493 compute_offset(_vmentry_offset, klass_oop, vmSymbols::vmentry_name(), vmSymbols::java_lang_invoke_MemberName_signature()); |
710 | 2494 } |
2495 } | |
2496 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2497 oop java_lang_invoke_MethodHandle::type(oop mh) { |
710 | 2498 return mh->obj_field(_type_offset); |
2499 } | |
2500 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2501 void java_lang_invoke_MethodHandle::set_type(oop mh, oop mtype) { |
710 | 2502 mh->obj_field_put(_type_offset, mtype); |
2503 } | |
2504 | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2505 oop java_lang_invoke_MethodHandle::form(oop mh) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2506 assert(_form_offset != 0, ""); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2507 return mh->obj_field(_form_offset); |
710 | 2508 } |
2509 | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2510 void java_lang_invoke_MethodHandle::set_form(oop mh, oop lform) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2511 assert(_form_offset != 0, ""); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2512 mh->obj_field_put(_form_offset, lform); |
710 | 2513 } |
2514 | |
2515 /// MemberName accessors | |
2516 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2517 oop java_lang_invoke_MemberName::clazz(oop mname) { |
710 | 2518 assert(is_instance(mname), "wrong type"); |
2519 return mname->obj_field(_clazz_offset); | |
2520 } | |
2521 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2522 void java_lang_invoke_MemberName::set_clazz(oop mname, oop clazz) { |
710 | 2523 assert(is_instance(mname), "wrong type"); |
2524 mname->obj_field_put(_clazz_offset, clazz); | |
2525 } | |
2526 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2527 oop java_lang_invoke_MemberName::name(oop mname) { |
710 | 2528 assert(is_instance(mname), "wrong type"); |
2529 return mname->obj_field(_name_offset); | |
2530 } | |
2531 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2532 void java_lang_invoke_MemberName::set_name(oop mname, oop name) { |
710 | 2533 assert(is_instance(mname), "wrong type"); |
2534 mname->obj_field_put(_name_offset, name); | |
2535 } | |
2536 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2537 oop java_lang_invoke_MemberName::type(oop mname) { |
710 | 2538 assert(is_instance(mname), "wrong type"); |
2539 return mname->obj_field(_type_offset); | |
2540 } | |
2541 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2542 void java_lang_invoke_MemberName::set_type(oop mname, oop type) { |
710 | 2543 assert(is_instance(mname), "wrong type"); |
2544 mname->obj_field_put(_type_offset, type); | |
2545 } | |
2546 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2547 int java_lang_invoke_MemberName::flags(oop mname) { |
710 | 2548 assert(is_instance(mname), "wrong type"); |
2549 return mname->int_field(_flags_offset); | |
2550 } | |
2551 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2552 void java_lang_invoke_MemberName::set_flags(oop mname, int flags) { |
710 | 2553 assert(is_instance(mname), "wrong type"); |
2554 mname->int_field_put(_flags_offset, flags); | |
2555 } | |
2556 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2557 Metadata* java_lang_invoke_MemberName::vmtarget(oop mname) { |
710 | 2558 assert(is_instance(mname), "wrong type"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2559 return (Metadata*)mname->address_field(_vmtarget_offset); |
710 | 2560 } |
2561 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2562 void java_lang_invoke_MemberName::set_vmtarget(oop mname, Metadata* ref) { |
710 | 2563 assert(is_instance(mname), "wrong type"); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2564 #ifdef ASSERT |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2565 // check the type of the vmtarget |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2566 if (ref != NULL) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2567 switch (flags(mname) & (MN_IS_METHOD | |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2568 MN_IS_CONSTRUCTOR | |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2569 MN_IS_FIELD)) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2570 case MN_IS_METHOD: |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2571 case MN_IS_CONSTRUCTOR: |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2572 assert(ref->is_method(), "should be a method"); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2573 break; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2574 case MN_IS_FIELD: |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2575 assert(ref->is_klass(), "should be a class"); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2576 break; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2577 default: |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2578 ShouldNotReachHere(); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2579 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2580 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2581 #endif //ASSERT |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2582 mname->address_field_put(_vmtarget_offset, (address)ref); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2583 oop loader = NULL; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2584 if (ref != NULL) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2585 if (ref->is_klass()) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2586 loader = ((Klass*)ref)->class_loader(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2587 } else if (ref->is_method()) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2588 loader = ((Method*)ref)->method_holder()->class_loader(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2589 } else { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2590 ShouldNotReachHere(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2591 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2592 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2593 // Add a reference to the loader to ensure the metadata is kept alive |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2594 mname->obj_field_put(_vmloader_offset, loader); |
710 | 2595 } |
2596 | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2597 intptr_t java_lang_invoke_MemberName::vmindex(oop mname) { |
710 | 2598 assert(is_instance(mname), "wrong type"); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2599 return (intptr_t) mname->address_field(_vmindex_offset); |
710 | 2600 } |
2601 | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2602 void java_lang_invoke_MemberName::set_vmindex(oop mname, intptr_t index) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2603 assert(is_instance(mname), "wrong type"); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2604 mname->address_field_put(_vmindex_offset, (address) index); |
710 | 2605 } |
2606 | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2607 oop java_lang_invoke_LambdaForm::vmentry(oop lform) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2608 assert(is_instance(lform), "wrong type"); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2609 return lform->obj_field(_vmentry_offset); |
710 | 2610 } |
2611 | |
2612 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2613 // Support for java_lang_invoke_MethodType |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2614 |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2615 int java_lang_invoke_MethodType::_rtype_offset; |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2616 int java_lang_invoke_MethodType::_ptypes_offset; |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2617 |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2618 void java_lang_invoke_MethodType::compute_offsets() { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2619 Klass* k = SystemDictionary::MethodType_klass(); |
710 | 2620 if (k != NULL) { |
2621 compute_offset(_rtype_offset, k, vmSymbols::rtype_name(), vmSymbols::class_signature()); | |
2622 compute_offset(_ptypes_offset, k, vmSymbols::ptypes_name(), vmSymbols::class_array_signature()); | |
2623 } | |
2624 } | |
2625 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2626 void java_lang_invoke_MethodType::print_signature(oop mt, outputStream* st) { |
710 | 2627 st->print("("); |
2628 objArrayOop pts = ptypes(mt); | |
2629 for (int i = 0, limit = pts->length(); i < limit; i++) { | |
2630 java_lang_Class::print_signature(pts->obj_at(i), st); | |
2631 } | |
2632 st->print(")"); | |
2633 java_lang_Class::print_signature(rtype(mt), st); | |
2634 } | |
2635 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2636 Symbol* java_lang_invoke_MethodType::as_signature(oop mt, bool intern_if_not_found, TRAPS) { |
710 | 2637 ResourceMark rm; |
2638 stringStream buffer(128); | |
2639 print_signature(mt, &buffer); | |
2640 const char* sigstr = buffer.base(); | |
2641 int siglen = (int) buffer.size(); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2642 Symbol *name; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2643 if (!intern_if_not_found) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2644 name = SymbolTable::probe(sigstr, siglen); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2645 } else { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2646 name = SymbolTable::new_symbol(sigstr, siglen, THREAD); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2647 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2648 return name; |
710 | 2649 } |
2650 | |
3461
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2651 bool java_lang_invoke_MethodType::equals(oop mt1, oop mt2) { |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2652 if (mt1 == mt2) |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2653 return true; |
3461
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2654 if (rtype(mt1) != rtype(mt2)) |
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2655 return false; |
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2656 if (ptype_count(mt1) != ptype_count(mt2)) |
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2657 return false; |
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2658 for (int i = ptype_count(mt1) - 1; i >= 0; i--) { |
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2659 if (ptype(mt1, i) != ptype(mt2, i)) |
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2660 return false; |
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2661 } |
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2662 return true; |
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2663 } |
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2664 |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2665 oop java_lang_invoke_MethodType::rtype(oop mt) { |
710 | 2666 assert(is_instance(mt), "must be a MethodType"); |
2667 return mt->obj_field(_rtype_offset); | |
2668 } | |
2669 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2670 objArrayOop java_lang_invoke_MethodType::ptypes(oop mt) { |
710 | 2671 assert(is_instance(mt), "must be a MethodType"); |
2672 return (objArrayOop) mt->obj_field(_ptypes_offset); | |
2673 } | |
2674 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2675 oop java_lang_invoke_MethodType::ptype(oop mt, int idx) { |
710 | 2676 return ptypes(mt)->obj_at(idx); |
2677 } | |
2678 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2679 int java_lang_invoke_MethodType::ptype_count(oop mt) { |
1133
aa62b9388fce
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
1096
diff
changeset
|
2680 return ptypes(mt)->length(); |
aa62b9388fce
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
1096
diff
changeset
|
2681 } |
aa62b9388fce
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
1096
diff
changeset
|
2682 |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2683 int java_lang_invoke_MethodType::ptype_slot_count(oop mt) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2684 objArrayOop pts = ptypes(mt); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2685 int count = pts->length(); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2686 int slots = 0; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2687 for (int i = 0; i < count; i++) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2688 BasicType bt = java_lang_Class::as_BasicType(pts->obj_at(i)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2689 slots += type2size[bt]; |
710 | 2690 } |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2691 return slots; |
710 | 2692 } |
2693 | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2694 int java_lang_invoke_MethodType::rtype_slot_count(oop mt) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2695 BasicType bt = java_lang_Class::as_BasicType(rtype(mt)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2696 return type2size[bt]; |
1793
d257356e35f0
6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions
jrose
parents:
1552
diff
changeset
|
2697 } |
d257356e35f0
6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions
jrose
parents:
1552
diff
changeset
|
2698 |
710 | 2699 |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2700 // Support for java_lang_invoke_CallSite |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2701 |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2702 int java_lang_invoke_CallSite::_target_offset; |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2703 |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2704 void java_lang_invoke_CallSite::compute_offsets() { |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2705 if (!EnableInvokeDynamic) return; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2706 Klass* k = SystemDictionary::CallSite_klass(); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2707 if (k != NULL) { |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2708 compute_offset(_target_offset, k, vmSymbols::target_name(), vmSymbols::java_lang_invoke_MethodHandle_signature()); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2709 } |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2710 } |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2711 |
710 | 2712 |
0 | 2713 // Support for java_security_AccessControlContext |
2714 | |
2715 int java_security_AccessControlContext::_context_offset = 0; | |
2716 int java_security_AccessControlContext::_privilegedContext_offset = 0; | |
2717 int java_security_AccessControlContext::_isPrivileged_offset = 0; | |
2718 | |
2719 void java_security_AccessControlContext::compute_offsets() { | |
2720 assert(_isPrivileged_offset == 0, "offsets should be initialized only once"); | |
2721 fieldDescriptor fd; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2722 InstanceKlass* ik = InstanceKlass::cast(SystemDictionary::AccessControlContext_klass()); |
0 | 2723 |
2724 if (!ik->find_local_field(vmSymbols::context_name(), vmSymbols::protectiondomain_signature(), &fd)) { | |
2725 fatal("Invalid layout of java.security.AccessControlContext"); | |
2726 } | |
2727 _context_offset = fd.offset(); | |
2728 | |
2729 if (!ik->find_local_field(vmSymbols::privilegedContext_name(), vmSymbols::accesscontrolcontext_signature(), &fd)) { | |
2730 fatal("Invalid layout of java.security.AccessControlContext"); | |
2731 } | |
2732 _privilegedContext_offset = fd.offset(); | |
2733 | |
2734 if (!ik->find_local_field(vmSymbols::isPrivileged_name(), vmSymbols::bool_signature(), &fd)) { | |
2735 fatal("Invalid layout of java.security.AccessControlContext"); | |
2736 } | |
2737 _isPrivileged_offset = fd.offset(); | |
2738 } | |
2739 | |
2740 | |
2741 oop java_security_AccessControlContext::create(objArrayHandle context, bool isPrivileged, Handle privileged_context, TRAPS) { | |
2742 assert(_isPrivileged_offset != 0, "offsets should have been initialized"); | |
2743 // Ensure klass is initialized | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2744 InstanceKlass::cast(SystemDictionary::AccessControlContext_klass())->initialize(CHECK_0); |
0 | 2745 // Allocate result |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2746 oop result = InstanceKlass::cast(SystemDictionary::AccessControlContext_klass())->allocate_instance(CHECK_0); |
0 | 2747 // Fill in values |
2748 result->obj_field_put(_context_offset, context()); | |
2749 result->obj_field_put(_privilegedContext_offset, privileged_context()); | |
2750 result->bool_field_put(_isPrivileged_offset, isPrivileged); | |
2751 return result; | |
2752 } | |
2753 | |
2754 | |
2755 // Support for java_lang_ClassLoader | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2756 |
3938 | 2757 bool java_lang_ClassLoader::offsets_computed = false; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2758 int java_lang_ClassLoader::_loader_data_offset = -1; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2759 int java_lang_ClassLoader::_dependencies_offset = -1; |
3938 | 2760 int java_lang_ClassLoader::parallelCapable_offset = -1; |
2761 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2762 ClassLoaderData** java_lang_ClassLoader::loader_data_addr(oop loader) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2763 assert(loader != NULL && loader->is_oop(), "loader must be oop"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2764 return (ClassLoaderData**) loader->address_field_addr(_loader_data_offset); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2765 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2766 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2767 ClassLoaderData* java_lang_ClassLoader::loader_data(oop loader) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2768 return *java_lang_ClassLoader::loader_data_addr(loader); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2769 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2770 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2771 oop java_lang_ClassLoader::dependencies(oop loader) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2772 return loader->obj_field(_dependencies_offset); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2773 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2774 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2775 HeapWord* java_lang_ClassLoader::dependencies_addr(oop loader) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2776 if (UseCompressedOops) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2777 return (HeapWord*)loader->obj_field_addr<narrowOop>(_dependencies_offset); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2778 } else { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2779 return (HeapWord*)loader->obj_field_addr<oop>(_dependencies_offset); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2780 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2781 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2782 |
3938 | 2783 void java_lang_ClassLoader::compute_offsets() { |
2784 assert(!offsets_computed, "offsets should be initialized only once"); | |
2785 offsets_computed = true; | |
2786 | |
2787 // The field indicating parallelCapable (parallelLockMap) is only present starting in 7, | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2788 Klass* k1 = SystemDictionary::ClassLoader_klass(); |
3938 | 2789 compute_optional_offset(parallelCapable_offset, |
2790 k1, vmSymbols::parallelCapable_name(), vmSymbols::concurrenthashmap_signature()); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2791 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2792 CLASSLOADER_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET); |
3938 | 2793 } |
0 | 2794 |
2795 oop java_lang_ClassLoader::parent(oop loader) { | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2796 assert(is_instance(loader), "loader must be oop"); |
0 | 2797 return loader->obj_field(parent_offset); |
2798 } | |
2799 | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2800 bool java_lang_ClassLoader::isAncestor(oop loader, oop cl) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2801 assert(is_instance(loader), "loader must be oop"); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2802 assert(cl == NULL || is_instance(cl), "cl argument must be oop"); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2803 oop acl = loader; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2804 debug_only(jint loop_count = 0); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2805 // This loop taken verbatim from ClassLoader.java: |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2806 do { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2807 acl = parent(acl); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2808 if (cl == acl) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2809 return true; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2810 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2811 assert(++loop_count > 0, "loop_count overflow"); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2812 } while (acl != NULL); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2813 return false; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2814 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2815 |
0 | 2816 |
3938 | 2817 // For class loader classes, parallelCapable defined |
2818 // based on non-null field | |
2819 // Written to by java.lang.ClassLoader, vm only reads this field, doesn't set it | |
2820 bool java_lang_ClassLoader::parallelCapable(oop class_loader) { | |
2821 if (!JDK_Version::is_gte_jdk17x_version() | |
2822 || parallelCapable_offset == -1) { | |
2823 // Default for backward compatibility is false | |
2824 return false; | |
2825 } | |
2826 return (class_loader->obj_field(parallelCapable_offset) != NULL); | |
2827 } | |
2828 | |
0 | 2829 bool java_lang_ClassLoader::is_trusted_loader(oop loader) { |
2830 // Fix for 4474172; see evaluation for more details | |
2831 loader = non_reflection_class_loader(loader); | |
2832 | |
2833 oop cl = SystemDictionary::java_system_loader(); | |
2834 while(cl != NULL) { | |
2835 if (cl == loader) return true; | |
2836 cl = parent(cl); | |
2837 } | |
2838 return false; | |
2839 } | |
2840 | |
2841 oop java_lang_ClassLoader::non_reflection_class_loader(oop loader) { | |
2842 if (loader != NULL) { | |
2843 // See whether this is one of the class loaders associated with | |
2844 // the generated bytecodes for reflection, and if so, "magically" | |
2845 // delegate to its parent to prevent class loading from occurring | |
2846 // in places where applications using reflection didn't expect it. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2847 Klass* delegating_cl_class = SystemDictionary::reflect_DelegatingClassLoader_klass(); |
0 | 2848 // This might be null in non-1.4 JDKs |
2849 if (delegating_cl_class != NULL && loader->is_a(delegating_cl_class)) { | |
2850 return parent(loader); | |
2851 } | |
2852 } | |
2853 return loader; | |
2854 } | |
2855 | |
2856 | |
2857 // Support for java_lang_System | |
2858 int java_lang_System::in_offset_in_bytes() { | |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
2859 return (InstanceMirrorKlass::offset_of_static_fields() + static_in_offset); |
0 | 2860 } |
2861 | |
2862 | |
2863 int java_lang_System::out_offset_in_bytes() { | |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
2864 return (InstanceMirrorKlass::offset_of_static_fields() + static_out_offset); |
0 | 2865 } |
2866 | |
2867 | |
2868 int java_lang_System::err_offset_in_bytes() { | |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
2869 return (InstanceMirrorKlass::offset_of_static_fields() + static_err_offset); |
0 | 2870 } |
2871 | |
2872 | |
2873 | |
3938 | 2874 int java_lang_Class::_klass_offset; |
2875 int java_lang_Class::_array_klass_offset; | |
2876 int java_lang_Class::_resolved_constructor_offset; | |
2877 int java_lang_Class::_oop_size_offset; | |
2878 int java_lang_Class::_static_oop_field_count_offset; | |
6948
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
2879 #ifdef GRAAL |
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
2880 int java_lang_Class::_graal_mirror_offset; |
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
2881 #endif |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2882 GrowableArray<Klass*>* java_lang_Class::_fixup_mirror_list = NULL; |
0 | 2883 int java_lang_Throwable::backtrace_offset; |
2884 int java_lang_Throwable::detailMessage_offset; | |
2885 int java_lang_Throwable::cause_offset; | |
2886 int java_lang_Throwable::stackTrace_offset; | |
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
2887 int java_lang_Throwable::static_unassigned_stacktrace_offset; |
0 | 2888 int java_lang_reflect_AccessibleObject::override_offset; |
2889 int java_lang_reflect_Method::clazz_offset; | |
2890 int java_lang_reflect_Method::name_offset; | |
2891 int java_lang_reflect_Method::returnType_offset; | |
2892 int java_lang_reflect_Method::parameterTypes_offset; | |
2893 int java_lang_reflect_Method::exceptionTypes_offset; | |
2894 int java_lang_reflect_Method::slot_offset; | |
2895 int java_lang_reflect_Method::modifiers_offset; | |
2896 int java_lang_reflect_Method::signature_offset; | |
2897 int java_lang_reflect_Method::annotations_offset; | |
2898 int java_lang_reflect_Method::parameter_annotations_offset; | |
2899 int java_lang_reflect_Method::annotation_default_offset; | |
2900 int java_lang_reflect_Constructor::clazz_offset; | |
2901 int java_lang_reflect_Constructor::parameterTypes_offset; | |
2902 int java_lang_reflect_Constructor::exceptionTypes_offset; | |
2903 int java_lang_reflect_Constructor::slot_offset; | |
2904 int java_lang_reflect_Constructor::modifiers_offset; | |
2905 int java_lang_reflect_Constructor::signature_offset; | |
2906 int java_lang_reflect_Constructor::annotations_offset; | |
2907 int java_lang_reflect_Constructor::parameter_annotations_offset; | |
2908 int java_lang_reflect_Field::clazz_offset; | |
2909 int java_lang_reflect_Field::name_offset; | |
2910 int java_lang_reflect_Field::type_offset; | |
2911 int java_lang_reflect_Field::slot_offset; | |
2912 int java_lang_reflect_Field::modifiers_offset; | |
2913 int java_lang_reflect_Field::signature_offset; | |
2914 int java_lang_reflect_Field::annotations_offset; | |
2915 int java_lang_boxing_object::value_offset; | |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
2916 int java_lang_boxing_object::long_value_offset; |
0 | 2917 int java_lang_ref_Reference::referent_offset; |
2918 int java_lang_ref_Reference::queue_offset; | |
2919 int java_lang_ref_Reference::next_offset; | |
2920 int java_lang_ref_Reference::discovered_offset; | |
2921 int java_lang_ref_Reference::static_lock_offset; | |
2922 int java_lang_ref_Reference::static_pending_offset; | |
2923 int java_lang_ref_Reference::number_of_fake_oop_fields; | |
2924 int java_lang_ref_SoftReference::timestamp_offset; | |
2925 int java_lang_ref_SoftReference::static_clock_offset; | |
2926 int java_lang_ClassLoader::parent_offset; | |
2927 int java_lang_System::static_in_offset; | |
2928 int java_lang_System::static_out_offset; | |
2929 int java_lang_System::static_err_offset; | |
2930 int java_lang_StackTraceElement::declaringClass_offset; | |
2931 int java_lang_StackTraceElement::methodName_offset; | |
2932 int java_lang_StackTraceElement::fileName_offset; | |
2933 int java_lang_StackTraceElement::lineNumber_offset; | |
2934 int java_lang_AssertionStatusDirectives::classes_offset; | |
2935 int java_lang_AssertionStatusDirectives::classEnabled_offset; | |
2936 int java_lang_AssertionStatusDirectives::packages_offset; | |
2937 int java_lang_AssertionStatusDirectives::packageEnabled_offset; | |
2938 int java_lang_AssertionStatusDirectives::deflt_offset; | |
2939 int java_nio_Buffer::_limit_offset; | |
2940 int java_util_concurrent_locks_AbstractOwnableSynchronizer::_owner_offset = 0; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2941 int sun_reflect_ConstantPool::_oop_offset; |
0 | 2942 int sun_reflect_UnsafeStaticFieldAccessorImpl::_base_offset; |
2943 | |
2944 | |
2945 // Support for java_lang_StackTraceElement | |
2946 | |
2947 void java_lang_StackTraceElement::set_fileName(oop element, oop value) { | |
2948 element->obj_field_put(fileName_offset, value); | |
2949 } | |
2950 | |
2951 void java_lang_StackTraceElement::set_declaringClass(oop element, oop value) { | |
2952 element->obj_field_put(declaringClass_offset, value); | |
2953 } | |
2954 | |
2955 void java_lang_StackTraceElement::set_methodName(oop element, oop value) { | |
2956 element->obj_field_put(methodName_offset, value); | |
2957 } | |
2958 | |
2959 void java_lang_StackTraceElement::set_lineNumber(oop element, int value) { | |
2960 element->int_field_put(lineNumber_offset, value); | |
2961 } | |
2962 | |
2963 | |
2964 // Support for java Assertions - java_lang_AssertionStatusDirectives. | |
2965 | |
2966 void java_lang_AssertionStatusDirectives::set_classes(oop o, oop val) { | |
2967 o->obj_field_put(classes_offset, val); | |
2968 } | |
2969 | |
2970 void java_lang_AssertionStatusDirectives::set_classEnabled(oop o, oop val) { | |
2971 o->obj_field_put(classEnabled_offset, val); | |
2972 } | |
2973 | |
2974 void java_lang_AssertionStatusDirectives::set_packages(oop o, oop val) { | |
2975 o->obj_field_put(packages_offset, val); | |
2976 } | |
2977 | |
2978 void java_lang_AssertionStatusDirectives::set_packageEnabled(oop o, oop val) { | |
2979 o->obj_field_put(packageEnabled_offset, val); | |
2980 } | |
2981 | |
2982 void java_lang_AssertionStatusDirectives::set_deflt(oop o, bool val) { | |
2983 o->bool_field_put(deflt_offset, val); | |
2984 } | |
2985 | |
2986 | |
2987 // Support for intrinsification of java.nio.Buffer.checkIndex | |
2988 int java_nio_Buffer::limit_offset() { | |
2989 return _limit_offset; | |
2990 } | |
2991 | |
2992 | |
2993 void java_nio_Buffer::compute_offsets() { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2994 Klass* k = SystemDictionary::nio_Buffer_klass(); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2995 assert(k != NULL, "must be loaded in 1.4+"); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2996 compute_offset(_limit_offset, k, vmSymbols::limit_name(), vmSymbols::int_signature()); |
0 | 2997 } |
2998 | |
2999 void java_util_concurrent_locks_AbstractOwnableSynchronizer::initialize(TRAPS) { | |
3000 if (_owner_offset != 0) return; | |
3001 | |
3002 assert(JDK_Version::is_gte_jdk16x_version(), "Must be JDK 1.6 or later"); | |
3003 SystemDictionary::load_abstract_ownable_synchronizer_klass(CHECK); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3004 Klass* k = SystemDictionary::abstract_ownable_synchronizer_klass(); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3005 compute_offset(_owner_offset, k, |
0 | 3006 vmSymbols::exclusive_owner_thread_name(), vmSymbols::thread_signature()); |
3007 } | |
3008 | |
3009 oop java_util_concurrent_locks_AbstractOwnableSynchronizer::get_owner_threadObj(oop obj) { | |
3010 assert(_owner_offset != 0, "Must be initialized"); | |
3011 return obj->obj_field(_owner_offset); | |
3012 } | |
3013 | |
3014 // Compute hard-coded offsets | |
3015 // Invoked before SystemDictionary::initialize, so pre-loaded classes | |
3016 // are not available to determine the offset_of_static_fields. | |
3017 void JavaClasses::compute_hard_coded_offsets() { | |
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
3018 const int x = heapOopSize; |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3019 const int header = instanceOopDesc::base_offset_in_bytes(); |
0 | 3020 |
3021 // Throwable Class | |
3022 java_lang_Throwable::backtrace_offset = java_lang_Throwable::hc_backtrace_offset * x + header; | |
3023 java_lang_Throwable::detailMessage_offset = java_lang_Throwable::hc_detailMessage_offset * x + header; | |
3024 java_lang_Throwable::cause_offset = java_lang_Throwable::hc_cause_offset * x + header; | |
3025 java_lang_Throwable::stackTrace_offset = java_lang_Throwable::hc_stackTrace_offset * x + header; | |
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
3026 java_lang_Throwable::static_unassigned_stacktrace_offset = java_lang_Throwable::hc_static_unassigned_stacktrace_offset * x; |
0 | 3027 |
3028 // java_lang_boxing_object | |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3029 java_lang_boxing_object::value_offset = java_lang_boxing_object::hc_value_offset + header; |
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3030 java_lang_boxing_object::long_value_offset = align_size_up((java_lang_boxing_object::hc_value_offset + header), BytesPerLong); |
0 | 3031 |
3032 // java_lang_ref_Reference: | |
3033 java_lang_ref_Reference::referent_offset = java_lang_ref_Reference::hc_referent_offset * x + header; | |
3034 java_lang_ref_Reference::queue_offset = java_lang_ref_Reference::hc_queue_offset * x + header; | |
3035 java_lang_ref_Reference::next_offset = java_lang_ref_Reference::hc_next_offset * x + header; | |
3036 java_lang_ref_Reference::discovered_offset = java_lang_ref_Reference::hc_discovered_offset * x + header; | |
3037 java_lang_ref_Reference::static_lock_offset = java_lang_ref_Reference::hc_static_lock_offset * x; | |
3038 java_lang_ref_Reference::static_pending_offset = java_lang_ref_Reference::hc_static_pending_offset * x; | |
3039 // Artificial fields for java_lang_ref_Reference | |
3040 // The first field is for the discovered field added in 1.4 | |
3041 java_lang_ref_Reference::number_of_fake_oop_fields = 1; | |
3042 | |
3043 // java_lang_ref_SoftReference Class | |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3044 java_lang_ref_SoftReference::timestamp_offset = align_size_up((java_lang_ref_SoftReference::hc_timestamp_offset * x + header), BytesPerLong); |
0 | 3045 // Don't multiply static fields because they are always in wordSize units |
3046 java_lang_ref_SoftReference::static_clock_offset = java_lang_ref_SoftReference::hc_static_clock_offset * x; | |
3047 | |
3048 // java_lang_ClassLoader | |
3049 java_lang_ClassLoader::parent_offset = java_lang_ClassLoader::hc_parent_offset * x + header; | |
3050 | |
3051 // java_lang_System | |
3052 java_lang_System::static_in_offset = java_lang_System::hc_static_in_offset * x; | |
3053 java_lang_System::static_out_offset = java_lang_System::hc_static_out_offset * x; | |
3054 java_lang_System::static_err_offset = java_lang_System::hc_static_err_offset * x; | |
3055 | |
3056 // java_lang_StackTraceElement | |
3057 java_lang_StackTraceElement::declaringClass_offset = java_lang_StackTraceElement::hc_declaringClass_offset * x + header; | |
3058 java_lang_StackTraceElement::methodName_offset = java_lang_StackTraceElement::hc_methodName_offset * x + header; | |
3059 java_lang_StackTraceElement::fileName_offset = java_lang_StackTraceElement::hc_fileName_offset * x + header; | |
3060 java_lang_StackTraceElement::lineNumber_offset = java_lang_StackTraceElement::hc_lineNumber_offset * x + header; | |
3061 java_lang_AssertionStatusDirectives::classes_offset = java_lang_AssertionStatusDirectives::hc_classes_offset * x + header; | |
3062 java_lang_AssertionStatusDirectives::classEnabled_offset = java_lang_AssertionStatusDirectives::hc_classEnabled_offset * x + header; | |
3063 java_lang_AssertionStatusDirectives::packages_offset = java_lang_AssertionStatusDirectives::hc_packages_offset * x + header; | |
3064 java_lang_AssertionStatusDirectives::packageEnabled_offset = java_lang_AssertionStatusDirectives::hc_packageEnabled_offset * x + header; | |
3065 java_lang_AssertionStatusDirectives::deflt_offset = java_lang_AssertionStatusDirectives::hc_deflt_offset * x + header; | |
3066 | |
3067 } | |
3068 | |
3069 | |
3070 // Compute non-hard-coded field offsets of all the classes in this file | |
3071 void JavaClasses::compute_offsets() { | |
3938 | 3072 // java_lang_Class::compute_offsets was called earlier in bootstrap |
3073 java_lang_ClassLoader::compute_offsets(); | |
0 | 3074 java_lang_Thread::compute_offsets(); |
3075 java_lang_ThreadGroup::compute_offsets(); | |
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2379
diff
changeset
|
3076 if (EnableInvokeDynamic) { |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
3077 java_lang_invoke_MethodHandle::compute_offsets(); |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
3078 java_lang_invoke_MemberName::compute_offsets(); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
3079 java_lang_invoke_LambdaForm::compute_offsets(); |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
3080 java_lang_invoke_MethodType::compute_offsets(); |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
3081 java_lang_invoke_CallSite::compute_offsets(); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
3082 } |
0 | 3083 java_security_AccessControlContext::compute_offsets(); |
3084 // Initialize reflection classes. The layouts of these classes | |
3085 // changed with the new reflection implementation in JDK 1.4, and | |
3086 // since the Universe doesn't know what JDK version it is until this | |
3087 // point we defer computation of these offsets until now. | |
3088 java_lang_reflect_AccessibleObject::compute_offsets(); | |
3089 java_lang_reflect_Method::compute_offsets(); | |
3090 java_lang_reflect_Constructor::compute_offsets(); | |
3091 java_lang_reflect_Field::compute_offsets(); | |
3092 if (JDK_Version::is_gte_jdk14x_version()) { | |
3093 java_nio_Buffer::compute_offsets(); | |
3094 } | |
3095 if (JDK_Version::is_gte_jdk15x_version()) { | |
3096 sun_reflect_ConstantPool::compute_offsets(); | |
3097 sun_reflect_UnsafeStaticFieldAccessorImpl::compute_offsets(); | |
3098 } | |
710 | 3099 |
3100 // generated interpreter code wants to know about the offsets we just computed: | |
3101 AbstractAssembler::update_delayed_values(); | |
0 | 3102 } |
3103 | |
3104 #ifndef PRODUCT | |
3105 | |
3106 // These functions exist to assert the validity of hard-coded field offsets to guard | |
3107 // against changes in the class files | |
3108 | |
3109 bool JavaClasses::check_offset(const char *klass_name, int hardcoded_offset, const char *field_name, const char* field_sig) { | |
3110 EXCEPTION_MARK; | |
3111 fieldDescriptor fd; | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3112 TempNewSymbol klass_sym = SymbolTable::new_symbol(klass_name, CATCH); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3113 Klass* k = SystemDictionary::resolve_or_fail(klass_sym, true, CATCH); |
0 | 3114 instanceKlassHandle h_klass (THREAD, k); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3115 TempNewSymbol f_name = SymbolTable::new_symbol(field_name, CATCH); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3116 TempNewSymbol f_sig = SymbolTable::new_symbol(field_sig, CATCH); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3117 if (!h_klass->find_local_field(f_name, f_sig, &fd)) { |
0 | 3118 tty->print_cr("Nonstatic field %s.%s not found", klass_name, field_name); |
3119 return false; | |
3120 } | |
3121 if (fd.is_static()) { | |
3122 tty->print_cr("Nonstatic field %s.%s appears to be static", klass_name, field_name); | |
3123 return false; | |
3124 } | |
3125 if (fd.offset() == hardcoded_offset ) { | |
3126 return true; | |
3127 } else { | |
3128 tty->print_cr("Offset of nonstatic field %s.%s is hardcoded as %d but should really be %d.", | |
3129 klass_name, field_name, hardcoded_offset, fd.offset()); | |
3130 return false; | |
3131 } | |
3132 } | |
3133 | |
3134 | |
3135 bool JavaClasses::check_static_offset(const char *klass_name, int hardcoded_offset, const char *field_name, const char* field_sig) { | |
3136 EXCEPTION_MARK; | |
3137 fieldDescriptor fd; | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3138 TempNewSymbol klass_sym = SymbolTable::new_symbol(klass_name, CATCH); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3139 Klass* k = SystemDictionary::resolve_or_fail(klass_sym, true, CATCH); |
0 | 3140 instanceKlassHandle h_klass (THREAD, k); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3141 TempNewSymbol f_name = SymbolTable::new_symbol(field_name, CATCH); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3142 TempNewSymbol f_sig = SymbolTable::new_symbol(field_sig, CATCH); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3143 if (!h_klass->find_local_field(f_name, f_sig, &fd)) { |
0 | 3144 tty->print_cr("Static field %s.%s not found", klass_name, field_name); |
3145 return false; | |
3146 } | |
3147 if (!fd.is_static()) { | |
3148 tty->print_cr("Static field %s.%s appears to be nonstatic", klass_name, field_name); | |
3149 return false; | |
3150 } | |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
3151 if (fd.offset() == hardcoded_offset + InstanceMirrorKlass::offset_of_static_fields()) { |
0 | 3152 return true; |
3153 } else { | |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
3154 tty->print_cr("Offset of static field %s.%s is hardcoded as %d but should really be %d.", klass_name, field_name, hardcoded_offset, fd.offset() - InstanceMirrorKlass::offset_of_static_fields()); |
0 | 3155 return false; |
3156 } | |
3157 } | |
3158 | |
3159 | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3160 bool JavaClasses::check_constant(const char *klass_name, int hardcoded_constant, const char *field_name, const char* field_sig) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3161 EXCEPTION_MARK; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3162 fieldDescriptor fd; |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3163 TempNewSymbol klass_sym = SymbolTable::new_symbol(klass_name, CATCH); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3164 Klass* k = SystemDictionary::resolve_or_fail(klass_sym, true, CATCH); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3165 instanceKlassHandle h_klass (THREAD, k); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3166 TempNewSymbol f_name = SymbolTable::new_symbol(field_name, CATCH); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3167 TempNewSymbol f_sig = SymbolTable::new_symbol(field_sig, CATCH); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3168 if (!h_klass->find_local_field(f_name, f_sig, &fd)) { |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3169 tty->print_cr("Static field %s.%s not found", klass_name, field_name); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3170 return false; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3171 } |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3172 if (!fd.is_static() || !fd.has_initial_value()) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3173 tty->print_cr("Static field %s.%s appears to be non-constant", klass_name, field_name); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3174 return false; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3175 } |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3176 if (!fd.initial_value_tag().is_int()) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3177 tty->print_cr("Static field %s.%s is not an int", klass_name, field_name); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3178 return false; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3179 } |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3180 jint field_value = fd.int_initial_value(); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3181 if (field_value == hardcoded_constant) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3182 return true; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3183 } else { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3184 tty->print_cr("Constant value of static field %s.%s is hardcoded as %d but should really be %d.", klass_name, field_name, hardcoded_constant, field_value); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3185 return false; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3186 } |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3187 } |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3188 |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3189 |
0 | 3190 // Check the hard-coded field offsets of all the classes in this file |
3191 | |
3192 void JavaClasses::check_offsets() { | |
3193 bool valid = true; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3194 HandleMark hm; |
0 | 3195 |
3196 #define CHECK_OFFSET(klass_name, cpp_klass_name, field_name, field_sig) \ | |
3197 valid &= check_offset(klass_name, cpp_klass_name :: field_name ## _offset, #field_name, field_sig) | |
3198 | |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3199 #define CHECK_LONG_OFFSET(klass_name, cpp_klass_name, field_name, field_sig) \ |
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3200 valid &= check_offset(klass_name, cpp_klass_name :: long_ ## field_name ## _offset, #field_name, field_sig) |
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3201 |
0 | 3202 #define CHECK_STATIC_OFFSET(klass_name, cpp_klass_name, field_name, field_sig) \ |
3203 valid &= check_static_offset(klass_name, cpp_klass_name :: static_ ## field_name ## _offset, #field_name, field_sig) | |
3204 | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3205 #define CHECK_CONSTANT(klass_name, cpp_klass_name, field_name, field_sig) \ |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3206 valid &= check_constant(klass_name, cpp_klass_name :: field_name, #field_name, field_sig) |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3207 |
0 | 3208 // java.lang.String |
3209 | |
3210 CHECK_OFFSET("java/lang/String", java_lang_String, value, "[C"); | |
6057 | 3211 if (java_lang_String::has_offset_field()) { |
3212 CHECK_OFFSET("java/lang/String", java_lang_String, offset, "I"); | |
3213 CHECK_OFFSET("java/lang/String", java_lang_String, count, "I"); | |
3214 } | |
3215 if (java_lang_String::has_hash_field()) { | |
3216 CHECK_OFFSET("java/lang/String", java_lang_String, hash, "I"); | |
3217 } | |
0 | 3218 |
3219 // java.lang.Class | |
3220 | |
3221 // Fake fields | |
3222 // CHECK_OFFSET("java/lang/Class", java_lang_Class, klass); // %%% this needs to be checked | |
3223 // CHECK_OFFSET("java/lang/Class", java_lang_Class, array_klass); // %%% this needs to be checked | |
3224 // CHECK_OFFSET("java/lang/Class", java_lang_Class, resolved_constructor); // %%% this needs to be checked | |
3225 | |
3226 // java.lang.Throwable | |
3227 | |
3228 CHECK_OFFSET("java/lang/Throwable", java_lang_Throwable, backtrace, "Ljava/lang/Object;"); | |
3229 CHECK_OFFSET("java/lang/Throwable", java_lang_Throwable, detailMessage, "Ljava/lang/String;"); | |
3230 CHECK_OFFSET("java/lang/Throwable", java_lang_Throwable, cause, "Ljava/lang/Throwable;"); | |
3231 CHECK_OFFSET("java/lang/Throwable", java_lang_Throwable, stackTrace, "[Ljava/lang/StackTraceElement;"); | |
3232 | |
3233 // Boxed primitive objects (java_lang_boxing_object) | |
3234 | |
3235 CHECK_OFFSET("java/lang/Boolean", java_lang_boxing_object, value, "Z"); | |
3236 CHECK_OFFSET("java/lang/Character", java_lang_boxing_object, value, "C"); | |
3237 CHECK_OFFSET("java/lang/Float", java_lang_boxing_object, value, "F"); | |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3238 CHECK_LONG_OFFSET("java/lang/Double", java_lang_boxing_object, value, "D"); |
0 | 3239 CHECK_OFFSET("java/lang/Byte", java_lang_boxing_object, value, "B"); |
3240 CHECK_OFFSET("java/lang/Short", java_lang_boxing_object, value, "S"); | |
3241 CHECK_OFFSET("java/lang/Integer", java_lang_boxing_object, value, "I"); | |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3242 CHECK_LONG_OFFSET("java/lang/Long", java_lang_boxing_object, value, "J"); |
0 | 3243 |
3244 // java.lang.ClassLoader | |
3245 | |
3246 CHECK_OFFSET("java/lang/ClassLoader", java_lang_ClassLoader, parent, "Ljava/lang/ClassLoader;"); | |
3247 | |
3248 // java.lang.System | |
3249 | |
3250 CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, in, "Ljava/io/InputStream;"); | |
3251 CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, out, "Ljava/io/PrintStream;"); | |
3252 CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, err, "Ljava/io/PrintStream;"); | |
3253 | |
3254 // java.lang.StackTraceElement | |
3255 | |
3256 CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, declaringClass, "Ljava/lang/String;"); | |
3257 CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, methodName, "Ljava/lang/String;"); | |
3258 CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, fileName, "Ljava/lang/String;"); | |
3259 CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, lineNumber, "I"); | |
3260 | |
3261 // java.lang.ref.Reference | |
3262 | |
3263 CHECK_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, referent, "Ljava/lang/Object;"); | |
3264 CHECK_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, queue, "Ljava/lang/ref/ReferenceQueue;"); | |
3265 CHECK_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, next, "Ljava/lang/ref/Reference;"); | |
3266 // Fake field | |
3267 //CHECK_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, discovered, "Ljava/lang/ref/Reference;"); | |
3268 CHECK_STATIC_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, lock, "Ljava/lang/ref/Reference$Lock;"); | |
3269 CHECK_STATIC_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, pending, "Ljava/lang/ref/Reference;"); | |
3270 | |
3271 // java.lang.ref.SoftReference | |
3272 | |
3273 CHECK_OFFSET("java/lang/ref/SoftReference", java_lang_ref_SoftReference, timestamp, "J"); | |
3274 CHECK_STATIC_OFFSET("java/lang/ref/SoftReference", java_lang_ref_SoftReference, clock, "J"); | |
3275 | |
3276 // java.lang.AssertionStatusDirectives | |
3277 // | |
3278 // The CheckAssertionStatusDirectives boolean can be removed from here and | |
3279 // globals.hpp after the AssertionStatusDirectives class has been integrated | |
3280 // into merlin "for some time." Without it, the vm will fail with early | |
3281 // merlin builds. | |
3282 | |
3283 if (CheckAssertionStatusDirectives && JDK_Version::is_gte_jdk14x_version()) { | |
3284 const char* nm = "java/lang/AssertionStatusDirectives"; | |
3285 const char* sig = "[Ljava/lang/String;"; | |
3286 CHECK_OFFSET(nm, java_lang_AssertionStatusDirectives, classes, sig); | |
3287 CHECK_OFFSET(nm, java_lang_AssertionStatusDirectives, classEnabled, "[Z"); | |
3288 CHECK_OFFSET(nm, java_lang_AssertionStatusDirectives, packages, sig); | |
3289 CHECK_OFFSET(nm, java_lang_AssertionStatusDirectives, packageEnabled, "[Z"); | |
3290 CHECK_OFFSET(nm, java_lang_AssertionStatusDirectives, deflt, "Z"); | |
3291 } | |
3292 | |
3293 if (!valid) vm_exit_during_initialization("Hard-coded field offset verification failed"); | |
3294 } | |
3295 | |
3296 #endif // PRODUCT | |
3297 | |
3938 | 3298 int InjectedField::compute_offset() { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3299 Klass* klass_oop = klass(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3300 for (AllFieldStream fs(InstanceKlass::cast(klass_oop)); !fs.done(); fs.next()) { |
3938 | 3301 if (!may_be_java && !fs.access_flags().is_internal()) { |
3302 // Only look at injected fields | |
3303 continue; | |
3304 } | |
3305 if (fs.name() == name() && fs.signature() == signature()) { | |
3306 return fs.offset(); | |
3307 } | |
3308 } | |
3309 ResourceMark rm; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3310 tty->print_cr("Invalid layout of %s at %s/%s%s", InstanceKlass::cast(klass_oop)->external_name(), name()->as_C_string(), signature()->as_C_string(), may_be_java ? " (may_be_java)" : ""); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
3311 #ifndef PRODUCT |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
3312 klass_oop->print(); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
3313 tty->print_cr("all fields:"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3314 for (AllFieldStream fs(InstanceKlass::cast(klass_oop)); !fs.done(); fs.next()) { |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
3315 tty->print_cr(" name: %s, sig: %s, flags: %08x", fs.name()->as_C_string(), fs.signature()->as_C_string(), fs.access_flags().as_int()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
3316 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
3317 #endif //PRODUCT |
3938 | 3318 fatal("Invalid layout of preloaded class"); |
3319 return -1; | |
3320 } | |
3321 | |
0 | 3322 void javaClasses_init() { |
3323 JavaClasses::compute_offsets(); | |
3324 JavaClasses::check_offsets(); | |
3325 FilteredFieldsMap::initialize(); // must be done after computing offsets. | |
3326 } |