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