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