Mercurial > hg > truffle
annotate src/share/vm/classfile/javaClasses.cpp @ 12039:3cce976666d9
Merge hs25-b46
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Thu, 10 Oct 2013 14:20:04 +0200 |
| parents | 6b0fd0964b87 ca0165daa6ec |
| children | cefad50507d8 |
| 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 | |
|
6948
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
654 #ifdef GRAAL |
|
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
655 oop java_lang_Class::graal_mirror(oop java_class) { |
|
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
656 assert(_graal_mirror_offset != 0, "must be set"); |
|
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
657 return java_class->obj_field(_graal_mirror_offset); |
|
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
658 } |
|
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
659 #endif |
| 0 | 660 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
661 Klass* java_lang_Class::as_Klass(oop java_class) { |
| 0 | 662 //%note memory_2 |
|
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
663 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
|
664 Klass* k = ((Klass*)java_class->metadata_field(_klass_offset)); |
| 0 | 665 assert(k == NULL || k->is_klass(), "type check"); |
| 666 return k; | |
| 667 } | |
| 668 | |
| 669 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
670 void java_lang_Class::set_klass(oop java_class, Klass* klass) { |
| 4009 | 671 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
|
672 java_class->metadata_field_put(_klass_offset, klass); |
| 4009 | 673 } |
| 674 | |
| 675 | |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
676 void java_lang_Class::print_signature(oop java_class, outputStream* st) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
677 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
|
678 Symbol* name = NULL; |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
679 bool is_instance = false; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
680 if (is_primitive(java_class)) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
681 name = vmSymbols::type_signature(primitive_type(java_class)); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
682 } else { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
683 Klass* k = as_Klass(java_class); |
| 6983 | 684 is_instance = k->oop_is_instance(); |
| 685 name = k->name(); | |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
686 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
687 if (name == NULL) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
688 st->print("<null>"); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
689 return; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
690 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
691 if (is_instance) st->print("L"); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
692 st->write((char*) name->base(), (int) name->utf8_length()); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
693 if (is_instance) st->print(";"); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
694 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
695 |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
696 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
|
697 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
|
698 Symbol* name; |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
699 if (is_primitive(java_class)) { |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
700 name = vmSymbols::type_signature(primitive_type(java_class)); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
701 // 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
|
702 // 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
|
703 // 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
|
704 name->increment_refcount(); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
705 } else { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
706 Klass* k = as_Klass(java_class); |
| 6983 | 707 if (!k->oop_is_instance()) { |
| 708 name = k->name(); | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
709 name->increment_refcount(); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
710 } else { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
711 ResourceMark rm; |
| 6983 | 712 const char* sigstr = k->signature_name(); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
713 int siglen = (int) strlen(sigstr); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
714 if (!intern_if_not_found) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
715 name = SymbolTable::probe(sigstr, siglen); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
716 } else { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
717 name = SymbolTable::new_symbol(sigstr, siglen, THREAD); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
718 } |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
719 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
720 } |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
721 return name; |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
722 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
723 |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
724 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
725 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
|
726 Klass* k = ((Klass*)java_class->metadata_field(_array_klass_offset)); |
| 6983 | 727 assert(k == NULL || k->is_klass() && k->oop_is_array(), "should be array klass"); |
| 0 | 728 return k; |
| 729 } | |
| 730 | |
| 731 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
732 void java_lang_Class::set_array_klass(oop java_class, Klass* klass) { |
| 6983 | 733 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
|
734 java_class->metadata_field_put(_array_klass_offset, klass); |
| 0 | 735 } |
| 736 | |
| 737 | |
| 738 bool java_lang_Class::is_primitive(oop java_class) { | |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
739 // should assert: |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
740 //assert(java_lang_Class::is_instance(java_class), "must be a Class object"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
741 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
|
742 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
743 #ifdef ASSERT |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
744 if (is_primitive) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
745 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
|
746 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
|
747 "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
|
748 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
749 #endif |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
750 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
751 return is_primitive; |
| 0 | 752 } |
| 753 | |
| 754 | |
| 755 BasicType java_lang_Class::primitive_type(oop java_class) { | |
| 756 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
|
757 Klass* ak = ((Klass*)java_class->metadata_field(_array_klass_offset)); |
| 0 | 758 BasicType type = T_VOID; |
| 759 if (ak != NULL) { | |
| 760 // 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
|
761 type = ArrayKlass::cast(ak)->element_type(); |
| 0 | 762 } else { |
| 763 assert(java_class == Universe::void_mirror(), "only valid non-array primitive"); | |
| 764 } | |
| 765 assert(Universe::java_mirror(type) == java_class, "must be consistent"); | |
| 766 return type; | |
| 767 } | |
| 768 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
769 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
|
770 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
|
771 if (is_primitive(java_class)) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
772 if (reference_klass != NULL) |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
773 (*reference_klass) = NULL; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
774 return primitive_type(java_class); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
775 } else { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
776 if (reference_klass != NULL) |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
777 (*reference_klass) = as_Klass(java_class); |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
778 return T_OBJECT; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
779 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
780 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
781 |
| 0 | 782 |
| 783 oop java_lang_Class::primitive_mirror(BasicType t) { | |
| 784 oop mirror = Universe::java_mirror(t); | |
| 1142 | 785 assert(mirror != NULL && mirror->is_a(SystemDictionary::Class_klass()), "must be a Class"); |
| 0 | 786 assert(java_lang_Class::is_primitive(mirror), "must be primitive"); |
| 787 return mirror; | |
| 788 } | |
| 789 | |
| 790 bool java_lang_Class::offsets_computed = false; | |
| 791 int java_lang_Class::classRedefinedCount_offset = -1; | |
| 792 | |
| 793 void java_lang_Class::compute_offsets() { | |
| 794 assert(!offsets_computed, "offsets should be initialized only once"); | |
| 795 offsets_computed = true; | |
| 796 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
797 Klass* klass_oop = SystemDictionary::Class_klass(); |
| 0 | 798 // The classRedefinedCount field is only present starting in 1.5, |
| 799 // so don't go fatal. | |
|
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
800 compute_optional_offset(classRedefinedCount_offset, |
| 3938 | 801 klass_oop, vmSymbols::classRedefinedCount_name(), vmSymbols::int_signature()); |
| 802 | |
| 803 CLASS_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET); | |
| 0 | 804 } |
| 805 | |
| 806 int java_lang_Class::classRedefinedCount(oop the_class_mirror) { | |
| 807 if (!JDK_Version::is_gte_jdk15x_version() | |
| 808 || classRedefinedCount_offset == -1) { | |
| 809 // The classRedefinedCount field is only present starting in 1.5. | |
| 810 // If we don't have an offset for it then just return -1 as a marker. | |
| 811 return -1; | |
| 812 } | |
| 813 | |
| 814 return the_class_mirror->int_field(classRedefinedCount_offset); | |
| 815 } | |
| 816 | |
| 817 void java_lang_Class::set_classRedefinedCount(oop the_class_mirror, int value) { | |
| 818 if (!JDK_Version::is_gte_jdk15x_version() | |
| 819 || classRedefinedCount_offset == -1) { | |
| 820 // The classRedefinedCount field is only present starting in 1.5. | |
| 821 // If we don't have an offset for it then nothing to set. | |
| 822 return; | |
| 823 } | |
| 824 | |
| 825 the_class_mirror->int_field_put(classRedefinedCount_offset, value); | |
| 826 } | |
| 827 | |
| 828 | |
| 829 // Note: JDK1.1 and before had a privateInfo_offset field which was used for the | |
| 830 // platform thread structure, and a eetop offset which was used for thread | |
| 831 // local storage (and unused by the HotSpot VM). In JDK1.2 the two structures | |
| 832 // merged, so in the HotSpot VM we just use the eetop field for the thread | |
| 833 // instead of the privateInfo_offset. | |
| 834 // | |
| 835 // Note: The stackSize field is only present starting in 1.4. | |
| 836 | |
| 837 int java_lang_Thread::_name_offset = 0; | |
| 838 int java_lang_Thread::_group_offset = 0; | |
| 839 int java_lang_Thread::_contextClassLoader_offset = 0; | |
| 840 int java_lang_Thread::_inheritedAccessControlContext_offset = 0; | |
| 841 int java_lang_Thread::_priority_offset = 0; | |
| 842 int java_lang_Thread::_eetop_offset = 0; | |
| 843 int java_lang_Thread::_daemon_offset = 0; | |
| 844 int java_lang_Thread::_stillborn_offset = 0; | |
| 845 int java_lang_Thread::_stackSize_offset = 0; | |
| 846 int java_lang_Thread::_tid_offset = 0; | |
| 847 int java_lang_Thread::_thread_status_offset = 0; | |
| 848 int java_lang_Thread::_park_blocker_offset = 0; | |
| 849 int java_lang_Thread::_park_event_offset = 0 ; | |
| 850 | |
| 851 | |
| 852 void java_lang_Thread::compute_offsets() { | |
| 853 assert(_group_offset == 0, "offsets should be initialized only once"); | |
| 854 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
855 Klass* k = SystemDictionary::Thread_klass(); |
|
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
856 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
|
857 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
|
858 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
|
859 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
|
860 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
|
861 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
|
862 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
|
863 compute_offset(_stillborn_offset, k, vmSymbols::stillborn_name(), vmSymbols::bool_signature()); |
| 0 | 864 // 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
|
865 compute_optional_offset(_stackSize_offset, k, vmSymbols::stackSize_name(), vmSymbols::long_signature()); |
| 0 | 866 // 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
|
867 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
|
868 compute_optional_offset(_thread_status_offset, k, vmSymbols::thread_status_name(), vmSymbols::int_signature()); |
| 0 | 869 // 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
|
870 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
|
871 compute_optional_offset(_park_event_offset, k, vmSymbols::park_event_name(), |
| 0 | 872 vmSymbols::long_signature()); |
| 873 } | |
| 874 | |
| 875 | |
| 876 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
|
877 return (JavaThread*)java_thread->address_field(_eetop_offset); |
| 0 | 878 } |
| 879 | |
| 880 | |
| 881 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
|
882 java_thread->address_field_put(_eetop_offset, (address)thread); |
| 0 | 883 } |
| 884 | |
| 885 | |
| 886 typeArrayOop java_lang_Thread::name(oop java_thread) { | |
| 887 oop name = java_thread->obj_field(_name_offset); | |
|
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
888 assert(name == NULL || (name->is_typeArray() && TypeArrayKlass::cast(name->klass())->element_type() == T_CHAR), "just checking"); |
| 0 | 889 return typeArrayOop(name); |
| 890 } | |
| 891 | |
| 892 | |
| 893 void java_lang_Thread::set_name(oop java_thread, typeArrayOop name) { | |
| 894 assert(java_thread->obj_field(_name_offset) == NULL, "name should be NULL"); | |
| 895 java_thread->obj_field_put(_name_offset, name); | |
| 896 } | |
| 897 | |
| 898 | |
| 899 ThreadPriority java_lang_Thread::priority(oop java_thread) { | |
| 900 return (ThreadPriority)java_thread->int_field(_priority_offset); | |
| 901 } | |
| 902 | |
| 903 | |
| 904 void java_lang_Thread::set_priority(oop java_thread, ThreadPriority priority) { | |
| 905 java_thread->int_field_put(_priority_offset, priority); | |
| 906 } | |
| 907 | |
| 908 | |
| 909 oop java_lang_Thread::threadGroup(oop java_thread) { | |
| 910 return java_thread->obj_field(_group_offset); | |
| 911 } | |
| 912 | |
| 913 | |
| 914 bool java_lang_Thread::is_stillborn(oop java_thread) { | |
| 915 return java_thread->bool_field(_stillborn_offset) != 0; | |
| 916 } | |
| 917 | |
| 918 | |
| 919 // We never have reason to turn the stillborn bit off | |
| 920 void java_lang_Thread::set_stillborn(oop java_thread) { | |
| 921 java_thread->bool_field_put(_stillborn_offset, true); | |
| 922 } | |
| 923 | |
| 924 | |
| 925 bool java_lang_Thread::is_alive(oop java_thread) { | |
| 926 JavaThread* thr = java_lang_Thread::thread(java_thread); | |
| 927 return (thr != NULL); | |
| 928 } | |
| 929 | |
| 930 | |
| 931 bool java_lang_Thread::is_daemon(oop java_thread) { | |
| 932 return java_thread->bool_field(_daemon_offset) != 0; | |
| 933 } | |
| 934 | |
| 935 | |
| 936 void java_lang_Thread::set_daemon(oop java_thread) { | |
| 937 java_thread->bool_field_put(_daemon_offset, true); | |
| 938 } | |
| 939 | |
| 940 oop java_lang_Thread::context_class_loader(oop java_thread) { | |
| 941 return java_thread->obj_field(_contextClassLoader_offset); | |
| 942 } | |
| 943 | |
| 944 oop java_lang_Thread::inherited_access_control_context(oop java_thread) { | |
| 945 return java_thread->obj_field(_inheritedAccessControlContext_offset); | |
| 946 } | |
| 947 | |
| 948 | |
| 949 jlong java_lang_Thread::stackSize(oop java_thread) { | |
| 950 // The stackSize field is only present starting in 1.4 | |
| 951 if (_stackSize_offset > 0) { | |
| 952 assert(JDK_Version::is_gte_jdk14x_version(), "sanity check"); | |
| 953 return java_thread->long_field(_stackSize_offset); | |
| 954 } else { | |
| 955 return 0; | |
| 956 } | |
| 957 } | |
| 958 | |
| 959 // Write the thread status value to threadStatus field in java.lang.Thread java class. | |
| 960 void java_lang_Thread::set_thread_status(oop java_thread, | |
| 961 java_lang_Thread::ThreadStatus status) { | |
| 962 // The threadStatus is only present starting in 1.5 | |
| 963 if (_thread_status_offset > 0) { | |
| 964 java_thread->int_field_put(_thread_status_offset, status); | |
| 965 } | |
| 966 } | |
| 967 | |
| 968 // Read thread status value from threadStatus field in java.lang.Thread java class. | |
| 969 java_lang_Thread::ThreadStatus java_lang_Thread::get_thread_status(oop java_thread) { | |
| 10405 | 970 assert(Thread::current()->is_Watcher_thread() || Thread::current()->is_VM_thread() || |
| 0 | 971 JavaThread::current()->thread_state() == _thread_in_vm, |
| 972 "Java Thread is not running in vm"); | |
| 973 // The threadStatus is only present starting in 1.5 | |
| 974 if (_thread_status_offset > 0) { | |
| 975 return (java_lang_Thread::ThreadStatus)java_thread->int_field(_thread_status_offset); | |
| 976 } else { | |
| 977 // All we can easily figure out is if it is alive, but that is | |
| 978 // enough info for a valid unknown status. | |
| 979 // These aren't restricted to valid set ThreadStatus values, so | |
| 980 // use JVMTI values and cast. | |
| 981 JavaThread* thr = java_lang_Thread::thread(java_thread); | |
| 982 if (thr == NULL) { | |
| 983 // the thread hasn't run yet or is in the process of exiting | |
| 984 return NEW; | |
| 985 } | |
| 986 return (java_lang_Thread::ThreadStatus)JVMTI_THREAD_STATE_ALIVE; | |
| 987 } | |
| 988 } | |
| 989 | |
| 990 | |
| 991 jlong java_lang_Thread::thread_id(oop java_thread) { | |
| 992 // The thread ID field is only present starting in 1.5 | |
| 993 if (_tid_offset > 0) { | |
| 994 return java_thread->long_field(_tid_offset); | |
| 995 } else { | |
| 996 return 0; | |
| 997 } | |
| 998 } | |
| 999 | |
| 1000 oop java_lang_Thread::park_blocker(oop java_thread) { | |
| 242 | 1001 assert(JDK_Version::current().supports_thread_park_blocker() && |
| 1002 _park_blocker_offset != 0, "Must support parkBlocker field"); | |
| 0 | 1003 |
| 1004 if (_park_blocker_offset > 0) { | |
| 1005 return java_thread->obj_field(_park_blocker_offset); | |
| 1006 } | |
| 1007 | |
| 1008 return NULL; | |
| 1009 } | |
| 1010 | |
| 1011 jlong java_lang_Thread::park_event(oop java_thread) { | |
| 1012 if (_park_event_offset > 0) { | |
| 1013 return java_thread->long_field(_park_event_offset); | |
| 1014 } | |
| 1015 return 0; | |
| 1016 } | |
| 1017 | |
| 1018 bool java_lang_Thread::set_park_event(oop java_thread, jlong ptr) { | |
| 1019 if (_park_event_offset > 0) { | |
| 1020 java_thread->long_field_put(_park_event_offset, ptr); | |
| 1021 return true; | |
| 1022 } | |
| 1023 return false; | |
| 1024 } | |
| 1025 | |
| 1026 | |
| 1027 const char* java_lang_Thread::thread_status_name(oop java_thread) { | |
| 1028 assert(JDK_Version::is_gte_jdk15x_version() && _thread_status_offset != 0, "Must have thread status"); | |
| 1029 ThreadStatus status = (java_lang_Thread::ThreadStatus)java_thread->int_field(_thread_status_offset); | |
| 1030 switch (status) { | |
| 1031 case NEW : return "NEW"; | |
| 1032 case RUNNABLE : return "RUNNABLE"; | |
| 1033 case SLEEPING : return "TIMED_WAITING (sleeping)"; | |
| 1034 case IN_OBJECT_WAIT : return "WAITING (on object monitor)"; | |
| 1035 case IN_OBJECT_WAIT_TIMED : return "TIMED_WAITING (on object monitor)"; | |
| 1036 case PARKED : return "WAITING (parking)"; | |
| 1037 case PARKED_TIMED : return "TIMED_WAITING (parking)"; | |
| 1038 case BLOCKED_ON_MONITOR_ENTER : return "BLOCKED (on object monitor)"; | |
| 1039 case TERMINATED : return "TERMINATED"; | |
| 1040 default : return "UNKNOWN"; | |
| 1041 }; | |
| 1042 } | |
| 1043 int java_lang_ThreadGroup::_parent_offset = 0; | |
| 1044 int java_lang_ThreadGroup::_name_offset = 0; | |
| 1045 int java_lang_ThreadGroup::_threads_offset = 0; | |
| 1046 int java_lang_ThreadGroup::_groups_offset = 0; | |
| 1047 int java_lang_ThreadGroup::_maxPriority_offset = 0; | |
| 1048 int java_lang_ThreadGroup::_destroyed_offset = 0; | |
| 1049 int java_lang_ThreadGroup::_daemon_offset = 0; | |
| 1050 int java_lang_ThreadGroup::_vmAllowSuspension_offset = 0; | |
| 1051 int java_lang_ThreadGroup::_nthreads_offset = 0; | |
| 1052 int java_lang_ThreadGroup::_ngroups_offset = 0; | |
| 1053 | |
| 1054 oop java_lang_ThreadGroup::parent(oop java_thread_group) { | |
| 1055 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
| 1056 return java_thread_group->obj_field(_parent_offset); | |
| 1057 } | |
| 1058 | |
| 1059 // ("name as oop" accessor is not necessary) | |
| 1060 | |
| 1061 typeArrayOop java_lang_ThreadGroup::name(oop java_thread_group) { | |
| 1062 oop name = java_thread_group->obj_field(_name_offset); | |
| 1063 // ThreadGroup.name can be null | |
| 1064 return name == NULL ? (typeArrayOop)NULL : java_lang_String::value(name); | |
| 1065 } | |
| 1066 | |
| 1067 int java_lang_ThreadGroup::nthreads(oop java_thread_group) { | |
| 1068 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
| 1069 return java_thread_group->int_field(_nthreads_offset); | |
| 1070 } | |
| 1071 | |
| 1072 objArrayOop java_lang_ThreadGroup::threads(oop java_thread_group) { | |
| 1073 oop threads = java_thread_group->obj_field(_threads_offset); | |
| 1074 assert(threads != NULL, "threadgroups should have threads"); | |
| 1075 assert(threads->is_objArray(), "just checking"); // Todo: Add better type checking code | |
| 1076 return objArrayOop(threads); | |
| 1077 } | |
| 1078 | |
| 1079 int java_lang_ThreadGroup::ngroups(oop java_thread_group) { | |
| 1080 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
| 1081 return java_thread_group->int_field(_ngroups_offset); | |
| 1082 } | |
| 1083 | |
| 1084 objArrayOop java_lang_ThreadGroup::groups(oop java_thread_group) { | |
| 1085 oop groups = java_thread_group->obj_field(_groups_offset); | |
| 1086 assert(groups == NULL || groups->is_objArray(), "just checking"); // Todo: Add better type checking code | |
| 1087 return objArrayOop(groups); | |
| 1088 } | |
| 1089 | |
| 1090 ThreadPriority java_lang_ThreadGroup::maxPriority(oop java_thread_group) { | |
| 1091 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
| 1092 return (ThreadPriority) java_thread_group->int_field(_maxPriority_offset); | |
| 1093 } | |
| 1094 | |
| 1095 bool java_lang_ThreadGroup::is_destroyed(oop java_thread_group) { | |
| 1096 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
| 1097 return java_thread_group->bool_field(_destroyed_offset) != 0; | |
| 1098 } | |
| 1099 | |
| 1100 bool java_lang_ThreadGroup::is_daemon(oop java_thread_group) { | |
| 1101 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
| 1102 return java_thread_group->bool_field(_daemon_offset) != 0; | |
| 1103 } | |
| 1104 | |
| 1105 bool java_lang_ThreadGroup::is_vmAllowSuspension(oop java_thread_group) { | |
| 1106 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
| 1107 return java_thread_group->bool_field(_vmAllowSuspension_offset) != 0; | |
| 1108 } | |
| 1109 | |
| 1110 void java_lang_ThreadGroup::compute_offsets() { | |
| 1111 assert(_parent_offset == 0, "offsets should be initialized only once"); | |
| 1112 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1113 Klass* k = SystemDictionary::ThreadGroup_klass(); |
| 0 | 1114 |
|
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1115 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
|
1116 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
|
1117 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
|
1118 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
|
1119 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
|
1120 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
|
1121 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
|
1122 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
|
1123 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
|
1124 compute_offset(_ngroups_offset, k, vmSymbols::ngroups_name(), vmSymbols::int_signature()); |
| 0 | 1125 } |
| 1126 | |
|
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1127 oop java_lang_Throwable::unassigned_stacktrace() { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1128 InstanceKlass* ik = InstanceKlass::cast(SystemDictionary::Throwable_klass()); |
|
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1129 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
|
1130 if (UseCompressedOops) { |
|
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1131 return oopDesc::load_decode_heap_oop((narrowOop *)addr); |
|
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1132 } else { |
|
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1133 return oopDesc::load_decode_heap_oop((oop*)addr); |
|
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1134 } |
|
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1135 } |
|
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1136 |
| 0 | 1137 oop java_lang_Throwable::backtrace(oop throwable) { |
| 1138 return throwable->obj_field_acquire(backtrace_offset); | |
| 1139 } | |
| 1140 | |
| 1141 | |
| 1142 void java_lang_Throwable::set_backtrace(oop throwable, oop value) { | |
| 1143 throwable->release_obj_field_put(backtrace_offset, value); | |
| 1144 } | |
| 1145 | |
| 1146 | |
| 1147 oop java_lang_Throwable::message(oop throwable) { | |
| 1148 return throwable->obj_field(detailMessage_offset); | |
| 1149 } | |
| 1150 | |
| 1151 | |
| 1152 oop java_lang_Throwable::message(Handle throwable) { | |
| 1153 return throwable->obj_field(detailMessage_offset); | |
| 1154 } | |
| 1155 | |
| 1156 | |
| 1157 void java_lang_Throwable::set_message(oop throwable, oop value) { | |
| 1158 throwable->obj_field_put(detailMessage_offset, value); | |
| 1159 } | |
| 1160 | |
| 1161 | |
|
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1162 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
|
1163 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
|
1164 } |
|
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1165 |
| 0 | 1166 void java_lang_Throwable::clear_stacktrace(oop throwable) { |
| 1167 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
|
1168 set_stacktrace(throwable, NULL); |
| 0 | 1169 } |
| 1170 | |
| 1171 | |
| 1172 void java_lang_Throwable::print(oop throwable, outputStream* st) { | |
| 1173 ResourceMark rm; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1174 Klass* k = throwable->klass(); |
| 0 | 1175 assert(k != NULL, "just checking"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1176 st->print("%s", InstanceKlass::cast(k)->external_name()); |
| 0 | 1177 oop msg = message(throwable); |
| 1178 if (msg != NULL) { | |
| 1179 st->print(": %s", java_lang_String::as_utf8_string(msg)); | |
| 1180 } | |
| 1181 } | |
| 1182 | |
| 1183 | |
| 1184 void java_lang_Throwable::print(Handle throwable, outputStream* st) { | |
| 1185 ResourceMark rm; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1186 Klass* k = throwable->klass(); |
| 0 | 1187 assert(k != NULL, "just checking"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1188 st->print("%s", InstanceKlass::cast(k)->external_name()); |
| 0 | 1189 oop msg = message(throwable); |
| 1190 if (msg != NULL) { | |
| 1191 st->print(": %s", java_lang_String::as_utf8_string(msg)); | |
| 1192 } | |
| 1193 } | |
| 1194 | |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1195 // After this many redefines, the stack trace is unreliable. |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1196 const int MAX_VERSION = USHRT_MAX; |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1197 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1198 // Helper backtrace functions to store bci|version together. |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1199 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
|
1200 // only store u2 for version, checking for overflow. |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1201 if (version > USHRT_MAX || version < 0) version = MAX_VERSION; |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1202 assert((jushort)bci == bci, "bci should be short"); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1203 return build_int_from_shorts(version, bci); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1204 } |
|
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 static inline int bci_at(unsigned int merged) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1207 return extract_high_short_from_int(merged); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1208 } |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1209 static inline int version_at(unsigned int merged) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1210 return extract_low_short_from_int(merged); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1211 } |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1212 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1213 static inline bool version_matches(Method* method, int version) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1214 return (method->constants()->version() == version && version < MAX_VERSION); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1215 } |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1216 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1217 static inline int get_line_number(Method* method, int bci) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1218 int line_number = 0; |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1219 if (method->is_native()) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1220 // Negative value different from -1 below, enabling Java code in |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1221 // class java.lang.StackTraceElement to distinguish "native" from |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1222 // "no LineNumberTable". JDK tests for -2. |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1223 line_number = -2; |
| 0 | 1224 } else { |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1225 // Returns -1 if no LineNumberTable, and otherwise actual line number |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1226 line_number = method->line_number_from_bci(bci); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1227 if (line_number == -1 && ShowHiddenFrames) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1228 line_number = bci + 1000000; |
| 0 | 1229 } |
| 1230 } | |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1231 return line_number; |
| 0 | 1232 } |
| 1233 | |
| 1234 // This class provides a simple wrapper over the internal structure of | |
| 1235 // exception backtrace to insulate users of the backtrace from needing | |
| 1236 // to know what it looks like. | |
| 1237 class BacktraceBuilder: public StackObj { | |
| 1238 private: | |
| 1239 Handle _backtrace; | |
| 1240 objArrayOop _head; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1241 typeArrayOop _methods; |
| 0 | 1242 typeArrayOop _bcis; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1243 objArrayOop _mirrors; |
| 0 | 1244 int _index; |
| 1245 No_Safepoint_Verifier _nsv; | |
| 1246 | |
| 1247 public: | |
| 1248 | |
| 1249 enum { | |
| 1250 trace_methods_offset = java_lang_Throwable::trace_methods_offset, | |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1251 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
|
1252 trace_mirrors_offset = java_lang_Throwable::trace_mirrors_offset, |
| 0 | 1253 trace_next_offset = java_lang_Throwable::trace_next_offset, |
| 1254 trace_size = java_lang_Throwable::trace_size, | |
| 1255 trace_chunk_size = java_lang_Throwable::trace_chunk_size | |
| 1256 }; | |
| 1257 | |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1258 // get info out of chunks |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1259 static typeArrayOop get_methods(objArrayHandle chunk) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1260 typeArrayOop methods = typeArrayOop(chunk->obj_at(trace_methods_offset)); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1261 assert(methods != NULL, "method array should be initialized in backtrace"); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1262 return methods; |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1263 } |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1264 static typeArrayOop get_bcis(objArrayHandle chunk) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1265 typeArrayOop bcis = typeArrayOop(chunk->obj_at(trace_bcis_offset)); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1266 assert(bcis != NULL, "bci array should be initialized in backtrace"); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1267 return bcis; |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1268 } |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1269 static objArrayOop get_mirrors(objArrayHandle chunk) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1270 objArrayOop mirrors = objArrayOop(chunk->obj_at(trace_mirrors_offset)); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1271 assert(mirrors != NULL, "mirror array should be initialized in backtrace"); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1272 return mirrors; |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1273 } |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1274 |
| 0 | 1275 // constructor for new backtrace |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1276 BacktraceBuilder(TRAPS): _methods(NULL), _bcis(NULL), _head(NULL), _mirrors(NULL) { |
| 0 | 1277 expand(CHECK); |
| 1278 _backtrace = _head; | |
| 1279 _index = 0; | |
| 1280 } | |
| 1281 | |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1282 BacktraceBuilder(objArrayHandle backtrace) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1283 _methods = get_methods(backtrace); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1284 _bcis = get_bcis(backtrace); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1285 _mirrors = get_mirrors(backtrace); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1286 assert(_methods->length() == _bcis->length() && |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1287 _methods->length() == _mirrors->length(), |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1288 "method and source information arrays should match"); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1289 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1290 // head is the preallocated backtrace |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1291 _backtrace = _head = backtrace(); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1292 _index = 0; |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1293 } |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1294 |
| 0 | 1295 void expand(TRAPS) { |
| 1296 objArrayHandle old_head(THREAD, _head); | |
| 1297 Pause_No_Safepoint_Verifier pnsv(&_nsv); | |
| 1298 | |
| 1299 objArrayOop head = oopFactory::new_objectArray(trace_size, CHECK); | |
| 1300 objArrayHandle new_head(THREAD, head); | |
| 1301 | |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1302 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
|
1303 typeArrayHandle new_methods(THREAD, methods); |
| 0 | 1304 |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1305 typeArrayOop bcis = oopFactory::new_intArray(trace_chunk_size, CHECK); |
| 0 | 1306 typeArrayHandle new_bcis(THREAD, bcis); |
| 1307 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1308 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
|
1309 objArrayHandle new_mirrors(THREAD, mirrors); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1310 |
| 0 | 1311 if (!old_head.is_null()) { |
| 1312 old_head->obj_at_put(trace_next_offset, new_head()); | |
| 1313 } | |
| 1314 new_head->obj_at_put(trace_methods_offset, new_methods()); | |
| 1315 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
|
1316 new_head->obj_at_put(trace_mirrors_offset, new_mirrors()); |
| 0 | 1317 |
| 1318 _head = new_head(); | |
| 1319 _methods = new_methods(); | |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1320 _bcis = new_bcis(); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1321 _mirrors = new_mirrors(); |
| 0 | 1322 _index = 0; |
| 1323 } | |
| 1324 | |
| 1325 oop backtrace() { | |
| 1326 return _backtrace(); | |
| 1327 } | |
| 1328 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1329 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
|
1330 // 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
|
1331 // 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
|
1332 // 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
|
1333 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
|
1334 |
| 0 | 1335 if (_index >= trace_chunk_size) { |
| 1336 methodHandle mhandle(THREAD, method); | |
| 1337 expand(CHECK); | |
| 1338 method = mhandle(); | |
| 1339 } | |
| 1340 | |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1341 _methods->short_at_put(_index, method->method_idnum()); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1342 _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
|
1343 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1344 // 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
|
1345 // from being unloaded while we still have this stack trace. |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1346 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
|
1347 _mirrors->obj_at_put(_index, method->method_holder()->java_mirror()); |
| 0 | 1348 _index++; |
| 1349 } | |
| 1350 | |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1351 }; |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1352 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1353 // Print stack trace element to resource allocated buffer |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1354 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
|
1355 int method_id, int version, int bci) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1356 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1357 // Get strings and string lengths |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1358 InstanceKlass* holder = InstanceKlass::cast(java_lang_Class::as_Klass(mirror())); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1359 const char* klass_name = holder->external_name(); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1360 int buf_len = (int)strlen(klass_name); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1361 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1362 // pushing to the stack trace added one. |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1363 Method* method = holder->method_with_idnum(method_id); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1364 char* method_name = method->name()->as_C_string(); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1365 buf_len += (int)strlen(method_name); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1366 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1367 char* source_file_name = NULL; |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1368 if (version_matches(method, version)) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1369 Symbol* source = holder->source_file_name(); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1370 if (source != NULL) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1371 source_file_name = source->as_C_string(); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1372 buf_len += (int)strlen(source_file_name); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1373 } |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1374 } |
|
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 // 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
|
1377 char* buf = NEW_RESOURCE_ARRAY(char, buf_len + 64); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1378 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1379 // Print stack trace line in buffer |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1380 sprintf(buf, "\tat %s.%s", klass_name, method_name); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1381 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1382 if (!version_matches(method, version)) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1383 strcat(buf, "(Redefined)"); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1384 } else { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1385 int line_number = get_line_number(method, bci); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1386 if (line_number == -2) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1387 strcat(buf, "(Native Method)"); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1388 } else { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1389 if (source_file_name != NULL && (line_number != -1)) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1390 // Sourcename and linenumber |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1391 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
|
1392 } else if (source_file_name != NULL) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1393 // Just sourcename |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1394 sprintf(buf + (int)strlen(buf), "(%s)", source_file_name); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1395 } else { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1396 // Neither sourcename nor linenumber |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1397 sprintf(buf + (int)strlen(buf), "(Unknown Source)"); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1398 } |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1399 nmethod* nm = method->code(); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1400 if (WizardMode && nm != NULL) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1401 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
|
1402 } |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1403 } |
| 0 | 1404 } |
| 1405 | |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1406 return buf; |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1407 } |
|
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 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
|
1410 int method_id, int version, int bci) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1411 ResourceMark rm; |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1412 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
|
1413 st->print_cr("%s", buf); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1414 } |
|
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 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
|
1417 Handle mirror = method->method_holder()->java_mirror(); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1418 int method_id = method->method_idnum(); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1419 int version = method->constants()->version(); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1420 print_stack_element(st, mirror, method_id, version, bci); |
|
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 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1423 const char* java_lang_Throwable::no_stack_trace_message() { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1424 return "\t<<no stack trace available>>"; |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1425 } |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1426 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1427 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1428 // Currently used only for exceptions occurring during startup |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1429 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
|
1430 Thread *THREAD = Thread::current(); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1431 Handle h_throwable(THREAD, throwable); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1432 while (h_throwable.not_null()) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1433 objArrayHandle result (THREAD, objArrayOop(backtrace(h_throwable()))); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1434 if (result.is_null()) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1435 st->print_cr(no_stack_trace_message()); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1436 return; |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1437 } |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1438 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1439 while (result.not_null()) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1440 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1441 // Get method id, bci, version and mirror from chunk |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1442 typeArrayHandle methods (THREAD, BacktraceBuilder::get_methods(result)); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1443 typeArrayHandle bcis (THREAD, BacktraceBuilder::get_bcis(result)); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1444 objArrayHandle mirrors (THREAD, BacktraceBuilder::get_mirrors(result)); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1445 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1446 int length = methods()->length(); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1447 for (int index = 0; index < length; index++) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1448 Handle mirror(THREAD, mirrors->obj_at(index)); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1449 // NULL mirror means end of stack trace |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1450 if (mirror.is_null()) goto handle_cause; |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1451 int method = methods->short_at(index); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1452 int version = version_at(bcis->int_at(index)); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1453 int bci = bci_at(bcis->int_at(index)); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1454 print_stack_element(st, mirror, method, version, bci); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1455 } |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1456 result = objArrayHandle(THREAD, objArrayOop(result->obj_at(trace_next_offset))); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1457 } |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1458 handle_cause: |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1459 { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1460 EXCEPTION_MARK; |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1461 JavaValue cause(T_OBJECT); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1462 JavaCalls::call_virtual(&cause, |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1463 h_throwable, |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1464 KlassHandle(THREAD, h_throwable->klass()), |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1465 vmSymbols::getCause_name(), |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1466 vmSymbols::void_throwable_signature(), |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1467 THREAD); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1468 // 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
|
1469 if (HAS_PENDING_EXCEPTION) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1470 CLEAR_PENDING_EXCEPTION; |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1471 h_throwable = Handle(); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1472 } else { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1473 h_throwable = Handle(THREAD, (oop) cause.get_jobject()); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1474 if (h_throwable.not_null()) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1475 st->print("Caused by: "); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1476 print(h_throwable, st); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1477 st->cr(); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1478 } |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1479 } |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1480 } |
| 0 | 1481 } |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1482 } |
| 0 | 1483 |
|
3272
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1484 void java_lang_Throwable::fill_in_stack_trace(Handle throwable, methodHandle method, TRAPS) { |
| 0 | 1485 if (!StackTraceInThrowable) return; |
| 1486 ResourceMark rm(THREAD); | |
| 1487 | |
| 1488 // Start out by clearing the backtrace for this object, in case the VM | |
| 1489 // runs out of memory while allocating the stack trace | |
| 1490 set_backtrace(throwable(), NULL); | |
| 1491 if (JDK_Version::is_gte_jdk14x_version()) { | |
| 1492 // New since 1.4, clear lazily constructed Java level stacktrace if | |
| 1493 // refilling occurs | |
|
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1494 // This is unnecessary in 1.7+ but harmless |
| 0 | 1495 clear_stacktrace(throwable()); |
| 1496 } | |
| 1497 | |
| 1498 int max_depth = MaxJavaStackTraceDepth; | |
| 1499 JavaThread* thread = (JavaThread*)THREAD; | |
| 1500 BacktraceBuilder bt(CHECK); | |
| 1501 | |
|
3272
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1502 // 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
|
1503 // with bci 0 |
|
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1504 if (!thread->has_last_Java_frame()) { |
|
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1505 if (max_depth >= 1 && method() != NULL) { |
|
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1506 bt.push(method(), 0, CHECK); |
|
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1507 set_backtrace(throwable(), bt.backtrace()); |
|
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1508 } |
|
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1509 return; |
|
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1510 } |
|
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1511 |
| 0 | 1512 // Instead of using vframe directly, this version of fill_in_stack_trace |
| 1513 // basically handles everything by hand. This significantly improved the | |
| 1514 // speed of this method call up to 28.5% on Solaris sparc. 27.1% on Windows. | |
| 1515 // See bug 6333838 for more details. | |
| 1516 // The "ASSERT" here is to verify this method generates the exactly same stack | |
| 1517 // trace as utilizing vframe. | |
| 1518 #ifdef ASSERT | |
| 1519 vframeStream st(thread); | |
| 1520 methodHandle st_method(THREAD, st.method()); | |
| 1521 #endif | |
| 1522 int total_count = 0; | |
| 1523 RegisterMap map(thread, false); | |
| 1524 int decode_offset = 0; | |
| 1525 nmethod* nm = NULL; | |
| 1526 bool skip_fillInStackTrace_check = false; | |
| 1527 bool skip_throwableInit_check = false; | |
|
6267
977007096840
7187290: nightly failures after JSR 292 lazy method handle update
twisti
parents:
6266
diff
changeset
|
1528 bool skip_hidden = !ShowHiddenFrames; |
| 0 | 1529 |
| 1530 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
|
1531 Method* method = NULL; |
| 0 | 1532 int bci = 0; |
| 1533 | |
| 1534 // Compiled java method case. | |
| 1535 if (decode_offset != 0) { | |
| 1536 DebugInfoReadStream stream(nm, decode_offset); | |
| 1537 decode_offset = stream.read_int(); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1538 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
|
1539 bci = stream.read_bci(); |
| 0 | 1540 } else { |
| 1541 if (fr.is_first_frame()) break; | |
| 1542 address pc = fr.pc(); | |
| 1543 if (fr.is_interpreted_frame()) { | |
| 1544 intptr_t bcx = fr.interpreter_frame_bcx(); | |
| 1545 method = fr.interpreter_frame_method(); | |
| 1546 bci = fr.is_bci(bcx) ? bcx : method->bci_from((address)bcx); | |
| 1547 fr = fr.sender(&map); | |
| 1548 } else { | |
| 1549 CodeBlob* cb = fr.cb(); | |
| 1550 // HMMM QQQ might be nice to have frame return nm as NULL if cb is non-NULL | |
| 1551 // but non nmethod | |
| 1552 fr = fr.sender(&map); | |
| 1553 if (cb == NULL || !cb->is_nmethod()) { | |
| 1554 continue; | |
| 1555 } | |
| 1556 nm = (nmethod*)cb; | |
| 1557 if (nm->method()->is_native()) { | |
| 1558 method = nm->method(); | |
| 1559 bci = 0; | |
| 1560 } else { | |
| 1561 PcDesc* pd = nm->pc_desc_at(pc); | |
| 1562 decode_offset = pd->scope_decode_offset(); | |
| 1563 // if decode_offset is not equal to 0, it will execute the | |
| 1564 // "compiled java method case" at the beginning of the loop. | |
| 1565 continue; | |
| 1566 } | |
| 1567 } | |
| 1568 } | |
| 1569 #ifdef ASSERT | |
|
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1570 assert(st_method() == method && st.bci() == bci, |
|
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1571 "Wrong stack trace"); |
|
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1572 st.next(); |
|
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1573 // 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
|
1574 // of the Method* in case we GC. |
|
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1575 if (!st.at_end()) { |
|
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1576 st_method = st.method(); |
|
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1577 } |
| 0 | 1578 #endif |
|
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1579 |
|
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1580 // the format of the stacktrace will be: |
|
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1581 // - 1 or more fillInStackTrace frames for the exception class (skipped) |
|
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1582 // - 0 or more <init> methods for the exception class (skipped) |
|
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1583 // - rest of the stack |
|
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1584 |
| 0 | 1585 if (!skip_fillInStackTrace_check) { |
|
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1586 if ((method->name() == vmSymbols::fillInStackTrace_name() || |
|
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1587 method->name() == vmSymbols::fillInStackTrace0_name()) && |
|
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1588 throwable->is_a(method->method_holder())) { |
| 0 | 1589 continue; |
| 1590 } | |
|
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1591 else { |
|
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1592 skip_fillInStackTrace_check = true; // gone past them all |
|
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1593 } |
| 0 | 1594 } |
| 1595 if (!skip_throwableInit_check) { | |
|
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1596 assert(skip_fillInStackTrace_check, "logic error in backtrace filtering"); |
|
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1597 |
|
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1598 // skip <init> methods of the exception class and superclasses |
|
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1599 // This is simlar to classic VM. |
| 0 | 1600 if (method->name() == vmSymbols::object_initializer_name() && |
| 1601 throwable->is_a(method->method_holder())) { | |
| 1602 continue; | |
| 1603 } else { | |
|
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1604 // there are none or we've seen them all - either way stop checking |
| 0 | 1605 skip_throwableInit_check = true; |
| 1606 } | |
| 1607 } | |
|
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
1608 if (method->is_hidden()) { |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
1609 if (skip_hidden) continue; |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
1610 } |
| 0 | 1611 bt.push(method, bci, CHECK); |
| 1612 total_count++; | |
| 1613 } | |
| 1614 | |
| 1615 // Put completed stack trace into throwable object | |
| 1616 set_backtrace(throwable(), bt.backtrace()); | |
| 1617 } | |
| 1618 | |
|
3272
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1619 void java_lang_Throwable::fill_in_stack_trace(Handle throwable, methodHandle method) { |
| 0 | 1620 // No-op if stack trace is disabled |
| 1621 if (!StackTraceInThrowable) { | |
| 1622 return; | |
| 1623 } | |
| 1624 | |
| 1625 // Disable stack traces for some preallocated out of memory errors | |
| 1626 if (!Universe::should_fill_in_stack_trace(throwable)) { | |
| 1627 return; | |
| 1628 } | |
| 1629 | |
| 1630 PRESERVE_EXCEPTION_MARK; | |
| 1631 | |
| 1632 JavaThread* thread = JavaThread::active(); | |
|
3272
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1633 fill_in_stack_trace(throwable, method, thread); |
| 0 | 1634 // ignore exceptions thrown during stack trace filling |
| 1635 CLEAR_PENDING_EXCEPTION; | |
| 1636 } | |
| 1637 | |
| 1638 void java_lang_Throwable::allocate_backtrace(Handle throwable, TRAPS) { | |
| 1639 // Allocate stack trace - backtrace is created but not filled in | |
| 1640 | |
| 1641 // No-op if stack trace is disabled | |
| 1642 if (!StackTraceInThrowable) return; | |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1643 BacktraceBuilder bt(CHECK); // creates a backtrace |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1644 set_backtrace(throwable(), bt.backtrace()); |
| 0 | 1645 } |
| 1646 | |
| 1647 | |
| 1648 void java_lang_Throwable::fill_in_stack_trace_of_preallocated_backtrace(Handle throwable) { | |
| 1649 // Fill in stack trace into preallocated backtrace (no GC) | |
| 1650 | |
| 1651 // No-op if stack trace is disabled | |
| 1652 if (!StackTraceInThrowable) return; | |
| 1653 | |
| 1142 | 1654 assert(throwable->is_a(SystemDictionary::Throwable_klass()), "sanity check"); |
| 0 | 1655 |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1656 JavaThread* THREAD = JavaThread::current(); |
|
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 objArrayHandle backtrace (THREAD, (objArrayOop)java_lang_Throwable::backtrace(throwable())); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1659 assert(backtrace.not_null(), "backtrace should have been preallocated"); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1660 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1661 ResourceMark rm(THREAD); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1662 vframeStream st(THREAD); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1663 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1664 BacktraceBuilder bt(backtrace); |
| 0 | 1665 |
| 1666 // Unlike fill_in_stack_trace we do not skip fillInStackTrace or throwable init | |
| 1667 // methods as preallocated errors aren't created by "java" code. | |
| 1668 | |
| 1669 // fill in as much stack trace as possible | |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1670 typeArrayOop methods = BacktraceBuilder::get_methods(backtrace); |
| 0 | 1671 int max_chunks = MIN2(methods->length(), (int)MaxJavaStackTraceDepth); |
| 1672 int chunk_count = 0; | |
| 1673 | |
| 1674 for (;!st.at_end(); st.next()) { | |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1675 bt.push(st.method(), st.bci(), CHECK); |
| 0 | 1676 chunk_count++; |
| 1677 | |
| 1678 // Bail-out for deep stacks | |
| 1679 if (chunk_count >= max_chunks) break; | |
| 1680 } | |
|
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1681 |
|
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1682 // 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
|
1683 // 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
|
1684 // 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
|
1685 if (JDK_Version::is_gte_jdk17x_version()) { |
|
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1686 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
|
1687 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
|
1688 } |
| 0 | 1689 } |
| 1690 | |
| 1691 | |
| 1692 int java_lang_Throwable::get_stack_trace_depth(oop throwable, TRAPS) { | |
| 1693 if (throwable == NULL) { | |
| 1694 THROW_0(vmSymbols::java_lang_NullPointerException()); | |
| 1695 } | |
| 1696 objArrayOop chunk = objArrayOop(backtrace(throwable)); | |
| 1697 int depth = 0; | |
| 1698 if (chunk != NULL) { | |
| 1699 // Iterate over chunks and count full ones | |
| 1700 while (true) { | |
| 1701 objArrayOop next = objArrayOop(chunk->obj_at(trace_next_offset)); | |
| 1702 if (next == NULL) break; | |
| 1703 depth += trace_chunk_size; | |
| 1704 chunk = next; | |
| 1705 } | |
| 1706 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
|
1707 // Count element in remaining partial chunk. NULL value for mirror |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1708 // 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
|
1709 objArrayOop mirrors = BacktraceBuilder::get_mirrors(chunk); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1710 assert(mirrors != NULL, "sanity check"); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1711 for (int i = 0; i < mirrors->length(); i++) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1712 if (mirrors->obj_at(i) == NULL) break; |
| 0 | 1713 depth++; |
| 1714 } | |
| 1715 } | |
| 1716 return depth; | |
| 1717 } | |
| 1718 | |
| 1719 | |
| 1720 oop java_lang_Throwable::get_stack_trace_element(oop throwable, int index, TRAPS) { | |
| 1721 if (throwable == NULL) { | |
| 1722 THROW_0(vmSymbols::java_lang_NullPointerException()); | |
| 1723 } | |
| 1724 if (index < 0) { | |
| 1725 THROW_(vmSymbols::java_lang_IndexOutOfBoundsException(), NULL); | |
| 1726 } | |
| 1727 // Compute how many chunks to skip and index into actual chunk | |
| 1728 objArrayOop chunk = objArrayOop(backtrace(throwable)); | |
| 1729 int skip_chunks = index / trace_chunk_size; | |
| 1730 int chunk_index = index % trace_chunk_size; | |
| 1731 while (chunk != NULL && skip_chunks > 0) { | |
| 1732 chunk = objArrayOop(chunk->obj_at(trace_next_offset)); | |
| 1733 skip_chunks--; | |
| 1734 } | |
| 1735 if (chunk == NULL) { | |
| 1736 THROW_(vmSymbols::java_lang_IndexOutOfBoundsException(), NULL); | |
| 1737 } | |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1738 // Get method id, bci, version and mirror from chunk |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1739 typeArrayOop methods = BacktraceBuilder::get_methods(chunk); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1740 typeArrayOop bcis = BacktraceBuilder::get_bcis(chunk); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1741 objArrayOop mirrors = BacktraceBuilder::get_mirrors(chunk); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1742 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1743 assert(methods != NULL && bcis != NULL && mirrors != NULL, "sanity check"); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1744 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1745 int method = methods->short_at(chunk_index); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1746 int version = version_at(bcis->int_at(chunk_index)); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1747 int bci = bci_at(bcis->int_at(chunk_index)); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1748 Handle mirror(THREAD, mirrors->obj_at(chunk_index)); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1749 |
| 0 | 1750 // Chunk can be partial full |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1751 if (mirror.is_null()) { |
| 0 | 1752 THROW_(vmSymbols::java_lang_IndexOutOfBoundsException(), NULL); |
| 1753 } | |
| 1754 | |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1755 oop element = java_lang_StackTraceElement::create(mirror, method, version, bci, CHECK_0); |
| 0 | 1756 return element; |
| 1757 } | |
| 1758 | |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1759 oop java_lang_StackTraceElement::create(Handle mirror, int method_id, int version, int bci, TRAPS) { |
| 0 | 1760 // Allocate java.lang.StackTraceElement instance |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1761 Klass* k = SystemDictionary::StackTraceElement_klass(); |
|
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1762 assert(k != NULL, "must be loaded in 1.4+"); |
| 0 | 1763 instanceKlassHandle ik (THREAD, k); |
| 1764 if (ik->should_be_initialized()) { | |
| 1765 ik->initialize(CHECK_0); | |
| 1766 } | |
| 1767 | |
| 1768 Handle element = ik->allocate_instance_handle(CHECK_0); | |
| 1769 // Fill in class name | |
| 1770 ResourceMark rm(THREAD); | |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1771 InstanceKlass* holder = InstanceKlass::cast(java_lang_Class::as_Klass(mirror())); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1772 const char* str = holder->external_name(); |
| 0 | 1773 oop classname = StringTable::intern((char*) str, CHECK_0); |
| 1774 java_lang_StackTraceElement::set_declaringClass(element(), classname); | |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1775 |
| 0 | 1776 // Fill in method name |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1777 Method* method = holder->method_with_idnum(method_id); |
| 0 | 1778 oop methodname = StringTable::intern(method->name(), CHECK_0); |
| 1779 java_lang_StackTraceElement::set_methodName(element(), methodname); | |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1780 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1781 if (!version_matches(method, version)) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1782 // 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
|
1783 java_lang_StackTraceElement::set_fileName(element(), NULL); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1784 java_lang_StackTraceElement::set_lineNumber(element(), -1); |
| 0 | 1785 } else { |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1786 // Fill in source file name and line number. |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1787 Symbol* source = holder->source_file_name(); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1788 if (ShowHiddenFrames && source == NULL) |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1789 source = vmSymbols::unknown_class_name(); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1790 oop filename = StringTable::intern(source, CHECK_0); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1791 java_lang_StackTraceElement::set_fileName(element(), filename); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1792 |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1793 int line_number = get_line_number(method, bci); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1794 java_lang_StackTraceElement::set_lineNumber(element(), line_number); |
| 0 | 1795 } |
| 1796 return element(); | |
| 1797 } | |
| 1798 | |
|
7624
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1799 oop java_lang_StackTraceElement::create(methodHandle method, int bci, TRAPS) { |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1800 Handle mirror (THREAD, method->method_holder()->java_mirror()); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1801 int method_id = method->method_idnum(); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1802 return create(mirror, method_id, method->constants()->version(), bci, THREAD); |
|
b14da2e6f2dc
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
7462
diff
changeset
|
1803 } |
| 0 | 1804 |
| 1805 void java_lang_reflect_AccessibleObject::compute_offsets() { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1806 Klass* k = SystemDictionary::reflect_AccessibleObject_klass(); |
|
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1807 compute_offset(override_offset, k, vmSymbols::override_name(), vmSymbols::bool_signature()); |
| 0 | 1808 } |
| 1809 | |
| 1810 jboolean java_lang_reflect_AccessibleObject::override(oop reflect) { | |
| 1811 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 1812 return (jboolean) reflect->bool_field(override_offset); | |
| 1813 } | |
| 1814 | |
| 1815 void java_lang_reflect_AccessibleObject::set_override(oop reflect, jboolean value) { | |
| 1816 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 1817 reflect->bool_field_put(override_offset, (int) value); | |
| 1818 } | |
| 1819 | |
| 1820 void java_lang_reflect_Method::compute_offsets() { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1821 Klass* k = SystemDictionary::reflect_Method_klass(); |
|
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1822 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
|
1823 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
|
1824 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
|
1825 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
|
1826 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
|
1827 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
|
1828 compute_offset(modifiers_offset, k, vmSymbols::modifiers_name(), vmSymbols::int_signature()); |
| 0 | 1829 // The generic signature and annotations fields are only present in 1.5 |
| 1830 signature_offset = -1; | |
| 1831 annotations_offset = -1; | |
| 1832 parameter_annotations_offset = -1; | |
| 1833 annotation_default_offset = -1; | |
|
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1834 type_annotations_offset = -1; |
|
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1835 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
|
1836 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
|
1837 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
|
1838 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
|
1839 compute_optional_offset(type_annotations_offset, k, vmSymbols::type_annotations_name(), vmSymbols::byte_array_signature()); |
| 0 | 1840 } |
| 1841 | |
| 1842 Handle java_lang_reflect_Method::create(TRAPS) { | |
| 1843 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
|
1844 Klass* klass = SystemDictionary::reflect_Method_klass(); |
| 0 | 1845 // This class is eagerly initialized during VM initialization, since we keep a refence |
| 1846 // to one of the methods | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1847 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
|
1848 return InstanceKlass::cast(klass)->allocate_instance_handle(CHECK_NH); |
| 0 | 1849 } |
| 1850 | |
| 1851 oop java_lang_reflect_Method::clazz(oop reflect) { | |
| 1852 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 1853 return reflect->obj_field(clazz_offset); | |
| 1854 } | |
| 1855 | |
| 1856 void java_lang_reflect_Method::set_clazz(oop reflect, oop value) { | |
| 1857 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 1858 reflect->obj_field_put(clazz_offset, value); | |
| 1859 } | |
| 1860 | |
| 1861 int java_lang_reflect_Method::slot(oop reflect) { | |
| 1862 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 1863 return reflect->int_field(slot_offset); | |
| 1864 } | |
| 1865 | |
| 1866 void java_lang_reflect_Method::set_slot(oop reflect, int value) { | |
| 1867 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 1868 reflect->int_field_put(slot_offset, value); | |
| 1869 } | |
| 1870 | |
| 1871 oop java_lang_reflect_Method::name(oop method) { | |
| 1872 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 1873 return method->obj_field(name_offset); | |
| 1874 } | |
| 1875 | |
| 1876 void java_lang_reflect_Method::set_name(oop method, oop value) { | |
| 1877 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 1878 method->obj_field_put(name_offset, value); | |
| 1879 } | |
| 1880 | |
| 1881 oop java_lang_reflect_Method::return_type(oop method) { | |
| 1882 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 1883 return method->obj_field(returnType_offset); | |
| 1884 } | |
| 1885 | |
| 1886 void java_lang_reflect_Method::set_return_type(oop method, oop value) { | |
| 1887 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 1888 method->obj_field_put(returnType_offset, value); | |
| 1889 } | |
| 1890 | |
| 1891 oop java_lang_reflect_Method::parameter_types(oop method) { | |
| 1892 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 1893 return method->obj_field(parameterTypes_offset); | |
| 1894 } | |
| 1895 | |
| 1896 void java_lang_reflect_Method::set_parameter_types(oop method, oop value) { | |
| 1897 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 1898 method->obj_field_put(parameterTypes_offset, value); | |
| 1899 } | |
| 1900 | |
| 1901 oop java_lang_reflect_Method::exception_types(oop method) { | |
| 1902 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 1903 return method->obj_field(exceptionTypes_offset); | |
| 1904 } | |
| 1905 | |
| 1906 void java_lang_reflect_Method::set_exception_types(oop method, oop value) { | |
| 1907 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 1908 method->obj_field_put(exceptionTypes_offset, value); | |
| 1909 } | |
| 1910 | |
| 1911 int java_lang_reflect_Method::modifiers(oop method) { | |
| 1912 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 1913 return method->int_field(modifiers_offset); | |
| 1914 } | |
| 1915 | |
| 1916 void java_lang_reflect_Method::set_modifiers(oop method, int value) { | |
| 1917 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 1918 method->int_field_put(modifiers_offset, value); | |
| 1919 } | |
| 1920 | |
| 1921 bool java_lang_reflect_Method::has_signature_field() { | |
| 1922 return (signature_offset >= 0); | |
| 1923 } | |
| 1924 | |
| 1925 oop java_lang_reflect_Method::signature(oop method) { | |
| 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 return method->obj_field(signature_offset); | |
| 1929 } | |
| 1930 | |
| 1931 void java_lang_reflect_Method::set_signature(oop method, oop value) { | |
| 1932 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 1933 assert(has_signature_field(), "signature field must be present"); | |
| 1934 method->obj_field_put(signature_offset, value); | |
| 1935 } | |
| 1936 | |
| 1937 bool java_lang_reflect_Method::has_annotations_field() { | |
| 1938 return (annotations_offset >= 0); | |
| 1939 } | |
| 1940 | |
| 1941 oop java_lang_reflect_Method::annotations(oop method) { | |
| 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 return method->obj_field(annotations_offset); | |
| 1945 } | |
| 1946 | |
| 1947 void java_lang_reflect_Method::set_annotations(oop method, oop value) { | |
| 1948 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 1949 assert(has_annotations_field(), "annotations field must be present"); | |
| 1950 method->obj_field_put(annotations_offset, value); | |
| 1951 } | |
| 1952 | |
| 1953 bool java_lang_reflect_Method::has_parameter_annotations_field() { | |
| 1954 return (parameter_annotations_offset >= 0); | |
| 1955 } | |
| 1956 | |
| 1957 oop java_lang_reflect_Method::parameter_annotations(oop method) { | |
| 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 return method->obj_field(parameter_annotations_offset); | |
| 1961 } | |
| 1962 | |
| 1963 void java_lang_reflect_Method::set_parameter_annotations(oop method, oop value) { | |
| 1964 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 1965 assert(has_parameter_annotations_field(), "parameter annotations field must be present"); | |
| 1966 method->obj_field_put(parameter_annotations_offset, value); | |
| 1967 } | |
| 1968 | |
| 1969 bool java_lang_reflect_Method::has_annotation_default_field() { | |
| 1970 return (annotation_default_offset >= 0); | |
| 1971 } | |
| 1972 | |
| 1973 oop java_lang_reflect_Method::annotation_default(oop method) { | |
| 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 return method->obj_field(annotation_default_offset); | |
| 1977 } | |
| 1978 | |
| 1979 void java_lang_reflect_Method::set_annotation_default(oop method, oop value) { | |
| 1980 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 1981 assert(has_annotation_default_field(), "annotation default field must be present"); | |
| 1982 method->obj_field_put(annotation_default_offset, value); | |
| 1983 } | |
| 1984 | |
|
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1985 bool java_lang_reflect_Method::has_type_annotations_field() { |
|
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1986 return (type_annotations_offset >= 0); |
|
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 oop java_lang_reflect_Method::type_annotations(oop method) { |
|
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 return method->obj_field(type_annotations_offset); |
|
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 |
|
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1995 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
|
1996 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
|
1997 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
|
1998 method->obj_field_put(type_annotations_offset, value); |
|
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1999 } |
|
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2000 |
| 0 | 2001 void java_lang_reflect_Constructor::compute_offsets() { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2002 Klass* k = SystemDictionary::reflect_Constructor_klass(); |
|
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2003 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
|
2004 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
|
2005 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
|
2006 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
|
2007 compute_offset(modifiers_offset, k, vmSymbols::modifiers_name(), vmSymbols::int_signature()); |
| 0 | 2008 // The generic signature and annotations fields are only present in 1.5 |
| 2009 signature_offset = -1; | |
| 2010 annotations_offset = -1; | |
| 2011 parameter_annotations_offset = -1; | |
|
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2012 type_annotations_offset = -1; |
|
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2013 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
|
2014 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
|
2015 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
|
2016 compute_optional_offset(type_annotations_offset, k, vmSymbols::type_annotations_name(), vmSymbols::byte_array_signature()); |
| 0 | 2017 } |
| 2018 | |
| 2019 Handle java_lang_reflect_Constructor::create(TRAPS) { | |
| 2020 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
|
2021 Symbol* name = vmSymbols::java_lang_reflect_Constructor(); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2022 Klass* k = SystemDictionary::resolve_or_fail(name, true, CHECK_NH); |
| 0 | 2023 instanceKlassHandle klass (THREAD, k); |
| 2024 // Ensure it is initialized | |
| 2025 klass->initialize(CHECK_NH); | |
| 2026 return klass->allocate_instance_handle(CHECK_NH); | |
| 2027 } | |
| 2028 | |
| 2029 oop java_lang_reflect_Constructor::clazz(oop reflect) { | |
| 2030 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2031 return reflect->obj_field(clazz_offset); | |
| 2032 } | |
| 2033 | |
| 2034 void java_lang_reflect_Constructor::set_clazz(oop reflect, oop value) { | |
| 2035 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2036 reflect->obj_field_put(clazz_offset, value); | |
| 2037 } | |
| 2038 | |
| 2039 oop java_lang_reflect_Constructor::parameter_types(oop constructor) { | |
| 2040 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2041 return constructor->obj_field(parameterTypes_offset); | |
| 2042 } | |
| 2043 | |
| 2044 void java_lang_reflect_Constructor::set_parameter_types(oop constructor, oop value) { | |
| 2045 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2046 constructor->obj_field_put(parameterTypes_offset, value); | |
| 2047 } | |
| 2048 | |
| 2049 oop java_lang_reflect_Constructor::exception_types(oop constructor) { | |
| 2050 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2051 return constructor->obj_field(exceptionTypes_offset); | |
| 2052 } | |
| 2053 | |
| 2054 void java_lang_reflect_Constructor::set_exception_types(oop constructor, oop value) { | |
| 2055 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2056 constructor->obj_field_put(exceptionTypes_offset, value); | |
| 2057 } | |
| 2058 | |
| 2059 int java_lang_reflect_Constructor::slot(oop reflect) { | |
| 2060 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2061 return reflect->int_field(slot_offset); | |
| 2062 } | |
| 2063 | |
| 2064 void java_lang_reflect_Constructor::set_slot(oop reflect, int value) { | |
| 2065 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2066 reflect->int_field_put(slot_offset, value); | |
| 2067 } | |
| 2068 | |
| 2069 int java_lang_reflect_Constructor::modifiers(oop constructor) { | |
| 2070 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2071 return constructor->int_field(modifiers_offset); | |
| 2072 } | |
| 2073 | |
| 2074 void java_lang_reflect_Constructor::set_modifiers(oop constructor, int value) { | |
| 2075 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2076 constructor->int_field_put(modifiers_offset, value); | |
| 2077 } | |
| 2078 | |
| 2079 bool java_lang_reflect_Constructor::has_signature_field() { | |
| 2080 return (signature_offset >= 0); | |
| 2081 } | |
| 2082 | |
| 2083 oop java_lang_reflect_Constructor::signature(oop constructor) { | |
| 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 return constructor->obj_field(signature_offset); | |
| 2087 } | |
| 2088 | |
| 2089 void java_lang_reflect_Constructor::set_signature(oop constructor, oop value) { | |
| 2090 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2091 assert(has_signature_field(), "signature field must be present"); | |
| 2092 constructor->obj_field_put(signature_offset, value); | |
| 2093 } | |
| 2094 | |
| 2095 bool java_lang_reflect_Constructor::has_annotations_field() { | |
| 2096 return (annotations_offset >= 0); | |
| 2097 } | |
| 2098 | |
| 2099 oop java_lang_reflect_Constructor::annotations(oop constructor) { | |
| 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 return constructor->obj_field(annotations_offset); | |
| 2103 } | |
| 2104 | |
| 2105 void java_lang_reflect_Constructor::set_annotations(oop constructor, oop value) { | |
| 2106 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2107 assert(has_annotations_field(), "annotations field must be present"); | |
| 2108 constructor->obj_field_put(annotations_offset, value); | |
| 2109 } | |
| 2110 | |
| 2111 bool java_lang_reflect_Constructor::has_parameter_annotations_field() { | |
| 2112 return (parameter_annotations_offset >= 0); | |
| 2113 } | |
| 2114 | |
| 2115 oop java_lang_reflect_Constructor::parameter_annotations(oop method) { | |
| 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 return method->obj_field(parameter_annotations_offset); | |
| 2119 } | |
| 2120 | |
| 2121 void java_lang_reflect_Constructor::set_parameter_annotations(oop method, oop value) { | |
| 2122 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2123 assert(has_parameter_annotations_field(), "parameter annotations field must be present"); | |
| 2124 method->obj_field_put(parameter_annotations_offset, value); | |
| 2125 } | |
| 2126 | |
|
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2127 bool java_lang_reflect_Constructor::has_type_annotations_field() { |
|
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2128 return (type_annotations_offset >= 0); |
|
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 oop java_lang_reflect_Constructor::type_annotations(oop constructor) { |
|
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 return constructor->obj_field(type_annotations_offset); |
|
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 |
|
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2137 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
|
2138 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
|
2139 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
|
2140 constructor->obj_field_put(type_annotations_offset, value); |
|
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2141 } |
|
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2142 |
| 0 | 2143 void java_lang_reflect_Field::compute_offsets() { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2144 Klass* k = SystemDictionary::reflect_Field_klass(); |
|
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2145 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
|
2146 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
|
2147 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
|
2148 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
|
2149 compute_offset(modifiers_offset, k, vmSymbols::modifiers_name(), vmSymbols::int_signature()); |
| 0 | 2150 // The generic signature and annotations fields are only present in 1.5 |
| 2151 signature_offset = -1; | |
| 2152 annotations_offset = -1; | |
|
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2153 type_annotations_offset = -1; |
|
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2154 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
|
2155 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
|
2156 compute_optional_offset(type_annotations_offset, k, vmSymbols::type_annotations_name(), vmSymbols::byte_array_signature()); |
| 0 | 2157 } |
| 2158 | |
| 2159 Handle java_lang_reflect_Field::create(TRAPS) { | |
| 2160 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
|
2161 Symbol* name = vmSymbols::java_lang_reflect_Field(); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2162 Klass* k = SystemDictionary::resolve_or_fail(name, true, CHECK_NH); |
| 0 | 2163 instanceKlassHandle klass (THREAD, k); |
| 2164 // Ensure it is initialized | |
| 2165 klass->initialize(CHECK_NH); | |
| 2166 return klass->allocate_instance_handle(CHECK_NH); | |
| 2167 } | |
| 2168 | |
| 2169 oop java_lang_reflect_Field::clazz(oop reflect) { | |
| 2170 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2171 return reflect->obj_field(clazz_offset); | |
| 2172 } | |
| 2173 | |
| 2174 void java_lang_reflect_Field::set_clazz(oop reflect, oop value) { | |
| 2175 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2176 reflect->obj_field_put(clazz_offset, value); | |
| 2177 } | |
| 2178 | |
| 2179 oop java_lang_reflect_Field::name(oop field) { | |
| 2180 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2181 return field->obj_field(name_offset); | |
| 2182 } | |
| 2183 | |
| 2184 void java_lang_reflect_Field::set_name(oop field, oop value) { | |
| 2185 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2186 field->obj_field_put(name_offset, value); | |
| 2187 } | |
| 2188 | |
| 2189 oop java_lang_reflect_Field::type(oop field) { | |
| 2190 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2191 return field->obj_field(type_offset); | |
| 2192 } | |
| 2193 | |
| 2194 void java_lang_reflect_Field::set_type(oop field, oop value) { | |
| 2195 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2196 field->obj_field_put(type_offset, value); | |
| 2197 } | |
| 2198 | |
| 2199 int java_lang_reflect_Field::slot(oop reflect) { | |
| 2200 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2201 return reflect->int_field(slot_offset); | |
| 2202 } | |
| 2203 | |
| 2204 void java_lang_reflect_Field::set_slot(oop reflect, int value) { | |
| 2205 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2206 reflect->int_field_put(slot_offset, value); | |
| 2207 } | |
| 2208 | |
| 2209 int java_lang_reflect_Field::modifiers(oop field) { | |
| 2210 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2211 return field->int_field(modifiers_offset); | |
| 2212 } | |
| 2213 | |
| 2214 void java_lang_reflect_Field::set_modifiers(oop field, int value) { | |
| 2215 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2216 field->int_field_put(modifiers_offset, value); | |
| 2217 } | |
| 2218 | |
| 2219 bool java_lang_reflect_Field::has_signature_field() { | |
| 2220 return (signature_offset >= 0); | |
| 2221 } | |
| 2222 | |
| 2223 oop java_lang_reflect_Field::signature(oop field) { | |
| 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 return field->obj_field(signature_offset); | |
| 2227 } | |
| 2228 | |
| 2229 void java_lang_reflect_Field::set_signature(oop field, oop value) { | |
| 2230 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2231 assert(has_signature_field(), "signature field must be present"); | |
| 2232 field->obj_field_put(signature_offset, value); | |
| 2233 } | |
| 2234 | |
| 2235 bool java_lang_reflect_Field::has_annotations_field() { | |
| 2236 return (annotations_offset >= 0); | |
| 2237 } | |
| 2238 | |
| 2239 oop java_lang_reflect_Field::annotations(oop field) { | |
| 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 return field->obj_field(annotations_offset); | |
| 2243 } | |
| 2244 | |
| 2245 void java_lang_reflect_Field::set_annotations(oop field, oop value) { | |
| 2246 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
| 2247 assert(has_annotations_field(), "annotations field must be present"); | |
| 2248 field->obj_field_put(annotations_offset, value); | |
| 2249 } | |
| 2250 | |
|
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2251 bool java_lang_reflect_Field::has_type_annotations_field() { |
|
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2252 return (type_annotations_offset >= 0); |
|
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 oop java_lang_reflect_Field::type_annotations(oop field) { |
|
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 return field->obj_field(type_annotations_offset); |
|
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2259 } |
|
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2260 |
|
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2261 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
|
2262 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
|
2263 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
|
2264 field->obj_field_put(type_annotations_offset, value); |
|
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2265 } |
| 0 | 2266 |
| 2267 void sun_reflect_ConstantPool::compute_offsets() { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2268 Klass* k = SystemDictionary::reflect_ConstantPool_klass(); |
| 0 | 2269 // This null test can be removed post beta |
| 2270 if (k != NULL) { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2271 // 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
|
2272 compute_offset(_oop_offset, k, vmSymbols::ConstantPool_name(), vmSymbols::object_signature()); |
| 0 | 2273 } |
| 2274 } | |
| 2275 | |
|
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2276 void java_lang_reflect_Parameter::compute_offsets() { |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2277 Klass* k = SystemDictionary::reflect_Parameter_klass(); |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2278 if(NULL != k) { |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2279 compute_offset(name_offset, k, vmSymbols::name_name(), vmSymbols::string_signature()); |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2280 compute_offset(modifiers_offset, k, vmSymbols::modifiers_name(), vmSymbols::int_signature()); |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2281 compute_offset(index_offset, k, vmSymbols::index_name(), vmSymbols::int_signature()); |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2282 compute_offset(executable_offset, k, vmSymbols::executable_name(), vmSymbols::executable_signature()); |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2283 } |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2284 } |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2285 |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2286 Handle java_lang_reflect_Parameter::create(TRAPS) { |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2287 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
|
2288 Symbol* name = vmSymbols::java_lang_reflect_Parameter(); |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2289 Klass* k = SystemDictionary::resolve_or_fail(name, true, CHECK_NH); |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2290 instanceKlassHandle klass (THREAD, k); |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2291 // Ensure it is initialized |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2292 klass->initialize(CHECK_NH); |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2293 return klass->allocate_instance_handle(CHECK_NH); |
|
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 |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2296 oop java_lang_reflect_Parameter::name(oop param) { |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2297 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
|
2298 return param->obj_field(name_offset); |
|
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 |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2301 void java_lang_reflect_Parameter::set_name(oop param, oop value) { |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2302 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
|
2303 param->obj_field_put(name_offset, value); |
|
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 |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2306 int java_lang_reflect_Parameter::modifiers(oop param) { |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2307 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
|
2308 return param->int_field(modifiers_offset); |
|
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 |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2311 void java_lang_reflect_Parameter::set_modifiers(oop param, int value) { |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2312 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
|
2313 param->int_field_put(modifiers_offset, value); |
|
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 |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2316 int java_lang_reflect_Parameter::index(oop param) { |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2317 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
|
2318 return param->int_field(index_offset); |
|
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 |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2321 void java_lang_reflect_Parameter::set_index(oop param, int value) { |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2322 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
|
2323 param->int_field_put(index_offset, value); |
|
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 |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2326 oop java_lang_reflect_Parameter::executable(oop param) { |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2327 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
|
2328 return param->obj_field(executable_offset); |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2329 } |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2330 |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2331 void java_lang_reflect_Parameter::set_executable(oop param, oop value) { |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2332 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
|
2333 param->obj_field_put(executable_offset, value); |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2334 } |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2335 |
| 0 | 2336 |
| 2337 Handle sun_reflect_ConstantPool::create(TRAPS) { | |
| 2338 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
|
2339 Klass* k = SystemDictionary::reflect_ConstantPool_klass(); |
| 0 | 2340 instanceKlassHandle klass (THREAD, k); |
| 2341 // Ensure it is initialized | |
| 2342 klass->initialize(CHECK_NH); | |
| 2343 return klass->allocate_instance_handle(CHECK_NH); | |
| 2344 } | |
| 2345 | |
| 2346 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2347 void sun_reflect_ConstantPool::set_cp(oop reflect, ConstantPool* value) { |
| 0 | 2348 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
|
2349 oop mirror = value->pool_holder()->java_mirror(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2350 // 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
|
2351 reflect->obj_field_put(_oop_offset, mirror); |
| 0 | 2352 } |
| 2353 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2354 ConstantPool* sun_reflect_ConstantPool::get_cp(oop reflect) { |
| 0 | 2355 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
|
2356 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2357 oop mirror = reflect->obj_field(_oop_offset); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2358 Klass* k = java_lang_Class::as_Klass(mirror); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2359 assert(k->oop_is_instance(), "Must be"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2360 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2361 // 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
|
2362 // 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
|
2363 // 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
|
2364 // 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
|
2365 // the original. |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2366 return InstanceKlass::cast(k)->constants(); |
| 0 | 2367 } |
| 2368 | |
| 2369 void sun_reflect_UnsafeStaticFieldAccessorImpl::compute_offsets() { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2370 Klass* k = SystemDictionary::reflect_UnsafeStaticFieldAccessorImpl_klass(); |
| 0 | 2371 // This null test can be removed post beta |
| 2372 if (k != NULL) { | |
|
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2373 compute_offset(_base_offset, k, |
| 0 | 2374 vmSymbols::base_name(), vmSymbols::object_signature()); |
| 2375 } | |
| 2376 } | |
| 2377 | |
|
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2378 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
|
2379 Klass* k = SystemDictionary::box_klass(type); |
|
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2380 if (k == NULL) return NULL; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2381 instanceKlassHandle h (THREAD, k); |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2382 if (!h->is_initialized()) h->initialize(CHECK_0); |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2383 return h->allocate_instance(THREAD); |
| 0 | 2384 } |
| 2385 | |
| 2386 | |
| 2387 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
|
2388 oop box = initialize_and_allocate(type, CHECK_0); |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2389 if (box == NULL) return NULL; |
| 0 | 2390 switch (type) { |
| 2391 case T_BOOLEAN: | |
| 2392 box->bool_field_put(value_offset, value->z); | |
| 2393 break; | |
| 2394 case T_CHAR: | |
| 2395 box->char_field_put(value_offset, value->c); | |
| 2396 break; | |
| 2397 case T_FLOAT: | |
| 2398 box->float_field_put(value_offset, value->f); | |
| 2399 break; | |
| 2400 case T_DOUBLE: | |
|
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
2401 box->double_field_put(long_value_offset, value->d); |
| 0 | 2402 break; |
| 2403 case T_BYTE: | |
| 2404 box->byte_field_put(value_offset, value->b); | |
| 2405 break; | |
| 2406 case T_SHORT: | |
| 2407 box->short_field_put(value_offset, value->s); | |
| 2408 break; | |
| 2409 case T_INT: | |
| 2410 box->int_field_put(value_offset, value->i); | |
| 2411 break; | |
| 2412 case T_LONG: | |
|
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
2413 box->long_field_put(long_value_offset, value->j); |
| 0 | 2414 break; |
| 2415 default: | |
| 2416 return NULL; | |
| 2417 } | |
| 2418 return box; | |
| 2419 } | |
| 2420 | |
| 2421 | |
|
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2422 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
|
2423 if (box == NULL) return T_ILLEGAL; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2424 BasicType type = SystemDictionary::box_klass_type(box->klass()); |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2425 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
|
2426 return T_ILLEGAL; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2427 return type; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2428 } |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2429 |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2430 |
| 0 | 2431 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
|
2432 BasicType type = SystemDictionary::box_klass_type(box->klass()); |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2433 switch (type) { |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2434 case T_BOOLEAN: |
| 0 | 2435 value->z = box->bool_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_CHAR: |
| 0 | 2438 value->c = box->char_field(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_FLOAT: |
| 0 | 2441 value->f = box->float_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_DOUBLE: |
|
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
2444 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
|
2445 break; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2446 case T_BYTE: |
| 0 | 2447 value->b = box->byte_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_SHORT: |
| 0 | 2450 value->s = box->short_field(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 case T_INT: |
| 0 | 2453 value->i = box->int_field(value_offset); |
|
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2454 break; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2455 case T_LONG: |
|
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
2456 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
|
2457 break; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2458 default: |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2459 return T_ILLEGAL; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2460 } // end switch |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2461 return type; |
| 0 | 2462 } |
| 2463 | |
| 2464 | |
| 2465 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
|
2466 BasicType type = SystemDictionary::box_klass_type(box->klass()); |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2467 switch (type) { |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2468 case T_BOOLEAN: |
| 0 | 2469 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
|
2470 break; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2471 case T_CHAR: |
| 0 | 2472 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
|
2473 break; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2474 case T_FLOAT: |
| 0 | 2475 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
|
2476 break; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2477 case T_DOUBLE: |
|
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
2478 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
|
2479 break; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2480 case T_BYTE: |
| 0 | 2481 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
|
2482 break; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2483 case T_SHORT: |
| 0 | 2484 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
|
2485 break; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2486 case T_INT: |
| 0 | 2487 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
|
2488 break; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2489 case T_LONG: |
|
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
2490 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
|
2491 break; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2492 default: |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2493 return T_ILLEGAL; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2494 } // end switch |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2495 return type; |
| 0 | 2496 } |
| 2497 | |
| 2498 | |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2499 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
|
2500 switch (type) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2501 case T_BOOLEAN: st->print("%s", value->z ? "true" : "false"); break; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2502 case T_CHAR: st->print("%d", value->c); break; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2503 case T_BYTE: st->print("%d", value->b); break; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2504 case T_SHORT: st->print("%d", value->s); break; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2505 case T_INT: st->print("%d", value->i); break; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2506 case T_LONG: st->print(INT64_FORMAT, value->j); break; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2507 case T_FLOAT: st->print("%f", value->f); break; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2508 case T_DOUBLE: st->print("%lf", value->d); break; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2509 default: st->print("type %d?", type); break; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2510 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2511 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2512 |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2513 |
| 0 | 2514 // Support for java_lang_ref_Reference |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2515 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
|
2516 InstanceKlass* ik = InstanceKlass::cast(SystemDictionary::Reference_klass()); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2517 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
|
2518 return (HeapWord*) addr; |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2519 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2520 |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2521 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
|
2522 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
|
2523 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
|
2524 if (UseCompressedOops) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2525 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
|
2526 } else { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2527 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
|
2528 } |
| 0 | 2529 } |
| 2530 | |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2531 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
|
2532 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
|
2533 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
|
2534 // 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
|
2535 return (HeapWord*)addr; |
| 0 | 2536 } |
| 2537 | |
|
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2538 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
|
2539 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
|
2540 if (UseCompressedOops) { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2541 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
|
2542 } else { |
|
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2543 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
|
2544 } |
| 0 | 2545 } |
| 2546 | |
| 2547 | |
| 2548 // Support for java_lang_ref_SoftReference | |
| 2549 | |
| 2550 jlong java_lang_ref_SoftReference::timestamp(oop ref) { | |
| 2551 return ref->long_field(timestamp_offset); | |
| 2552 } | |
| 2553 | |
| 2554 jlong java_lang_ref_SoftReference::clock() { | |
|
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 return *offset; |
| 0 | 2558 } |
| 2559 | |
| 2560 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
|
2561 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
|
2562 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
|
2563 *offset = value; |
| 0 | 2564 } |
| 2565 | |
|
12010
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
2566 // Support for java_lang_invoke_DirectMethodHandle |
|
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
2567 |
|
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
2568 int java_lang_invoke_DirectMethodHandle::_member_offset; |
|
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
2569 |
|
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
2570 oop java_lang_invoke_DirectMethodHandle::member(oop dmh) { |
|
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
2571 oop member_name = NULL; |
|
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
2572 bool is_dmh = dmh->is_oop() && java_lang_invoke_DirectMethodHandle::is_instance(dmh); |
|
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
2573 assert(is_dmh, "a DirectMethodHandle oop is expected"); |
|
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
2574 if (is_dmh) { |
|
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
2575 member_name = dmh->obj_field(member_offset_in_bytes()); |
|
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
2576 } |
|
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
2577 return member_name; |
|
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
2578 } |
|
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
2579 |
|
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
2580 void java_lang_invoke_DirectMethodHandle::compute_offsets() { |
|
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
2581 Klass* klass_oop = SystemDictionary::DirectMethodHandle_klass(); |
|
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
2582 if (klass_oop != NULL && EnableInvokeDynamic) { |
|
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
2583 compute_offset(_member_offset, klass_oop, vmSymbols::member_name(), vmSymbols::java_lang_invoke_MemberName_signature()); |
|
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
2584 } |
|
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
2585 } |
| 0 | 2586 |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2587 // Support for java_lang_invoke_MethodHandle |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2588 |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2589 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
|
2590 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
|
2591 |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2592 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
|
2593 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
|
2594 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
|
2595 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
|
2596 int java_lang_invoke_MemberName::_vmtarget_offset; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2597 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
|
2598 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
|
2599 |
|
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2600 int java_lang_invoke_LambdaForm::_vmentry_offset; |
|
3905
c26de9aef2ed
7071307: MethodHandle bimorphic inlining should consider the frequency
never
parents:
3900
diff
changeset
|
2601 |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2602 void java_lang_invoke_MethodHandle::compute_offsets() { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2603 Klass* klass_oop = SystemDictionary::MethodHandle_klass(); |
| 3938 | 2604 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
|
2605 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
|
2606 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
|
2607 if (_form_offset == 0) { |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2608 EnableInvokeDynamic = false; |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2609 } |
| 710 | 2610 } |
| 2611 } | |
| 2612 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2613 void java_lang_invoke_MemberName::compute_offsets() { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2614 Klass* klass_oop = SystemDictionary::MemberName_klass(); |
| 3938 | 2615 if (klass_oop != NULL && EnableInvokeDynamic) { |
| 2616 compute_offset(_clazz_offset, klass_oop, vmSymbols::clazz_name(), vmSymbols::class_signature()); | |
| 2617 compute_offset(_name_offset, klass_oop, vmSymbols::name_name(), vmSymbols::string_signature()); | |
| 2618 compute_offset(_type_offset, klass_oop, vmSymbols::type_name(), vmSymbols::object_signature()); | |
| 2619 compute_offset(_flags_offset, klass_oop, vmSymbols::flags_name(), vmSymbols::int_signature()); | |
| 2620 MEMBERNAME_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET); | |
| 710 | 2621 } |
| 2622 } | |
| 2623 | |
|
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2624 void java_lang_invoke_LambdaForm::compute_offsets() { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2625 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
|
2626 if (klass_oop != NULL && EnableInvokeDynamic) { |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2627 compute_offset(_vmentry_offset, klass_oop, vmSymbols::vmentry_name(), vmSymbols::java_lang_invoke_MemberName_signature()); |
| 710 | 2628 } |
| 2629 } | |
| 2630 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2631 oop java_lang_invoke_MethodHandle::type(oop mh) { |
| 710 | 2632 return mh->obj_field(_type_offset); |
| 2633 } | |
| 2634 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2635 void java_lang_invoke_MethodHandle::set_type(oop mh, oop mtype) { |
| 710 | 2636 mh->obj_field_put(_type_offset, mtype); |
| 2637 } | |
| 2638 | |
|
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2639 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
|
2640 assert(_form_offset != 0, ""); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2641 return mh->obj_field(_form_offset); |
| 710 | 2642 } |
| 2643 | |
|
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2644 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
|
2645 assert(_form_offset != 0, ""); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2646 mh->obj_field_put(_form_offset, lform); |
| 710 | 2647 } |
| 2648 | |
| 2649 /// MemberName accessors | |
| 2650 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2651 oop java_lang_invoke_MemberName::clazz(oop mname) { |
| 710 | 2652 assert(is_instance(mname), "wrong type"); |
| 2653 return mname->obj_field(_clazz_offset); | |
| 2654 } | |
| 2655 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2656 void java_lang_invoke_MemberName::set_clazz(oop mname, oop clazz) { |
| 710 | 2657 assert(is_instance(mname), "wrong type"); |
| 2658 mname->obj_field_put(_clazz_offset, clazz); | |
| 2659 } | |
| 2660 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2661 oop java_lang_invoke_MemberName::name(oop mname) { |
| 710 | 2662 assert(is_instance(mname), "wrong type"); |
| 2663 return mname->obj_field(_name_offset); | |
| 2664 } | |
| 2665 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2666 void java_lang_invoke_MemberName::set_name(oop mname, oop name) { |
| 710 | 2667 assert(is_instance(mname), "wrong type"); |
| 2668 mname->obj_field_put(_name_offset, name); | |
| 2669 } | |
| 2670 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2671 oop java_lang_invoke_MemberName::type(oop mname) { |
| 710 | 2672 assert(is_instance(mname), "wrong type"); |
| 2673 return mname->obj_field(_type_offset); | |
| 2674 } | |
| 2675 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2676 void java_lang_invoke_MemberName::set_type(oop mname, oop type) { |
| 710 | 2677 assert(is_instance(mname), "wrong type"); |
| 2678 mname->obj_field_put(_type_offset, type); | |
| 2679 } | |
| 2680 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2681 int java_lang_invoke_MemberName::flags(oop mname) { |
| 710 | 2682 assert(is_instance(mname), "wrong type"); |
| 2683 return mname->int_field(_flags_offset); | |
| 2684 } | |
| 2685 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2686 void java_lang_invoke_MemberName::set_flags(oop mname, int flags) { |
| 710 | 2687 assert(is_instance(mname), "wrong type"); |
| 2688 mname->int_field_put(_flags_offset, flags); | |
| 2689 } | |
| 2690 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2691 Metadata* java_lang_invoke_MemberName::vmtarget(oop mname) { |
| 710 | 2692 assert(is_instance(mname), "wrong type"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2693 return (Metadata*)mname->address_field(_vmtarget_offset); |
| 710 | 2694 } |
| 2695 | |
|
10133
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
7629
diff
changeset
|
2696 #if INCLUDE_JVMTI |
|
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
7629
diff
changeset
|
2697 // 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
|
2698 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
|
2699 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
|
2700 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
|
2701 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
|
2702 } |
|
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
7629
diff
changeset
|
2703 #endif // INCLUDE_JVMTI |
|
6337ca4dcad8
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
7629
diff
changeset
|
2704 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2705 void java_lang_invoke_MemberName::set_vmtarget(oop mname, Metadata* ref) { |
| 710 | 2706 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
|
2707 // 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
|
2708 oop dependency = NULL; |
|
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2709 if (ref != NULL) { |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2710 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
|
2711 MN_IS_CONSTRUCTOR | |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2712 MN_IS_FIELD)) { |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2713 case MN_IS_METHOD: |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2714 case MN_IS_CONSTRUCTOR: |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2715 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
|
2716 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
|
2717 break; |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2718 case MN_IS_FIELD: |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2719 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
|
2720 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
|
2721 break; |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2722 default: |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2723 ShouldNotReachHere(); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2724 } |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2725 } |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2726 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
|
2727 // 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
|
2728 // 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
|
2729 // 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
|
2730 mname->obj_field_put(_vmloader_offset, dependency); |
| 710 | 2731 } |
| 2732 | |
|
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2733 intptr_t java_lang_invoke_MemberName::vmindex(oop mname) { |
| 710 | 2734 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
|
2735 return (intptr_t) mname->address_field(_vmindex_offset); |
| 710 | 2736 } |
| 2737 | |
|
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2738 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
|
2739 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
|
2740 mname->address_field_put(_vmindex_offset, (address) index); |
| 710 | 2741 } |
| 2742 | |
|
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2743 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
|
2744 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
|
2745 return lform->obj_field(_vmentry_offset); |
| 710 | 2746 } |
| 2747 | |
| 2748 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2749 // Support for java_lang_invoke_MethodType |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2750 |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2751 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
|
2752 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
|
2753 |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2754 void java_lang_invoke_MethodType::compute_offsets() { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2755 Klass* k = SystemDictionary::MethodType_klass(); |
| 710 | 2756 if (k != NULL) { |
| 2757 compute_offset(_rtype_offset, k, vmSymbols::rtype_name(), vmSymbols::class_signature()); | |
| 2758 compute_offset(_ptypes_offset, k, vmSymbols::ptypes_name(), vmSymbols::class_array_signature()); | |
| 2759 } | |
| 2760 } | |
| 2761 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2762 void java_lang_invoke_MethodType::print_signature(oop mt, outputStream* st) { |
| 710 | 2763 st->print("("); |
| 2764 objArrayOop pts = ptypes(mt); | |
| 2765 for (int i = 0, limit = pts->length(); i < limit; i++) { | |
| 2766 java_lang_Class::print_signature(pts->obj_at(i), st); | |
| 2767 } | |
| 2768 st->print(")"); | |
| 2769 java_lang_Class::print_signature(rtype(mt), st); | |
| 2770 } | |
| 2771 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2772 Symbol* java_lang_invoke_MethodType::as_signature(oop mt, bool intern_if_not_found, TRAPS) { |
| 710 | 2773 ResourceMark rm; |
| 2774 stringStream buffer(128); | |
| 2775 print_signature(mt, &buffer); | |
| 2776 const char* sigstr = buffer.base(); | |
| 2777 int siglen = (int) buffer.size(); | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2778 Symbol *name; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2779 if (!intern_if_not_found) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2780 name = SymbolTable::probe(sigstr, siglen); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2781 } else { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2782 name = SymbolTable::new_symbol(sigstr, siglen, THREAD); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2783 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2784 return name; |
| 710 | 2785 } |
| 2786 | |
|
3461
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2787 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
|
2788 if (mt1 == mt2) |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2789 return true; |
|
3461
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2790 if (rtype(mt1) != rtype(mt2)) |
|
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2791 return false; |
|
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2792 if (ptype_count(mt1) != ptype_count(mt2)) |
|
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2793 return false; |
|
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2794 for (int i = ptype_count(mt1) - 1; i >= 0; i--) { |
|
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2795 if (ptype(mt1, i) != ptype(mt2, i)) |
|
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2796 return false; |
|
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2797 } |
|
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2798 return true; |
|
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2799 } |
|
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2800 |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2801 oop java_lang_invoke_MethodType::rtype(oop mt) { |
| 710 | 2802 assert(is_instance(mt), "must be a MethodType"); |
| 2803 return mt->obj_field(_rtype_offset); | |
| 2804 } | |
| 2805 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2806 objArrayOop java_lang_invoke_MethodType::ptypes(oop mt) { |
| 710 | 2807 assert(is_instance(mt), "must be a MethodType"); |
| 2808 return (objArrayOop) mt->obj_field(_ptypes_offset); | |
| 2809 } | |
| 2810 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2811 oop java_lang_invoke_MethodType::ptype(oop mt, int idx) { |
| 710 | 2812 return ptypes(mt)->obj_at(idx); |
| 2813 } | |
| 2814 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2815 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
|
2816 return ptypes(mt)->length(); |
|
aa62b9388fce
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
1096
diff
changeset
|
2817 } |
|
aa62b9388fce
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
1096
diff
changeset
|
2818 |
|
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2819 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
|
2820 objArrayOop pts = ptypes(mt); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2821 int count = pts->length(); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2822 int slots = 0; |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2823 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
|
2824 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
|
2825 slots += type2size[bt]; |
| 710 | 2826 } |
|
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2827 return slots; |
| 710 | 2828 } |
| 2829 | |
|
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2830 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
|
2831 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
|
2832 return type2size[bt]; |
|
1793
d257356e35f0
6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions
jrose
parents:
1552
diff
changeset
|
2833 } |
|
d257356e35f0
6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions
jrose
parents:
1552
diff
changeset
|
2834 |
| 710 | 2835 |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2836 // Support for java_lang_invoke_CallSite |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2837 |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2838 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
|
2839 |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2840 void java_lang_invoke_CallSite::compute_offsets() { |
|
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2841 if (!EnableInvokeDynamic) return; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2842 Klass* k = SystemDictionary::CallSite_klass(); |
|
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2843 if (k != NULL) { |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2844 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
|
2845 } |
|
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2846 } |
|
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2847 |
| 710 | 2848 |
| 0 | 2849 // Support for java_security_AccessControlContext |
| 2850 | |
| 2851 int java_security_AccessControlContext::_context_offset = 0; | |
| 2852 int java_security_AccessControlContext::_privilegedContext_offset = 0; | |
| 2853 int java_security_AccessControlContext::_isPrivileged_offset = 0; | |
| 11010 | 2854 int java_security_AccessControlContext::_isAuthorized_offset = -1; |
| 0 | 2855 |
| 2856 void java_security_AccessControlContext::compute_offsets() { | |
| 2857 assert(_isPrivileged_offset == 0, "offsets should be initialized only once"); | |
| 2858 fieldDescriptor fd; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2859 InstanceKlass* ik = InstanceKlass::cast(SystemDictionary::AccessControlContext_klass()); |
| 0 | 2860 |
| 2861 if (!ik->find_local_field(vmSymbols::context_name(), vmSymbols::protectiondomain_signature(), &fd)) { | |
| 2862 fatal("Invalid layout of java.security.AccessControlContext"); | |
| 2863 } | |
| 2864 _context_offset = fd.offset(); | |
| 2865 | |
| 2866 if (!ik->find_local_field(vmSymbols::privilegedContext_name(), vmSymbols::accesscontrolcontext_signature(), &fd)) { | |
| 2867 fatal("Invalid layout of java.security.AccessControlContext"); | |
| 2868 } | |
| 2869 _privilegedContext_offset = fd.offset(); | |
| 2870 | |
| 2871 if (!ik->find_local_field(vmSymbols::isPrivileged_name(), vmSymbols::bool_signature(), &fd)) { | |
| 2872 fatal("Invalid layout of java.security.AccessControlContext"); | |
| 2873 } | |
| 2874 _isPrivileged_offset = fd.offset(); | |
| 11010 | 2875 |
| 2876 // The offset may not be present for bootstrapping with older JDK. | |
| 2877 if (ik->find_local_field(vmSymbols::isAuthorized_name(), vmSymbols::bool_signature(), &fd)) { | |
| 2878 _isAuthorized_offset = fd.offset(); | |
| 2879 } | |
| 0 | 2880 } |
| 2881 | |
| 2882 | |
| 11010 | 2883 bool java_security_AccessControlContext::is_authorized(Handle context) { |
| 2884 assert(context.not_null() && context->klass() == SystemDictionary::AccessControlContext_klass(), "Invalid type"); | |
| 2885 assert(_isAuthorized_offset != -1, "should be set"); | |
| 2886 return context->bool_field(_isAuthorized_offset) != 0; | |
| 2887 } | |
| 0 | 2888 |
| 2889 oop java_security_AccessControlContext::create(objArrayHandle context, bool isPrivileged, Handle privileged_context, TRAPS) { | |
| 2890 assert(_isPrivileged_offset != 0, "offsets should have been initialized"); | |
| 2891 // Ensure klass is initialized | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2892 InstanceKlass::cast(SystemDictionary::AccessControlContext_klass())->initialize(CHECK_0); |
| 0 | 2893 // Allocate result |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2894 oop result = InstanceKlass::cast(SystemDictionary::AccessControlContext_klass())->allocate_instance(CHECK_0); |
| 0 | 2895 // Fill in values |
| 2896 result->obj_field_put(_context_offset, context()); | |
| 2897 result->obj_field_put(_privilegedContext_offset, privileged_context()); | |
| 2898 result->bool_field_put(_isPrivileged_offset, isPrivileged); | |
|
11011
be131aa5a529
8011896: Add check for invalid offset for new AccessControlContext isAuthorized field
mullan
parents:
11010
diff
changeset
|
2899 // whitelist AccessControlContexts created by the JVM if present |
|
be131aa5a529
8011896: Add check for invalid offset for new AccessControlContext isAuthorized field
mullan
parents:
11010
diff
changeset
|
2900 if (_isAuthorized_offset != -1) { |
|
be131aa5a529
8011896: Add check for invalid offset for new AccessControlContext isAuthorized field
mullan
parents:
11010
diff
changeset
|
2901 result->bool_field_put(_isAuthorized_offset, true); |
|
be131aa5a529
8011896: Add check for invalid offset for new AccessControlContext isAuthorized field
mullan
parents:
11010
diff
changeset
|
2902 } |
| 0 | 2903 return result; |
| 2904 } | |
| 2905 | |
| 2906 | |
| 2907 // Support for java_lang_ClassLoader | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2908 |
| 3938 | 2909 bool java_lang_ClassLoader::offsets_computed = false; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2910 int java_lang_ClassLoader::_loader_data_offset = -1; |
| 3938 | 2911 int java_lang_ClassLoader::parallelCapable_offset = -1; |
| 2912 | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2913 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
|
2914 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
|
2915 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
|
2916 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2917 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2918 ClassLoaderData* java_lang_ClassLoader::loader_data(oop loader) { |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2919 return *java_lang_ClassLoader::loader_data_addr(loader); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2920 } |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2921 |
| 3938 | 2922 void java_lang_ClassLoader::compute_offsets() { |
| 2923 assert(!offsets_computed, "offsets should be initialized only once"); | |
| 2924 offsets_computed = true; | |
| 2925 | |
| 2926 // 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
|
2927 Klass* k1 = SystemDictionary::ClassLoader_klass(); |
| 3938 | 2928 compute_optional_offset(parallelCapable_offset, |
| 2929 k1, vmSymbols::parallelCapable_name(), vmSymbols::concurrenthashmap_signature()); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2930 |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2931 CLASSLOADER_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET); |
| 3938 | 2932 } |
| 0 | 2933 |
| 2934 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
|
2935 assert(is_instance(loader), "loader must be oop"); |
| 0 | 2936 return loader->obj_field(parent_offset); |
| 2937 } | |
| 2938 | |
|
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2939 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
|
2940 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
|
2941 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
|
2942 oop acl = loader; |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2943 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
|
2944 // 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
|
2945 do { |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2946 acl = parent(acl); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2947 if (cl == acl) { |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2948 return true; |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2949 } |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2950 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
|
2951 } while (acl != NULL); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2952 return false; |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2953 } |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2954 |
| 0 | 2955 |
| 3938 | 2956 // For class loader classes, parallelCapable defined |
| 2957 // based on non-null field | |
| 2958 // Written to by java.lang.ClassLoader, vm only reads this field, doesn't set it | |
| 2959 bool java_lang_ClassLoader::parallelCapable(oop class_loader) { | |
| 2960 if (!JDK_Version::is_gte_jdk17x_version() | |
| 2961 || parallelCapable_offset == -1) { | |
| 2962 // Default for backward compatibility is false | |
| 2963 return false; | |
| 2964 } | |
| 2965 return (class_loader->obj_field(parallelCapable_offset) != NULL); | |
| 2966 } | |
| 2967 | |
| 0 | 2968 bool java_lang_ClassLoader::is_trusted_loader(oop loader) { |
| 2969 // Fix for 4474172; see evaluation for more details | |
| 2970 loader = non_reflection_class_loader(loader); | |
| 2971 | |
| 2972 oop cl = SystemDictionary::java_system_loader(); | |
| 2973 while(cl != NULL) { | |
| 2974 if (cl == loader) return true; | |
| 2975 cl = parent(cl); | |
| 2976 } | |
| 2977 return false; | |
| 2978 } | |
| 2979 | |
| 2980 oop java_lang_ClassLoader::non_reflection_class_loader(oop loader) { | |
| 2981 if (loader != NULL) { | |
| 2982 // See whether this is one of the class loaders associated with | |
| 2983 // the generated bytecodes for reflection, and if so, "magically" | |
| 2984 // delegate to its parent to prevent class loading from occurring | |
| 2985 // 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
|
2986 Klass* delegating_cl_class = SystemDictionary::reflect_DelegatingClassLoader_klass(); |
| 0 | 2987 // This might be null in non-1.4 JDKs |
| 2988 if (delegating_cl_class != NULL && loader->is_a(delegating_cl_class)) { | |
| 2989 return parent(loader); | |
| 2990 } | |
| 2991 } | |
| 2992 return loader; | |
| 2993 } | |
| 2994 | |
| 2995 | |
| 2996 // Support for java_lang_System | |
| 2997 int java_lang_System::in_offset_in_bytes() { | |
|
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
2998 return (InstanceMirrorKlass::offset_of_static_fields() + static_in_offset); |
| 0 | 2999 } |
| 3000 | |
| 3001 | |
| 3002 int java_lang_System::out_offset_in_bytes() { | |
|
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
3003 return (InstanceMirrorKlass::offset_of_static_fields() + static_out_offset); |
| 0 | 3004 } |
| 3005 | |
| 3006 | |
| 3007 int java_lang_System::err_offset_in_bytes() { | |
|
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
3008 return (InstanceMirrorKlass::offset_of_static_fields() + static_err_offset); |
| 0 | 3009 } |
| 3010 | |
| 3011 | |
| 11010 | 3012 bool java_lang_System::has_security_manager() { |
| 3013 InstanceKlass* ik = InstanceKlass::cast(SystemDictionary::System_klass()); | |
| 3014 address addr = ik->static_field_addr(static_security_offset); | |
| 3015 if (UseCompressedOops) { | |
| 3016 return oopDesc::load_decode_heap_oop((narrowOop *)addr) != NULL; | |
| 3017 } else { | |
| 3018 return oopDesc::load_decode_heap_oop((oop*)addr) != NULL; | |
| 3019 } | |
| 3020 } | |
| 0 | 3021 |
| 3938 | 3022 int java_lang_Class::_klass_offset; |
| 3023 int java_lang_Class::_array_klass_offset; | |
| 3024 int java_lang_Class::_oop_size_offset; | |
| 3025 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
|
3026 int java_lang_Class::_protection_domain_offset; |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10155
diff
changeset
|
3027 int java_lang_Class::_init_lock_offset; |
|
6bd680e9ea35
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
10155
diff
changeset
|
3028 int java_lang_Class::_signers_offset; |
|
6948
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
3029 #ifdef GRAAL |
|
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
3030 int java_lang_Class::_graal_mirror_offset; |
|
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
3031 #endif |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3032 GrowableArray<Klass*>* java_lang_Class::_fixup_mirror_list = NULL; |
| 0 | 3033 int java_lang_Throwable::backtrace_offset; |
| 3034 int java_lang_Throwable::detailMessage_offset; | |
| 3035 int java_lang_Throwable::cause_offset; | |
| 3036 int java_lang_Throwable::stackTrace_offset; | |
|
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
3037 int java_lang_Throwable::static_unassigned_stacktrace_offset; |
| 0 | 3038 int java_lang_reflect_AccessibleObject::override_offset; |
| 3039 int java_lang_reflect_Method::clazz_offset; | |
| 3040 int java_lang_reflect_Method::name_offset; | |
| 3041 int java_lang_reflect_Method::returnType_offset; | |
| 3042 int java_lang_reflect_Method::parameterTypes_offset; | |
| 3043 int java_lang_reflect_Method::exceptionTypes_offset; | |
| 3044 int java_lang_reflect_Method::slot_offset; | |
| 3045 int java_lang_reflect_Method::modifiers_offset; | |
| 3046 int java_lang_reflect_Method::signature_offset; | |
| 3047 int java_lang_reflect_Method::annotations_offset; | |
| 3048 int java_lang_reflect_Method::parameter_annotations_offset; | |
| 3049 int java_lang_reflect_Method::annotation_default_offset; | |
|
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
3050 int java_lang_reflect_Method::type_annotations_offset; |
| 0 | 3051 int java_lang_reflect_Constructor::clazz_offset; |
| 3052 int java_lang_reflect_Constructor::parameterTypes_offset; | |
| 3053 int java_lang_reflect_Constructor::exceptionTypes_offset; | |
| 3054 int java_lang_reflect_Constructor::slot_offset; | |
| 3055 int java_lang_reflect_Constructor::modifiers_offset; | |
| 3056 int java_lang_reflect_Constructor::signature_offset; | |
| 3057 int java_lang_reflect_Constructor::annotations_offset; | |
| 3058 int java_lang_reflect_Constructor::parameter_annotations_offset; | |
|
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
3059 int java_lang_reflect_Constructor::type_annotations_offset; |
| 0 | 3060 int java_lang_reflect_Field::clazz_offset; |
| 3061 int java_lang_reflect_Field::name_offset; | |
| 3062 int java_lang_reflect_Field::type_offset; | |
| 3063 int java_lang_reflect_Field::slot_offset; | |
| 3064 int java_lang_reflect_Field::modifiers_offset; | |
| 3065 int java_lang_reflect_Field::signature_offset; | |
| 3066 int java_lang_reflect_Field::annotations_offset; | |
|
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
3067 int java_lang_reflect_Field::type_annotations_offset; |
|
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
3068 int java_lang_reflect_Parameter::name_offset; |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
3069 int java_lang_reflect_Parameter::modifiers_offset; |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
3070 int java_lang_reflect_Parameter::index_offset; |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
3071 int java_lang_reflect_Parameter::executable_offset; |
| 0 | 3072 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
|
3073 int java_lang_boxing_object::long_value_offset; |
| 0 | 3074 int java_lang_ref_Reference::referent_offset; |
| 3075 int java_lang_ref_Reference::queue_offset; | |
| 3076 int java_lang_ref_Reference::next_offset; | |
| 3077 int java_lang_ref_Reference::discovered_offset; | |
| 3078 int java_lang_ref_Reference::static_lock_offset; | |
| 3079 int java_lang_ref_Reference::static_pending_offset; | |
| 3080 int java_lang_ref_Reference::number_of_fake_oop_fields; | |
| 3081 int java_lang_ref_SoftReference::timestamp_offset; | |
| 3082 int java_lang_ref_SoftReference::static_clock_offset; | |
| 3083 int java_lang_ClassLoader::parent_offset; | |
| 3084 int java_lang_System::static_in_offset; | |
| 3085 int java_lang_System::static_out_offset; | |
| 3086 int java_lang_System::static_err_offset; | |
| 11010 | 3087 int java_lang_System::static_security_offset; |
| 0 | 3088 int java_lang_StackTraceElement::declaringClass_offset; |
| 3089 int java_lang_StackTraceElement::methodName_offset; | |
| 3090 int java_lang_StackTraceElement::fileName_offset; | |
| 3091 int java_lang_StackTraceElement::lineNumber_offset; | |
| 3092 int java_lang_AssertionStatusDirectives::classes_offset; | |
| 3093 int java_lang_AssertionStatusDirectives::classEnabled_offset; | |
| 3094 int java_lang_AssertionStatusDirectives::packages_offset; | |
| 3095 int java_lang_AssertionStatusDirectives::packageEnabled_offset; | |
| 3096 int java_lang_AssertionStatusDirectives::deflt_offset; | |
| 3097 int java_nio_Buffer::_limit_offset; | |
| 3098 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
|
3099 int sun_reflect_ConstantPool::_oop_offset; |
| 0 | 3100 int sun_reflect_UnsafeStaticFieldAccessorImpl::_base_offset; |
| 3101 | |
| 3102 | |
| 3103 // Support for java_lang_StackTraceElement | |
| 3104 | |
| 3105 void java_lang_StackTraceElement::set_fileName(oop element, oop value) { | |
| 3106 element->obj_field_put(fileName_offset, value); | |
| 3107 } | |
| 3108 | |
| 3109 void java_lang_StackTraceElement::set_declaringClass(oop element, oop value) { | |
| 3110 element->obj_field_put(declaringClass_offset, value); | |
| 3111 } | |
| 3112 | |
| 3113 void java_lang_StackTraceElement::set_methodName(oop element, oop value) { | |
| 3114 element->obj_field_put(methodName_offset, value); | |
| 3115 } | |
| 3116 | |
| 3117 void java_lang_StackTraceElement::set_lineNumber(oop element, int value) { | |
| 3118 element->int_field_put(lineNumber_offset, value); | |
| 3119 } | |
| 3120 | |
| 3121 | |
| 3122 // Support for java Assertions - java_lang_AssertionStatusDirectives. | |
| 3123 | |
| 3124 void java_lang_AssertionStatusDirectives::set_classes(oop o, oop val) { | |
| 3125 o->obj_field_put(classes_offset, val); | |
| 3126 } | |
| 3127 | |
| 3128 void java_lang_AssertionStatusDirectives::set_classEnabled(oop o, oop val) { | |
| 3129 o->obj_field_put(classEnabled_offset, val); | |
| 3130 } | |
| 3131 | |
| 3132 void java_lang_AssertionStatusDirectives::set_packages(oop o, oop val) { | |
| 3133 o->obj_field_put(packages_offset, val); | |
| 3134 } | |
| 3135 | |
| 3136 void java_lang_AssertionStatusDirectives::set_packageEnabled(oop o, oop val) { | |
| 3137 o->obj_field_put(packageEnabled_offset, val); | |
| 3138 } | |
| 3139 | |
| 3140 void java_lang_AssertionStatusDirectives::set_deflt(oop o, bool val) { | |
| 3141 o->bool_field_put(deflt_offset, val); | |
| 3142 } | |
| 3143 | |
| 3144 | |
| 3145 // Support for intrinsification of java.nio.Buffer.checkIndex | |
| 3146 int java_nio_Buffer::limit_offset() { | |
| 3147 return _limit_offset; | |
| 3148 } | |
| 3149 | |
| 3150 | |
| 3151 void java_nio_Buffer::compute_offsets() { | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3152 Klass* k = SystemDictionary::nio_Buffer_klass(); |
|
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3153 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
|
3154 compute_offset(_limit_offset, k, vmSymbols::limit_name(), vmSymbols::int_signature()); |
| 0 | 3155 } |
| 3156 | |
| 3157 void java_util_concurrent_locks_AbstractOwnableSynchronizer::initialize(TRAPS) { | |
| 3158 if (_owner_offset != 0) return; | |
| 3159 | |
| 3160 assert(JDK_Version::is_gte_jdk16x_version(), "Must be JDK 1.6 or later"); | |
| 3161 SystemDictionary::load_abstract_ownable_synchronizer_klass(CHECK); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3162 Klass* k = SystemDictionary::abstract_ownable_synchronizer_klass(); |
|
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3163 compute_offset(_owner_offset, k, |
| 0 | 3164 vmSymbols::exclusive_owner_thread_name(), vmSymbols::thread_signature()); |
| 3165 } | |
| 3166 | |
| 3167 oop java_util_concurrent_locks_AbstractOwnableSynchronizer::get_owner_threadObj(oop obj) { | |
| 3168 assert(_owner_offset != 0, "Must be initialized"); | |
| 3169 return obj->obj_field(_owner_offset); | |
| 3170 } | |
| 3171 | |
| 3172 // Compute hard-coded offsets | |
| 3173 // Invoked before SystemDictionary::initialize, so pre-loaded classes | |
| 3174 // are not available to determine the offset_of_static_fields. | |
| 3175 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
|
3176 const int x = heapOopSize; |
|
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3177 const int header = instanceOopDesc::base_offset_in_bytes(); |
| 0 | 3178 |
| 3179 // Throwable Class | |
| 3180 java_lang_Throwable::backtrace_offset = java_lang_Throwable::hc_backtrace_offset * x + header; | |
| 3181 java_lang_Throwable::detailMessage_offset = java_lang_Throwable::hc_detailMessage_offset * x + header; | |
| 3182 java_lang_Throwable::cause_offset = java_lang_Throwable::hc_cause_offset * x + header; | |
| 3183 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
|
3184 java_lang_Throwable::static_unassigned_stacktrace_offset = java_lang_Throwable::hc_static_unassigned_stacktrace_offset * x; |
| 0 | 3185 |
| 3186 // java_lang_boxing_object | |
|
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3187 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
|
3188 java_lang_boxing_object::long_value_offset = align_size_up((java_lang_boxing_object::hc_value_offset + header), BytesPerLong); |
| 0 | 3189 |
| 3190 // java_lang_ref_Reference: | |
| 3191 java_lang_ref_Reference::referent_offset = java_lang_ref_Reference::hc_referent_offset * x + header; | |
| 3192 java_lang_ref_Reference::queue_offset = java_lang_ref_Reference::hc_queue_offset * x + header; | |
| 3193 java_lang_ref_Reference::next_offset = java_lang_ref_Reference::hc_next_offset * x + header; | |
| 3194 java_lang_ref_Reference::discovered_offset = java_lang_ref_Reference::hc_discovered_offset * x + header; | |
| 3195 java_lang_ref_Reference::static_lock_offset = java_lang_ref_Reference::hc_static_lock_offset * x; | |
| 3196 java_lang_ref_Reference::static_pending_offset = java_lang_ref_Reference::hc_static_pending_offset * x; | |
| 3197 // Artificial fields for java_lang_ref_Reference | |
| 3198 // The first field is for the discovered field added in 1.4 | |
| 3199 java_lang_ref_Reference::number_of_fake_oop_fields = 1; | |
| 3200 | |
| 3201 // 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
|
3202 java_lang_ref_SoftReference::timestamp_offset = align_size_up((java_lang_ref_SoftReference::hc_timestamp_offset * x + header), BytesPerLong); |
| 0 | 3203 // Don't multiply static fields because they are always in wordSize units |
| 3204 java_lang_ref_SoftReference::static_clock_offset = java_lang_ref_SoftReference::hc_static_clock_offset * x; | |
| 3205 | |
| 3206 // java_lang_ClassLoader | |
| 3207 java_lang_ClassLoader::parent_offset = java_lang_ClassLoader::hc_parent_offset * x + header; | |
| 3208 | |
| 3209 // java_lang_System | |
| 3210 java_lang_System::static_in_offset = java_lang_System::hc_static_in_offset * x; | |
| 3211 java_lang_System::static_out_offset = java_lang_System::hc_static_out_offset * x; | |
| 3212 java_lang_System::static_err_offset = java_lang_System::hc_static_err_offset * x; | |
| 11010 | 3213 java_lang_System::static_security_offset = java_lang_System::hc_static_security_offset * x; |
| 0 | 3214 |
| 3215 // java_lang_StackTraceElement | |
| 3216 java_lang_StackTraceElement::declaringClass_offset = java_lang_StackTraceElement::hc_declaringClass_offset * x + header; | |
| 3217 java_lang_StackTraceElement::methodName_offset = java_lang_StackTraceElement::hc_methodName_offset * x + header; | |
| 3218 java_lang_StackTraceElement::fileName_offset = java_lang_StackTraceElement::hc_fileName_offset * x + header; | |
| 3219 java_lang_StackTraceElement::lineNumber_offset = java_lang_StackTraceElement::hc_lineNumber_offset * x + header; | |
| 3220 java_lang_AssertionStatusDirectives::classes_offset = java_lang_AssertionStatusDirectives::hc_classes_offset * x + header; | |
| 3221 java_lang_AssertionStatusDirectives::classEnabled_offset = java_lang_AssertionStatusDirectives::hc_classEnabled_offset * x + header; | |
| 3222 java_lang_AssertionStatusDirectives::packages_offset = java_lang_AssertionStatusDirectives::hc_packages_offset * x + header; | |
| 3223 java_lang_AssertionStatusDirectives::packageEnabled_offset = java_lang_AssertionStatusDirectives::hc_packageEnabled_offset * x + header; | |
| 3224 java_lang_AssertionStatusDirectives::deflt_offset = java_lang_AssertionStatusDirectives::hc_deflt_offset * x + header; | |
| 3225 | |
| 3226 } | |
| 3227 | |
| 3228 | |
| 3229 // Compute non-hard-coded field offsets of all the classes in this file | |
| 3230 void JavaClasses::compute_offsets() { | |
| 3938 | 3231 // java_lang_Class::compute_offsets was called earlier in bootstrap |
| 3232 java_lang_ClassLoader::compute_offsets(); | |
| 0 | 3233 java_lang_Thread::compute_offsets(); |
| 3234 java_lang_ThreadGroup::compute_offsets(); | |
|
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2379
diff
changeset
|
3235 if (EnableInvokeDynamic) { |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
3236 java_lang_invoke_MethodHandle::compute_offsets(); |
|
12010
ca0165daa6ec
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
11020
diff
changeset
|
3237 java_lang_invoke_DirectMethodHandle::compute_offsets(); |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
3238 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
|
3239 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
|
3240 java_lang_invoke_MethodType::compute_offsets(); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
3241 java_lang_invoke_CallSite::compute_offsets(); |
|
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
3242 } |
| 0 | 3243 java_security_AccessControlContext::compute_offsets(); |
| 3244 // Initialize reflection classes. The layouts of these classes | |
| 3245 // changed with the new reflection implementation in JDK 1.4, and | |
| 3246 // since the Universe doesn't know what JDK version it is until this | |
| 3247 // point we defer computation of these offsets until now. | |
| 3248 java_lang_reflect_AccessibleObject::compute_offsets(); | |
| 3249 java_lang_reflect_Method::compute_offsets(); | |
| 3250 java_lang_reflect_Constructor::compute_offsets(); | |
| 3251 java_lang_reflect_Field::compute_offsets(); | |
| 3252 if (JDK_Version::is_gte_jdk14x_version()) { | |
| 3253 java_nio_Buffer::compute_offsets(); | |
| 3254 } | |
| 3255 if (JDK_Version::is_gte_jdk15x_version()) { | |
| 3256 sun_reflect_ConstantPool::compute_offsets(); | |
| 3257 sun_reflect_UnsafeStaticFieldAccessorImpl::compute_offsets(); | |
| 3258 } | |
|
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
3259 if (JDK_Version::is_jdk18x_version()) |
|
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
3260 java_lang_reflect_Parameter::compute_offsets(); |
| 710 | 3261 |
| 3262 // generated interpreter code wants to know about the offsets we just computed: | |
| 3263 AbstractAssembler::update_delayed_values(); | |
| 0 | 3264 } |
| 3265 | |
| 3266 #ifndef PRODUCT | |
| 3267 | |
| 3268 // These functions exist to assert the validity of hard-coded field offsets to guard | |
| 3269 // against changes in the class files | |
| 3270 | |
| 3271 bool JavaClasses::check_offset(const char *klass_name, int hardcoded_offset, const char *field_name, const char* field_sig) { | |
| 3272 EXCEPTION_MARK; | |
| 3273 fieldDescriptor fd; | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3274 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
|
3275 Klass* k = SystemDictionary::resolve_or_fail(klass_sym, true, CATCH); |
| 0 | 3276 instanceKlassHandle h_klass (THREAD, k); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3277 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
|
3278 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
|
3279 if (!h_klass->find_local_field(f_name, f_sig, &fd)) { |
| 0 | 3280 tty->print_cr("Nonstatic field %s.%s not found", klass_name, field_name); |
| 3281 return false; | |
| 3282 } | |
| 3283 if (fd.is_static()) { | |
| 3284 tty->print_cr("Nonstatic field %s.%s appears to be static", klass_name, field_name); | |
| 3285 return false; | |
| 3286 } | |
| 3287 if (fd.offset() == hardcoded_offset ) { | |
| 3288 return true; | |
| 3289 } else { | |
| 3290 tty->print_cr("Offset of nonstatic field %s.%s is hardcoded as %d but should really be %d.", | |
| 3291 klass_name, field_name, hardcoded_offset, fd.offset()); | |
| 3292 return false; | |
| 3293 } | |
| 3294 } | |
| 3295 | |
| 3296 | |
| 3297 bool JavaClasses::check_static_offset(const char *klass_name, int hardcoded_offset, const char *field_name, const char* field_sig) { | |
| 3298 EXCEPTION_MARK; | |
| 3299 fieldDescriptor fd; | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3300 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
|
3301 Klass* k = SystemDictionary::resolve_or_fail(klass_sym, true, CATCH); |
| 0 | 3302 instanceKlassHandle h_klass (THREAD, k); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3303 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
|
3304 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
|
3305 if (!h_klass->find_local_field(f_name, f_sig, &fd)) { |
| 0 | 3306 tty->print_cr("Static field %s.%s not found", klass_name, field_name); |
| 3307 return false; | |
| 3308 } | |
| 3309 if (!fd.is_static()) { | |
| 3310 tty->print_cr("Static field %s.%s appears to be nonstatic", klass_name, field_name); | |
| 3311 return false; | |
| 3312 } | |
|
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
3313 if (fd.offset() == hardcoded_offset + InstanceMirrorKlass::offset_of_static_fields()) { |
| 0 | 3314 return true; |
| 3315 } else { | |
|
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
3316 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 | 3317 return false; |
| 3318 } | |
| 3319 } | |
| 3320 | |
| 3321 | |
|
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3322 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
|
3323 EXCEPTION_MARK; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3324 fieldDescriptor fd; |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3325 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
|
3326 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
|
3327 instanceKlassHandle h_klass (THREAD, k); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3328 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
|
3329 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
|
3330 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
|
3331 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
|
3332 return false; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3333 } |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3334 if (!fd.is_static() || !fd.has_initial_value()) { |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3335 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
|
3336 return false; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3337 } |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3338 if (!fd.initial_value_tag().is_int()) { |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3339 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
|
3340 return false; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3341 } |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3342 jint field_value = fd.int_initial_value(); |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3343 if (field_value == hardcoded_constant) { |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3344 return true; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3345 } else { |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3346 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
|
3347 return false; |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3348 } |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3349 } |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3350 |
|
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3351 |
| 0 | 3352 // Check the hard-coded field offsets of all the classes in this file |
| 3353 | |
| 3354 void JavaClasses::check_offsets() { | |
| 3355 bool valid = true; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3356 HandleMark hm; |
| 0 | 3357 |
| 3358 #define CHECK_OFFSET(klass_name, cpp_klass_name, field_name, field_sig) \ | |
| 3359 valid &= check_offset(klass_name, cpp_klass_name :: field_name ## _offset, #field_name, field_sig) | |
| 3360 | |
|
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3361 #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
|
3362 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
|
3363 |
| 0 | 3364 #define CHECK_STATIC_OFFSET(klass_name, cpp_klass_name, field_name, field_sig) \ |
| 3365 valid &= check_static_offset(klass_name, cpp_klass_name :: static_ ## field_name ## _offset, #field_name, field_sig) | |
| 3366 | |
|
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3367 #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
|
3368 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
|
3369 |
| 0 | 3370 // java.lang.String |
| 3371 | |
| 3372 CHECK_OFFSET("java/lang/String", java_lang_String, value, "[C"); | |
| 6057 | 3373 if (java_lang_String::has_offset_field()) { |
| 3374 CHECK_OFFSET("java/lang/String", java_lang_String, offset, "I"); | |
| 3375 CHECK_OFFSET("java/lang/String", java_lang_String, count, "I"); | |
| 3376 } | |
| 3377 if (java_lang_String::has_hash_field()) { | |
| 3378 CHECK_OFFSET("java/lang/String", java_lang_String, hash, "I"); | |
| 3379 } | |
| 0 | 3380 |
| 3381 // java.lang.Class | |
| 3382 | |
| 3383 // Fake fields | |
| 3384 // CHECK_OFFSET("java/lang/Class", java_lang_Class, klass); // %%% this needs to be checked | |
| 3385 // CHECK_OFFSET("java/lang/Class", java_lang_Class, array_klass); // %%% this needs to be checked | |
| 3386 | |
| 3387 // java.lang.Throwable | |
| 3388 | |
| 3389 CHECK_OFFSET("java/lang/Throwable", java_lang_Throwable, backtrace, "Ljava/lang/Object;"); | |
| 3390 CHECK_OFFSET("java/lang/Throwable", java_lang_Throwable, detailMessage, "Ljava/lang/String;"); | |
| 3391 CHECK_OFFSET("java/lang/Throwable", java_lang_Throwable, cause, "Ljava/lang/Throwable;"); | |
| 3392 CHECK_OFFSET("java/lang/Throwable", java_lang_Throwable, stackTrace, "[Ljava/lang/StackTraceElement;"); | |
| 3393 | |
| 3394 // Boxed primitive objects (java_lang_boxing_object) | |
| 3395 | |
| 3396 CHECK_OFFSET("java/lang/Boolean", java_lang_boxing_object, value, "Z"); | |
| 3397 CHECK_OFFSET("java/lang/Character", java_lang_boxing_object, value, "C"); | |
| 3398 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
|
3399 CHECK_LONG_OFFSET("java/lang/Double", java_lang_boxing_object, value, "D"); |
| 0 | 3400 CHECK_OFFSET("java/lang/Byte", java_lang_boxing_object, value, "B"); |
| 3401 CHECK_OFFSET("java/lang/Short", java_lang_boxing_object, value, "S"); | |
| 3402 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
|
3403 CHECK_LONG_OFFSET("java/lang/Long", java_lang_boxing_object, value, "J"); |
| 0 | 3404 |
| 3405 // java.lang.ClassLoader | |
| 3406 | |
| 3407 CHECK_OFFSET("java/lang/ClassLoader", java_lang_ClassLoader, parent, "Ljava/lang/ClassLoader;"); | |
| 3408 | |
| 3409 // java.lang.System | |
| 3410 | |
| 3411 CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, in, "Ljava/io/InputStream;"); | |
| 3412 CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, out, "Ljava/io/PrintStream;"); | |
| 3413 CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, err, "Ljava/io/PrintStream;"); | |
| 11010 | 3414 CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, security, "Ljava/lang/SecurityManager;"); |
| 0 | 3415 |
| 3416 // java.lang.StackTraceElement | |
| 3417 | |
| 3418 CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, declaringClass, "Ljava/lang/String;"); | |
| 3419 CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, methodName, "Ljava/lang/String;"); | |
| 3420 CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, fileName, "Ljava/lang/String;"); | |
| 3421 CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, lineNumber, "I"); | |
| 3422 | |
| 3423 // java.lang.ref.Reference | |
| 3424 | |
| 3425 CHECK_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, referent, "Ljava/lang/Object;"); | |
| 3426 CHECK_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, queue, "Ljava/lang/ref/ReferenceQueue;"); | |
| 3427 CHECK_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, next, "Ljava/lang/ref/Reference;"); | |
| 3428 // Fake field | |
| 3429 //CHECK_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, discovered, "Ljava/lang/ref/Reference;"); | |
| 3430 CHECK_STATIC_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, lock, "Ljava/lang/ref/Reference$Lock;"); | |
| 3431 CHECK_STATIC_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, pending, "Ljava/lang/ref/Reference;"); | |
| 3432 | |
| 3433 // java.lang.ref.SoftReference | |
| 3434 | |
| 3435 CHECK_OFFSET("java/lang/ref/SoftReference", java_lang_ref_SoftReference, timestamp, "J"); | |
| 3436 CHECK_STATIC_OFFSET("java/lang/ref/SoftReference", java_lang_ref_SoftReference, clock, "J"); | |
| 3437 | |
| 3438 // java.lang.AssertionStatusDirectives | |
| 3439 // | |
| 3440 // The CheckAssertionStatusDirectives boolean can be removed from here and | |
| 3441 // globals.hpp after the AssertionStatusDirectives class has been integrated | |
| 3442 // into merlin "for some time." Without it, the vm will fail with early | |
| 3443 // merlin builds. | |
| 3444 | |
| 3445 if (CheckAssertionStatusDirectives && JDK_Version::is_gte_jdk14x_version()) { | |
| 3446 const char* nm = "java/lang/AssertionStatusDirectives"; | |
| 3447 const char* sig = "[Ljava/lang/String;"; | |
| 3448 CHECK_OFFSET(nm, java_lang_AssertionStatusDirectives, classes, sig); | |
| 3449 CHECK_OFFSET(nm, java_lang_AssertionStatusDirectives, classEnabled, "[Z"); | |
| 3450 CHECK_OFFSET(nm, java_lang_AssertionStatusDirectives, packages, sig); | |
| 3451 CHECK_OFFSET(nm, java_lang_AssertionStatusDirectives, packageEnabled, "[Z"); | |
| 3452 CHECK_OFFSET(nm, java_lang_AssertionStatusDirectives, deflt, "Z"); | |
| 3453 } | |
| 3454 | |
| 3455 if (!valid) vm_exit_during_initialization("Hard-coded field offset verification failed"); | |
| 3456 } | |
| 3457 | |
| 3458 #endif // PRODUCT | |
| 3459 | |
| 3938 | 3460 int InjectedField::compute_offset() { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3461 Klass* klass_oop = klass(); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3462 for (AllFieldStream fs(InstanceKlass::cast(klass_oop)); !fs.done(); fs.next()) { |
| 3938 | 3463 if (!may_be_java && !fs.access_flags().is_internal()) { |
| 3464 // Only look at injected fields | |
| 3465 continue; | |
| 3466 } | |
| 3467 if (fs.name() == name() && fs.signature() == signature()) { | |
| 3468 return fs.offset(); | |
| 3469 } | |
| 3470 } | |
| 3471 ResourceMark rm; | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3472 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
|
3473 #ifndef PRODUCT |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
3474 klass_oop->print(); |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
3475 tty->print_cr("all fields:"); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3476 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
|
3477 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
|
3478 } |
|
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
3479 #endif //PRODUCT |
| 3938 | 3480 fatal("Invalid layout of preloaded class"); |
| 3481 return -1; | |
| 3482 } | |
| 3483 | |
| 0 | 3484 void javaClasses_init() { |
| 3485 JavaClasses::compute_offsets(); | |
| 3486 JavaClasses::check_offsets(); | |
| 3487 FilteredFieldsMap::initialize(); // must be done after computing offsets. | |
| 3488 } |