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