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