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