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