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