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