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