author | iklam |
Mon, 20 Aug 2018 13:58:23 -0700 | |
changeset 51467 | 12997ebbc0d8 |
parent 51444 | 3e5d28e6de32 |
child 51491 | 187c84a5efe1 |
permissions | -rw-r--r-- |
1 | 1 |
/* |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
2 |
* Copyright (c) 1997, 2018, 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" |
36508 | 27 |
#include "classfile/classLoaderData.inline.hpp" |
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
27694
diff
changeset
|
28 |
#include "classfile/javaClasses.inline.hpp" |
36508 | 29 |
#include "classfile/moduleEntry.hpp" |
24426
0a69c8cdfca9
8038654: Separate SymbolTable and StringTable code
gziemski
parents:
24237
diff
changeset
|
30 |
#include "classfile/stringTable.hpp" |
7397 | 31 |
#include "classfile/vmSymbols.hpp" |
32 |
#include "code/debugInfo.hpp" |
|
34195
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33638
diff
changeset
|
33 |
#include "code/dependencyContext.hpp" |
7397 | 34 |
#include "code/pcDesc.hpp" |
35 |
#include "interpreter/interpreter.hpp" |
|
49593
4dd58ecc9912
8200105: Remove cyclic dependency between oop.inline.hpp and collectedHeap.inline.hpp
stefank
parents:
49592
diff
changeset
|
36 |
#include "interpreter/linkResolver.hpp" |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
37 |
#include "logging/log.hpp" |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
38 |
#include "logging/logStream.hpp" |
7397 | 39 |
#include "memory/oopFactory.hpp" |
49329 | 40 |
#include "memory/metaspaceShared.hpp" |
7397 | 41 |
#include "memory/resourceArea.hpp" |
49359
59f6547e151f
8199264: Remove universe.inline.hpp to simplify include dependencies
stefank
parents:
49350
diff
changeset
|
42 |
#include "memory/universe.hpp" |
10546 | 43 |
#include "oops/fieldStreams.hpp" |
7397 | 44 |
#include "oops/instanceKlass.hpp" |
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
45 |
#include "oops/instanceMirrorKlass.hpp" |
7397 | 46 |
#include "oops/klass.hpp" |
49340
4e82736053ae
8191102: Incorrect include file use in classLoader.hpp
hseigel
parents:
49329
diff
changeset
|
47 |
#include "oops/method.inline.hpp" |
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
27694
diff
changeset
|
48 |
#include "oops/objArrayOop.inline.hpp" |
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
27694
diff
changeset
|
49 |
#include "oops/oop.inline.hpp" |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
50 |
#include "oops/symbol.hpp" |
49036
bc92debe57e4
8197999: Accessors in typeArrayOopDesc should use new Access API
rkennke
parents:
48823
diff
changeset
|
51 |
#include "oops/typeArrayOop.inline.hpp" |
46505
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
52 |
#include "prims/resolvedMethodTable.hpp" |
51467
12997ebbc0d8
8209647: constantPoolHandle::constantPoolHandle(ConstantPool*) when precompiled header is disabled
iklam
parents:
51444
diff
changeset
|
53 |
#include "runtime/fieldDescriptor.inline.hpp" |
49480
d7df2dd501ce
8199809: Don't include frame.inline.hpp and other.inline.hpp from .hpp files
coleenp
parents:
49473
diff
changeset
|
54 |
#include "runtime/frame.inline.hpp" |
7397 | 55 |
#include "runtime/handles.inline.hpp" |
49449
ef5d5d343e2a
8199263: Split interfaceSupport.hpp to not require including .inline.hpp files
coleenp
parents:
49359
diff
changeset
|
56 |
#include "runtime/interfaceSupport.inline.hpp" |
7397 | 57 |
#include "runtime/java.hpp" |
58 |
#include "runtime/javaCalls.hpp" |
|
49192
6734eeef4283
8198474: Move JNIHandles::resolve into jniHandles.inline.hpp
kbarrett
parents:
49041
diff
changeset
|
59 |
#include "runtime/jniHandles.inline.hpp" |
7397 | 60 |
#include "runtime/safepoint.hpp" |
49594
898ef81cbc0e
8200106: Move NoSafepointVerifier out from gcLocker.hpp
stefank
parents:
49593
diff
changeset
|
61 |
#include "runtime/safepointVerifiers.hpp" |
14583
d70ee55535f4
8003935: Simplify the needed includes for using Thread::current()
stefank
parents:
14490
diff
changeset
|
62 |
#include "runtime/thread.inline.hpp" |
49480
d7df2dd501ce
8199809: Don't include frame.inline.hpp and other.inline.hpp from .hpp files
coleenp
parents:
49473
diff
changeset
|
63 |
#include "runtime/vframe.inline.hpp" |
46625 | 64 |
#include "utilities/align.hpp" |
7397 | 65 |
#include "utilities/preserveException.hpp" |
33160
c59f1676d27e
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32582
diff
changeset
|
66 |
#if INCLUDE_JVMCI |
c59f1676d27e
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32582
diff
changeset
|
67 |
#include "jvmci/jvmciJavaClasses.hpp" |
c59f1676d27e
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32582
diff
changeset
|
68 |
#endif |
c59f1676d27e
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32582
diff
changeset
|
69 |
|
10546 | 70 |
#define INJECTED_FIELD_COMPUTE_OFFSET(klass, name, signature, may_be_java) \ |
71 |
klass::_##name##_offset = JavaClasses::compute_injected_offset(JavaClasses::klass##_##name##_enum); |
|
72 |
||
49329 | 73 |
#if INCLUDE_CDS |
74 |
#define INJECTED_FIELD_SERIALIZE_OFFSET(klass, name, signature, may_be_java) \ |
|
75 |
f->do_u4((u4*)&_##name##_offset); |
|
76 |
#endif |
|
77 |
||
10546 | 78 |
#define DECLARE_INJECTED_FIELD(klass, name, signature, may_be_java) \ |
79 |
{ SystemDictionary::WK_KLASS_ENUM_NAME(klass), vmSymbols::VM_SYMBOL_ENUM_NAME(name##_name), vmSymbols::VM_SYMBOL_ENUM_NAME(signature), may_be_java }, |
|
80 |
||
81 |
InjectedField JavaClasses::_injected_fields[] = { |
|
82 |
ALL_INJECTED_FIELDS(DECLARE_INJECTED_FIELD) |
|
83 |
}; |
|
84 |
||
85 |
int JavaClasses::compute_injected_offset(InjectedFieldID id) { |
|
86 |
return _injected_fields[id].compute_offset(); |
|
87 |
} |
|
88 |
||
89 |
||
90 |
InjectedField* JavaClasses::get_injected(Symbol* class_name, int* field_count) { |
|
91 |
*field_count = 0; |
|
92 |
||
93 |
vmSymbols::SID sid = vmSymbols::find_sid(class_name); |
|
94 |
if (sid == vmSymbols::NO_SID) { |
|
95 |
// Only well known classes can inject fields |
|
96 |
return NULL; |
|
97 |
} |
|
98 |
||
99 |
int count = 0; |
|
100 |
int start = -1; |
|
101 |
||
102 |
#define LOOKUP_INJECTED_FIELD(klass, name, signature, may_be_java) \ |
|
103 |
if (sid == vmSymbols::VM_SYMBOL_ENUM_NAME(klass)) { \ |
|
104 |
count++; \ |
|
105 |
if (start == -1) start = klass##_##name##_enum; \ |
|
106 |
} |
|
107 |
ALL_INJECTED_FIELDS(LOOKUP_INJECTED_FIELD); |
|
108 |
#undef LOOKUP_INJECTED_FIELD |
|
109 |
||
110 |
if (start != -1) { |
|
111 |
*field_count = count; |
|
112 |
return _injected_fields + start; |
|
113 |
} |
|
114 |
return NULL; |
|
115 |
} |
|
116 |
||
117 |
||
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
118 |
// Helpful routine for computing field offsets at run time rather than hardcoding them |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
119 |
// Finds local fields only, including static fields. Static field offsets are from the |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
120 |
// beginning of the mirror. |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
121 |
static void compute_offset(int &dest_offset, |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
122 |
InstanceKlass* ik, Symbol* name_symbol, Symbol* signature_symbol, |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
123 |
bool is_static = false) { |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
124 |
fieldDescriptor fd; |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
125 |
if (ik == NULL) { |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
126 |
ResourceMark rm; |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
127 |
log_error(class)("Mismatch JDK version for field: %s type: %s", name_symbol->as_C_string(), signature_symbol->as_C_string()); |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
128 |
vm_exit_during_initialization("Invalid layout of preloaded class"); |
30296
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
29081
diff
changeset
|
129 |
} |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
130 |
|
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
131 |
if (!ik->find_local_field(name_symbol, signature_symbol, &fd) || fd.is_static() != is_static) { |
379
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
132 |
ResourceMark rm; |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
133 |
log_error(class)("Invalid layout of %s field: %s type: %s", ik->external_name(), |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
134 |
name_symbol->as_C_string(), signature_symbol->as_C_string()); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
135 |
#ifndef PRODUCT |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
136 |
// Prints all fields and offsets |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
137 |
Log(class) lt; |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
138 |
LogStream ls(lt.error()); |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
139 |
ik->print_on(&ls); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
140 |
#endif //PRODUCT |
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38144
diff
changeset
|
141 |
vm_exit_during_initialization("Invalid layout of preloaded class: use -Xlog:class+load=info to see the origin of the problem class"); |
379
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
142 |
} |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
143 |
dest_offset = fd.offset(); |
1 | 144 |
} |
145 |
||
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
146 |
// Overloading to pass name as a string. |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
147 |
static void compute_offset(int& dest_offset, InstanceKlass* ik, |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
148 |
const char* name_string, Symbol* signature_symbol, |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
149 |
bool is_static = false) { |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
150 |
TempNewSymbol name = SymbolTable::probe(name_string, (int)strlen(name_string)); |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
151 |
if (name == NULL) { |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
152 |
ResourceMark rm; |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
153 |
log_error(class)("Name %s should be in the SymbolTable since its class is loaded", name_string); |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
154 |
vm_exit_during_initialization("Invalid layout of preloaded class", ik->external_name()); |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
155 |
} |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
156 |
compute_offset(dest_offset, ik, name, signature_symbol, is_static); |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
157 |
} |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
158 |
|
1 | 159 |
// Same as above but for "optional" offsets that might not be present in certain JDK versions |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
160 |
// Old versions should be cleaned out since Hotspot only supports the current JDK, and this |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
161 |
// function should be removed. |
379
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
162 |
static void |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
163 |
compute_optional_offset(int& dest_offset, |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
164 |
InstanceKlass* ik, Symbol* name_symbol, Symbol* signature_symbol) { |
379
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
165 |
fieldDescriptor fd; |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
166 |
if (ik->find_local_field(name_symbol, signature_symbol, &fd)) { |
379
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
167 |
dest_offset = fd.offset(); |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
168 |
} |
1 | 169 |
} |
170 |
||
12623 | 171 |
int java_lang_String::value_offset = 0; |
172 |
int java_lang_String::hash_offset = 0; |
|
33628 | 173 |
int java_lang_String::coder_offset = 0; |
12623 | 174 |
|
175 |
bool java_lang_String::initialized = false; |
|
176 |
||
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
27694
diff
changeset
|
177 |
bool java_lang_String::is_instance(oop obj) { |
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
27694
diff
changeset
|
178 |
return is_instance_inlined(obj); |
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
27694
diff
changeset
|
179 |
} |
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
27694
diff
changeset
|
180 |
|
49329 | 181 |
#if INCLUDE_CDS |
182 |
#define FIELD_SERIALIZE_OFFSET(offset, klass, name, signature, is_static) \ |
|
183 |
f->do_u4((u4*)&offset) |
|
184 |
||
185 |
#define FIELD_SERIALIZE_OFFSET_OPTIONAL(offset, klass, name, signature) \ |
|
186 |
f->do_u4((u4*)&offset) |
|
187 |
#endif |
|
188 |
||
189 |
#define FIELD_COMPUTE_OFFSET(offset, klass, name, signature, is_static) \ |
|
190 |
compute_offset(offset, klass, name, vmSymbols::signature(), is_static) |
|
191 |
||
192 |
#define FIELD_COMPUTE_OFFSET_OPTIONAL(offset, klass, name, signature) \ |
|
193 |
compute_optional_offset(offset, klass, name, vmSymbols::signature()) |
|
194 |
||
195 |
#define STRING_FIELDS_DO(macro) \ |
|
196 |
macro(value_offset, k, vmSymbols::value_name(), byte_array_signature, false); \ |
|
197 |
macro(hash_offset, k, "hash", int_signature, false); \ |
|
198 |
macro(coder_offset, k, "coder", byte_signature, false) |
|
199 |
||
12623 | 200 |
void java_lang_String::compute_offsets() { |
49329 | 201 |
if (initialized) { |
202 |
return; |
|
203 |
} |
|
12623 | 204 |
|
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
205 |
InstanceKlass* k = SystemDictionary::String_klass(); |
49329 | 206 |
STRING_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
12623 | 207 |
|
208 |
initialized = true; |
|
209 |
} |
|
210 |
||
49329 | 211 |
#if INCLUDE_CDS |
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
212 |
void java_lang_String::serialize_offsets(SerializeClosure* f) { |
49329 | 213 |
STRING_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
214 |
f->do_u4((u4*)&initialized); |
|
215 |
} |
|
216 |
#endif |
|
217 |
||
33628 | 218 |
class CompactStringsFixup : public FieldClosure { |
219 |
private: |
|
220 |
bool _value; |
|
221 |
||
222 |
public: |
|
223 |
CompactStringsFixup(bool value) : _value(value) {} |
|
224 |
||
225 |
void do_field(fieldDescriptor* fd) { |
|
226 |
if (fd->name() == vmSymbols::compact_strings_name()) { |
|
227 |
oop mirror = fd->field_holder()->java_mirror(); |
|
228 |
assert(fd->field_holder() == SystemDictionary::String_klass(), "Should be String"); |
|
229 |
assert(mirror != NULL, "String must have mirror already"); |
|
230 |
mirror->bool_field_put(fd->offset(), _value); |
|
231 |
} |
|
232 |
} |
|
233 |
}; |
|
234 |
||
235 |
void java_lang_String::set_compact_strings(bool value) { |
|
236 |
CompactStringsFixup fix(value); |
|
237 |
InstanceKlass::cast(SystemDictionary::String_klass())->do_local_static_fields(&fix); |
|
238 |
} |
|
239 |
||
240 |
Handle java_lang_String::basic_create(int length, bool is_latin1, TRAPS) { |
|
12623 | 241 |
assert(initialized, "Must be initialized"); |
33628 | 242 |
assert(CompactStrings || !is_latin1, "Must be UTF16 without CompactStrings"); |
243 |
||
1 | 244 |
// Create the String object first, so there's a chance that the String |
245 |
// and the char array it points to end up in the same cache line. |
|
246 |
oop obj; |
|
33602 | 247 |
obj = SystemDictionary::String_klass()->allocate_instance(CHECK_NH); |
1 | 248 |
|
249 |
// Create the char array. The String object must be handlized here |
|
250 |
// because GC can happen as a result of the allocation attempt. |
|
251 |
Handle h_obj(THREAD, obj); |
|
33628 | 252 |
int arr_length = is_latin1 ? length : length << 1; // 2 bytes per UTF16. |
253 |
typeArrayOop buffer = oopFactory::new_byteArray(arr_length, CHECK_NH);; |
|
1 | 254 |
|
255 |
// Point the String at the char array |
|
256 |
obj = h_obj(); |
|
257 |
set_value(obj, buffer); |
|
258 |
// No need to zero the offset, allocation zero'ed the entire String object |
|
33628 | 259 |
set_coder(obj, is_latin1 ? CODER_LATIN1 : CODER_UTF16); |
1 | 260 |
return h_obj; |
261 |
} |
|
262 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
263 |
Handle java_lang_String::create_from_unicode(jchar* unicode, int length, TRAPS) { |
33628 | 264 |
bool is_latin1 = CompactStrings && UNICODE::is_latin1(unicode, length); |
265 |
Handle h_obj = basic_create(length, is_latin1, CHECK_NH); |
|
1 | 266 |
typeArrayOop buffer = value(h_obj()); |
33628 | 267 |
assert(TypeArrayKlass::cast(buffer->klass())->element_type() == T_BYTE, "only byte[]"); |
268 |
if (is_latin1) { |
|
269 |
for (int index = 0; index < length; index++) { |
|
270 |
buffer->byte_at_put(index, (jbyte)unicode[index]); |
|
271 |
} |
|
272 |
} else { |
|
273 |
for (int index = 0; index < length; index++) { |
|
274 |
buffer->char_at_put(index, unicode[index]); |
|
275 |
} |
|
1 | 276 |
} |
33628 | 277 |
|
278 |
#ifdef ASSERT |
|
279 |
{ |
|
280 |
ResourceMark rm; |
|
281 |
char* expected = UNICODE::as_utf8(unicode, length); |
|
282 |
char* actual = as_utf8_string(h_obj()); |
|
283 |
if (strcmp(expected, actual) != 0) { |
|
284 |
tty->print_cr("Unicode conversion failure: %s --> %s", expected, actual); |
|
285 |
ShouldNotReachHere(); |
|
286 |
} |
|
287 |
} |
|
288 |
#endif |
|
289 |
||
1 | 290 |
return h_obj; |
291 |
} |
|
292 |
||
293 |
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
|
294 |
Handle h_obj = create_from_unicode(unicode, length, CHECK_0); |
1 | 295 |
return h_obj(); |
296 |
} |
|
297 |
||
298 |
Handle java_lang_String::create_from_str(const char* utf8_str, TRAPS) { |
|
299 |
if (utf8_str == NULL) { |
|
300 |
return Handle(); |
|
301 |
} |
|
33628 | 302 |
bool has_multibyte, is_latin1; |
303 |
int length = UTF8::unicode_length(utf8_str, is_latin1, has_multibyte); |
|
304 |
if (!CompactStrings) { |
|
305 |
has_multibyte = true; |
|
306 |
is_latin1 = false; |
|
307 |
} |
|
308 |
||
309 |
Handle h_obj = basic_create(length, is_latin1, CHECK_NH); |
|
1 | 310 |
if (length > 0) { |
33628 | 311 |
if (!has_multibyte) { |
50389
7e8c0409a747
8198285: More consistent Access API for arraycopy
rkennke
parents:
50217
diff
changeset
|
312 |
const jbyte* src = reinterpret_cast<const jbyte*>(utf8_str); |
7e8c0409a747
8198285: More consistent Access API for arraycopy
rkennke
parents:
50217
diff
changeset
|
313 |
ArrayAccess<>::arraycopy_from_native(src, value(h_obj()), typeArrayOopDesc::element_offset<jbyte>(0), length); |
33628 | 314 |
} else if (is_latin1) { |
315 |
UTF8::convert_to_unicode(utf8_str, value(h_obj())->byte_at_addr(0), length); |
|
316 |
} else { |
|
317 |
UTF8::convert_to_unicode(utf8_str, value(h_obj())->char_at_addr(0), length); |
|
318 |
} |
|
1 | 319 |
} |
33628 | 320 |
|
321 |
#ifdef ASSERT |
|
322 |
// This check is too strict because the input string is not necessarily valid UTF8. |
|
323 |
// For example, it may be created with arbitrary content via jni_NewStringUTF. |
|
324 |
/* |
|
325 |
{ |
|
326 |
ResourceMark rm; |
|
327 |
const char* expected = utf8_str; |
|
328 |
char* actual = as_utf8_string(h_obj()); |
|
329 |
if (strcmp(expected, actual) != 0) { |
|
330 |
tty->print_cr("String conversion failure: %s --> %s", expected, actual); |
|
331 |
ShouldNotReachHere(); |
|
332 |
} |
|
333 |
} |
|
334 |
*/ |
|
335 |
#endif |
|
336 |
||
1 | 337 |
return h_obj; |
338 |
} |
|
339 |
||
340 |
oop java_lang_String::create_oop_from_str(const char* utf8_str, TRAPS) { |
|
341 |
Handle h_obj = create_from_str(utf8_str, CHECK_0); |
|
342 |
return h_obj(); |
|
343 |
} |
|
344 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
345 |
Handle java_lang_String::create_from_symbol(Symbol* symbol, TRAPS) { |
33628 | 346 |
const char* utf8_str = (char*)symbol->bytes(); |
347 |
int utf8_len = symbol->utf8_length(); |
|
348 |
||
349 |
bool has_multibyte, is_latin1; |
|
350 |
int length = UTF8::unicode_length(utf8_str, utf8_len, is_latin1, has_multibyte); |
|
351 |
if (!CompactStrings) { |
|
352 |
has_multibyte = true; |
|
353 |
is_latin1 = false; |
|
354 |
} |
|
355 |
||
356 |
Handle h_obj = basic_create(length, is_latin1, CHECK_NH); |
|
1 | 357 |
if (length > 0) { |
33628 | 358 |
if (!has_multibyte) { |
50389
7e8c0409a747
8198285: More consistent Access API for arraycopy
rkennke
parents:
50217
diff
changeset
|
359 |
const jbyte* src = reinterpret_cast<const jbyte*>(utf8_str); |
7e8c0409a747
8198285: More consistent Access API for arraycopy
rkennke
parents:
50217
diff
changeset
|
360 |
ArrayAccess<>::arraycopy_from_native(src, value(h_obj()), typeArrayOopDesc::element_offset<jbyte>(0), length); |
33628 | 361 |
} else if (is_latin1) { |
362 |
UTF8::convert_to_unicode(utf8_str, value(h_obj())->byte_at_addr(0), length); |
|
363 |
} else { |
|
364 |
UTF8::convert_to_unicode(utf8_str, value(h_obj())->char_at_addr(0), length); |
|
365 |
} |
|
1 | 366 |
} |
33628 | 367 |
|
368 |
#ifdef ASSERT |
|
369 |
{ |
|
370 |
ResourceMark rm; |
|
371 |
const char* expected = symbol->as_utf8(); |
|
372 |
char* actual = as_utf8_string(h_obj()); |
|
373 |
if (strncmp(expected, actual, utf8_len) != 0) { |
|
374 |
tty->print_cr("Symbol conversion failure: %s --> %s", expected, actual); |
|
375 |
ShouldNotReachHere(); |
|
376 |
} |
|
377 |
} |
|
378 |
#endif |
|
379 |
||
1 | 380 |
return h_obj; |
381 |
} |
|
382 |
||
383 |
// Converts a C string to a Java String based on current encoding |
|
384 |
Handle java_lang_String::create_from_platform_dependent_str(const char* str, TRAPS) { |
|
385 |
assert(str != NULL, "bad arguments"); |
|
386 |
||
387 |
typedef jstring (*to_java_string_fn_t)(JNIEnv*, const char *); |
|
388 |
static to_java_string_fn_t _to_java_string_fn = NULL; |
|
389 |
||
390 |
if (_to_java_string_fn == NULL) { |
|
391 |
void *lib_handle = os::native_java_library(); |
|
7405
e6fc8d3926f8
6348631: remove the use of the HPI library from Hotspot
ikrylov
parents:
7397
diff
changeset
|
392 |
_to_java_string_fn = CAST_TO_FN_PTR(to_java_string_fn_t, os::dll_lookup(lib_handle, "NewStringPlatform")); |
1 | 393 |
if (_to_java_string_fn == NULL) { |
394 |
fatal("NewStringPlatform missing"); |
|
395 |
} |
|
396 |
} |
|
397 |
||
398 |
jstring js = NULL; |
|
399 |
{ JavaThread* thread = (JavaThread*)THREAD; |
|
400 |
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
|
401 |
HandleMark hm(thread); |
1 | 402 |
ThreadToNativeFromVM ttn(thread); |
403 |
js = (_to_java_string_fn)(thread->jni_environment(), str); |
|
404 |
} |
|
405 |
return Handle(THREAD, JNIHandles::resolve(js)); |
|
406 |
} |
|
407 |
||
195
9193828514c4
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
1
diff
changeset
|
408 |
// 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
|
409 |
// native OS calls. |
9193828514c4
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
1
diff
changeset
|
410 |
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
|
411 |
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
|
412 |
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
|
413 |
|
9193828514c4
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
1
diff
changeset
|
414 |
if (_to_platform_string_fn == NULL) { |
9193828514c4
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
1
diff
changeset
|
415 |
void *lib_handle = os::native_java_library(); |
7405
e6fc8d3926f8
6348631: remove the use of the HPI library from Hotspot
ikrylov
parents:
7397
diff
changeset
|
416 |
_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
|
417 |
if (_to_platform_string_fn == NULL) { |
9193828514c4
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
1
diff
changeset
|
418 |
fatal("GetStringPlatformChars missing"); |
9193828514c4
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
1
diff
changeset
|
419 |
} |
9193828514c4
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
1
diff
changeset
|
420 |
} |
9193828514c4
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
1
diff
changeset
|
421 |
|
9193828514c4
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
1
diff
changeset
|
422 |
char *native_platform_string; |
9193828514c4
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
1
diff
changeset
|
423 |
{ JavaThread* thread = (JavaThread*)THREAD; |
9193828514c4
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
1
diff
changeset
|
424 |
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
|
425 |
JNIEnv *env = thread->jni_environment(); |
9193828514c4
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
1
diff
changeset
|
426 |
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
|
427 |
bool is_copy; |
9193828514c4
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
1
diff
changeset
|
428 |
HandleMark hm(thread); |
9193828514c4
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
1
diff
changeset
|
429 |
ThreadToNativeFromVM ttn(thread); |
9193828514c4
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
1
diff
changeset
|
430 |
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
|
431 |
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
|
432 |
JNIHandles::destroy_local(js); |
9193828514c4
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
1
diff
changeset
|
433 |
} |
9193828514c4
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
1
diff
changeset
|
434 |
return native_platform_string; |
9193828514c4
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
1
diff
changeset
|
435 |
} |
9193828514c4
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
1
diff
changeset
|
436 |
|
1 | 437 |
Handle java_lang_String::char_converter(Handle java_string, jchar from_char, jchar to_char, TRAPS) { |
438 |
oop obj = java_string(); |
|
439 |
// Typical usage is to convert all '/' to '.' in string. |
|
440 |
typeArrayOop value = java_lang_String::value(obj); |
|
441 |
int length = java_lang_String::length(obj); |
|
33628 | 442 |
bool is_latin1 = java_lang_String::is_latin1(obj); |
1 | 443 |
|
444 |
// First check if any from_char exist |
|
445 |
int index; // Declared outside, used later |
|
446 |
for (index = 0; index < length; index++) { |
|
33628 | 447 |
jchar c = !is_latin1 ? value->char_at(index) : |
448 |
((jchar) value->byte_at(index)) & 0xff; |
|
449 |
if (c == from_char) { |
|
1 | 450 |
break; |
451 |
} |
|
452 |
} |
|
453 |
if (index == length) { |
|
454 |
// No from_char, so do not copy. |
|
455 |
return java_string; |
|
456 |
} |
|
457 |
||
33628 | 458 |
// Check if result string will be latin1 |
459 |
bool to_is_latin1 = false; |
|
460 |
||
461 |
// Replacement char must be latin1 |
|
462 |
if (CompactStrings && UNICODE::is_latin1(to_char)) { |
|
463 |
if (is_latin1) { |
|
464 |
// Source string is latin1 as well |
|
465 |
to_is_latin1 = true; |
|
466 |
} else if (!UNICODE::is_latin1(from_char)) { |
|
467 |
// We are replacing an UTF16 char. Scan string to |
|
468 |
// check if result can be latin1 encoded. |
|
469 |
to_is_latin1 = true; |
|
470 |
for (index = 0; index < length; index++) { |
|
471 |
jchar c = value->char_at(index); |
|
472 |
if (c != from_char && !UNICODE::is_latin1(c)) { |
|
473 |
to_is_latin1 = false; |
|
474 |
break; |
|
475 |
} |
|
476 |
} |
|
477 |
} |
|
478 |
} |
|
479 |
||
480 |
// Create new UNICODE (or byte) buffer. Must handlize value because GC |
|
1 | 481 |
// may happen during String and char array creation. |
482 |
typeArrayHandle h_value(THREAD, value); |
|
33628 | 483 |
Handle string = basic_create(length, to_is_latin1, CHECK_NH); |
1 | 484 |
typeArrayOop from_buffer = h_value(); |
33628 | 485 |
typeArrayOop to_buffer = java_lang_String::value(string()); |
1 | 486 |
|
487 |
// Copy contents |
|
488 |
for (index = 0; index < length; index++) { |
|
33628 | 489 |
jchar c = (!is_latin1) ? from_buffer->char_at(index) : |
490 |
((jchar) from_buffer->byte_at(index)) & 0xff; |
|
1 | 491 |
if (c == from_char) { |
492 |
c = to_char; |
|
493 |
} |
|
33628 | 494 |
if (!to_is_latin1) { |
495 |
to_buffer->char_at_put(index, c); |
|
496 |
} else { |
|
497 |
to_buffer->byte_at_put(index, (jbyte) c); |
|
498 |
} |
|
1 | 499 |
} |
500 |
return string; |
|
501 |
} |
|
502 |
||
17081
cf52c2bc3f8c
8011773: Some tests on Interned String crashed JVM with OOM
hseigel
parents:
17029
diff
changeset
|
503 |
jchar* java_lang_String::as_unicode_string(oop java_string, int& length, TRAPS) { |
1 | 504 |
typeArrayOop value = java_lang_String::value(java_string); |
505 |
length = java_lang_String::length(java_string); |
|
33628 | 506 |
bool is_latin1 = java_lang_String::is_latin1(java_string); |
1 | 507 |
|
17081
cf52c2bc3f8c
8011773: Some tests on Interned String crashed JVM with OOM
hseigel
parents:
17029
diff
changeset
|
508 |
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
|
509 |
if (result != NULL) { |
33628 | 510 |
if (!is_latin1) { |
511 |
for (int index = 0; index < length; index++) { |
|
512 |
result[index] = value->char_at(index); |
|
513 |
} |
|
514 |
} else { |
|
515 |
for (int index = 0; index < length; index++) { |
|
516 |
result[index] = ((jchar) value->byte_at(index)) & 0xff; |
|
517 |
} |
|
17081
cf52c2bc3f8c
8011773: Some tests on Interned String crashed JVM with OOM
hseigel
parents:
17029
diff
changeset
|
518 |
} |
cf52c2bc3f8c
8011773: Some tests on Interned String crashed JVM with OOM
hseigel
parents:
17029
diff
changeset
|
519 |
} else { |
cf52c2bc3f8c
8011773: Some tests on Interned String crashed JVM with OOM
hseigel
parents:
17029
diff
changeset
|
520 |
THROW_MSG_0(vmSymbols::java_lang_OutOfMemoryError(), "could not allocate Unicode string"); |
1 | 521 |
} |
522 |
return result; |
|
523 |
} |
|
524 |
||
14742
b2a47eb99404
8004661: Comment and function name java_lang_String::toHash is wrong
brutisso
parents:
14588
diff
changeset
|
525 |
unsigned int java_lang_String::hash_code(oop java_string) { |
13087 | 526 |
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
|
527 |
// Zero length string will hash to zero with String.hashCode() function. |
13087 | 528 |
if (length == 0) return 0; |
529 |
||
8885
eed0ba1d011b
7032129: Native memory usage grow unexpectedly for vm/oom/*InternedString tests
never
parents:
8883
diff
changeset
|
530 |
typeArrayOop value = java_lang_String::value(java_string); |
33628 | 531 |
bool is_latin1 = java_lang_String::is_latin1(java_string); |
532 |
||
533 |
if (is_latin1) { |
|
534 |
return java_lang_String::hash_code(value->byte_at_addr(0), length); |
|
535 |
} else { |
|
536 |
return java_lang_String::hash_code(value->char_at_addr(0), length); |
|
537 |
} |
|
13087 | 538 |
} |
539 |
||
14477
95e66ea71f71
6830717: replay of compilations would help with debugging
minqi
parents:
14391
diff
changeset
|
540 |
char* java_lang_String::as_quoted_ascii(oop java_string) { |
95e66ea71f71
6830717: replay of compilations would help with debugging
minqi
parents:
14391
diff
changeset
|
541 |
typeArrayOop value = java_lang_String::value(java_string); |
95e66ea71f71
6830717: replay of compilations would help with debugging
minqi
parents:
14391
diff
changeset
|
542 |
int length = java_lang_String::length(java_string); |
33628 | 543 |
bool is_latin1 = java_lang_String::is_latin1(java_string); |
544 |
||
545 |
if (length == 0) return NULL; |
|
546 |
||
547 |
char* result; |
|
548 |
int result_length; |
|
549 |
if (!is_latin1) { |
|
550 |
jchar* base = value->char_at_addr(0); |
|
551 |
result_length = UNICODE::quoted_ascii_length(base, length) + 1; |
|
552 |
result = NEW_RESOURCE_ARRAY(char, result_length); |
|
553 |
UNICODE::as_quoted_ascii(base, length, result, result_length); |
|
554 |
} else { |
|
555 |
jbyte* base = value->byte_at_addr(0); |
|
556 |
result_length = UNICODE::quoted_ascii_length(base, length) + 1; |
|
557 |
result = NEW_RESOURCE_ARRAY(char, result_length); |
|
558 |
UNICODE::as_quoted_ascii(base, length, result, result_length); |
|
559 |
} |
|
14477
95e66ea71f71
6830717: replay of compilations would help with debugging
minqi
parents:
14391
diff
changeset
|
560 |
assert(result_length >= length + 1, "must not be shorter"); |
95e66ea71f71
6830717: replay of compilations would help with debugging
minqi
parents:
14391
diff
changeset
|
561 |
assert(result_length == (int)strlen(result) + 1, "must match"); |
95e66ea71f71
6830717: replay of compilations would help with debugging
minqi
parents:
14391
diff
changeset
|
562 |
return result; |
95e66ea71f71
6830717: replay of compilations would help with debugging
minqi
parents:
14391
diff
changeset
|
563 |
} |
95e66ea71f71
6830717: replay of compilations would help with debugging
minqi
parents:
14391
diff
changeset
|
564 |
|
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46257
diff
changeset
|
565 |
Symbol* java_lang_String::as_symbol(oop java_string, TRAPS) { |
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46257
diff
changeset
|
566 |
typeArrayOop value = java_lang_String::value(java_string); |
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46257
diff
changeset
|
567 |
int length = java_lang_String::length(java_string); |
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46257
diff
changeset
|
568 |
bool is_latin1 = java_lang_String::is_latin1(java_string); |
33628 | 569 |
if (!is_latin1) { |
570 |
jchar* base = (length == 0) ? NULL : value->char_at_addr(0); |
|
571 |
Symbol* sym = SymbolTable::lookup_unicode(base, length, THREAD); |
|
572 |
return sym; |
|
573 |
} else { |
|
574 |
ResourceMark rm; |
|
575 |
jbyte* position = (length == 0) ? NULL : value->byte_at_addr(0); |
|
576 |
const char* base = UNICODE::as_utf8(position, length); |
|
577 |
Symbol* sym = SymbolTable::lookup(base, length, THREAD); |
|
578 |
return sym; |
|
579 |
} |
|
1 | 580 |
} |
581 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
582 |
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
|
583 |
typeArrayOop value = java_lang_String::value(java_string); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
584 |
int length = java_lang_String::length(java_string); |
33628 | 585 |
bool is_latin1 = java_lang_String::is_latin1(java_string); |
586 |
if (!is_latin1) { |
|
587 |
jchar* base = (length == 0) ? NULL : value->char_at_addr(0); |
|
588 |
return SymbolTable::probe_unicode(base, length); |
|
589 |
} else { |
|
590 |
ResourceMark rm; |
|
591 |
jbyte* position = (length == 0) ? NULL : value->byte_at_addr(0); |
|
592 |
const char* base = UNICODE::as_utf8(position, length); |
|
593 |
return SymbolTable::probe(base, length); |
|
594 |
} |
|
595 |
} |
|
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
596 |
|
1 | 597 |
int java_lang_String::utf8_length(oop java_string) { |
598 |
typeArrayOop value = java_lang_String::value(java_string); |
|
599 |
int length = java_lang_String::length(java_string); |
|
33628 | 600 |
bool is_latin1 = java_lang_String::is_latin1(java_string); |
601 |
if (length == 0) { |
|
602 |
return 0; |
|
603 |
} |
|
604 |
if (!is_latin1) { |
|
605 |
return UNICODE::utf8_length(value->char_at_addr(0), length); |
|
606 |
} else { |
|
607 |
return UNICODE::utf8_length(value->byte_at_addr(0), length); |
|
608 |
} |
|
1 | 609 |
} |
610 |
||
611 |
char* java_lang_String::as_utf8_string(oop java_string) { |
|
612 |
typeArrayOop value = java_lang_String::value(java_string); |
|
613 |
int length = java_lang_String::length(java_string); |
|
33628 | 614 |
bool is_latin1 = java_lang_String::is_latin1(java_string); |
615 |
if (!is_latin1) { |
|
616 |
jchar* position = (length == 0) ? NULL : value->char_at_addr(0); |
|
617 |
return UNICODE::as_utf8(position, length); |
|
618 |
} else { |
|
619 |
jbyte* position = (length == 0) ? NULL : value->byte_at_addr(0); |
|
620 |
return UNICODE::as_utf8(position, length); |
|
621 |
} |
|
1 | 622 |
} |
623 |
||
7414
940d84ca7fca
6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
sla
parents:
7405
diff
changeset
|
624 |
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
|
625 |
typeArrayOop value = java_lang_String::value(java_string); |
940d84ca7fca
6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
sla
parents:
7405
diff
changeset
|
626 |
int length = java_lang_String::length(java_string); |
33628 | 627 |
bool is_latin1 = java_lang_String::is_latin1(java_string); |
628 |
if (!is_latin1) { |
|
629 |
jchar* position = (length == 0) ? NULL : value->char_at_addr(0); |
|
630 |
return UNICODE::as_utf8(position, length, buf, buflen); |
|
631 |
} else { |
|
632 |
jbyte* position = (length == 0) ? NULL : value->byte_at_addr(0); |
|
633 |
return UNICODE::as_utf8(position, length, buf, buflen); |
|
634 |
} |
|
7414
940d84ca7fca
6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
sla
parents:
7405
diff
changeset
|
635 |
} |
940d84ca7fca
6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
sla
parents:
7405
diff
changeset
|
636 |
|
1 | 637 |
char* java_lang_String::as_utf8_string(oop java_string, int start, int len) { |
638 |
typeArrayOop value = java_lang_String::value(java_string); |
|
639 |
int length = java_lang_String::length(java_string); |
|
640 |
assert(start + len <= length, "just checking"); |
|
33628 | 641 |
bool is_latin1 = java_lang_String::is_latin1(java_string); |
642 |
if (!is_latin1) { |
|
643 |
jchar* position = value->char_at_addr(start); |
|
644 |
return UNICODE::as_utf8(position, len); |
|
645 |
} else { |
|
646 |
jbyte* position = value->byte_at_addr(start); |
|
647 |
return UNICODE::as_utf8(position, len); |
|
648 |
} |
|
1 | 649 |
} |
650 |
||
24237
7b210ef8c830
6664815: Eliminate redundant memcpy operation in jni_GetStringUTFRegion
mgerdin
parents:
23872
diff
changeset
|
651 |
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
|
652 |
typeArrayOop value = java_lang_String::value(java_string); |
7b210ef8c830
6664815: Eliminate redundant memcpy operation in jni_GetStringUTFRegion
mgerdin
parents:
23872
diff
changeset
|
653 |
int length = java_lang_String::length(java_string); |
7b210ef8c830
6664815: Eliminate redundant memcpy operation in jni_GetStringUTFRegion
mgerdin
parents:
23872
diff
changeset
|
654 |
assert(start + len <= length, "just checking"); |
33628 | 655 |
bool is_latin1 = java_lang_String::is_latin1(java_string); |
656 |
if (!is_latin1) { |
|
657 |
jchar* position = value->char_at_addr(start); |
|
658 |
return UNICODE::as_utf8(position, len, buf, buflen); |
|
659 |
} else { |
|
660 |
jbyte* position = value->byte_at_addr(start); |
|
661 |
return UNICODE::as_utf8(position, len, buf, buflen); |
|
662 |
} |
|
24237
7b210ef8c830
6664815: Eliminate redundant memcpy operation in jni_GetStringUTFRegion
mgerdin
parents:
23872
diff
changeset
|
663 |
} |
7b210ef8c830
6664815: Eliminate redundant memcpy operation in jni_GetStringUTFRegion
mgerdin
parents:
23872
diff
changeset
|
664 |
|
1 | 665 |
bool java_lang_String::equals(oop java_string, jchar* chars, int len) { |
14078 | 666 |
assert(java_string->klass() == SystemDictionary::String_klass(), |
1 | 667 |
"must be java_string"); |
48618
688e5cbd0b91
8192003: Refactor weak references in StringTable to use the Access API
eosterlund
parents:
47998
diff
changeset
|
668 |
typeArrayOop value = java_lang_String::value_no_keepalive(java_string); |
688e5cbd0b91
8192003: Refactor weak references in StringTable to use the Access API
eosterlund
parents:
47998
diff
changeset
|
669 |
int length = java_lang_String::length(java_string); |
1 | 670 |
if (length != len) { |
671 |
return false; |
|
672 |
} |
|
48618
688e5cbd0b91
8192003: Refactor weak references in StringTable to use the Access API
eosterlund
parents:
47998
diff
changeset
|
673 |
bool is_latin1 = java_lang_String::is_latin1(java_string); |
33628 | 674 |
if (!is_latin1) { |
675 |
for (int i = 0; i < len; i++) { |
|
676 |
if (value->char_at(i) != chars[i]) { |
|
677 |
return false; |
|
678 |
} |
|
679 |
} |
|
680 |
} else { |
|
681 |
for (int i = 0; i < len; i++) { |
|
682 |
if ((((jchar) value->byte_at(i)) & 0xff) != chars[i]) { |
|
683 |
return false; |
|
684 |
} |
|
1 | 685 |
} |
686 |
} |
|
687 |
return true; |
|
688 |
} |
|
689 |
||
20053
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
19266
diff
changeset
|
690 |
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
|
691 |
assert(str1->klass() == SystemDictionary::String_klass(), |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
19266
diff
changeset
|
692 |
"must be java String"); |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
19266
diff
changeset
|
693 |
assert(str2->klass() == SystemDictionary::String_klass(), |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
19266
diff
changeset
|
694 |
"must be java String"); |
48618
688e5cbd0b91
8192003: Refactor weak references in StringTable to use the Access API
eosterlund
parents:
47998
diff
changeset
|
695 |
typeArrayOop value1 = java_lang_String::value_no_keepalive(str1); |
49350
cebb0e943ab2
8199137: StringInternSync test crashes in exit verification
coleenp
parents:
49348
diff
changeset
|
696 |
int length1 = java_lang_String::length(str1); |
48618
688e5cbd0b91
8192003: Refactor weak references in StringTable to use the Access API
eosterlund
parents:
47998
diff
changeset
|
697 |
bool is_latin1 = java_lang_String::is_latin1(str1); |
688e5cbd0b91
8192003: Refactor weak references in StringTable to use the Access API
eosterlund
parents:
47998
diff
changeset
|
698 |
typeArrayOop value2 = java_lang_String::value_no_keepalive(str2); |
49350
cebb0e943ab2
8199137: StringInternSync test crashes in exit verification
coleenp
parents:
49348
diff
changeset
|
699 |
int length2 = java_lang_String::length(str2); |
48618
688e5cbd0b91
8192003: Refactor weak references in StringTable to use the Access API
eosterlund
parents:
47998
diff
changeset
|
700 |
bool is_latin2 = java_lang_String::is_latin1(str2); |
33628 | 701 |
|
702 |
if ((length1 != length2) || (is_latin1 != is_latin2)) { |
|
703 |
// Strings of different size or with different |
|
704 |
// coders are never equal. |
|
20053
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
19266
diff
changeset
|
705 |
return false; |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
19266
diff
changeset
|
706 |
} |
33628 | 707 |
int blength1 = value1->length(); |
48618
688e5cbd0b91
8192003: Refactor weak references in StringTable to use the Access API
eosterlund
parents:
47998
diff
changeset
|
708 |
for (int i = 0; i < blength1; i++) { |
33628 | 709 |
if (value1->byte_at(i) != value2->byte_at(i)) { |
20053
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
19266
diff
changeset
|
710 |
return false; |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
19266
diff
changeset
|
711 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
19266
diff
changeset
|
712 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
19266
diff
changeset
|
713 |
return true; |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
19266
diff
changeset
|
714 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
19266
diff
changeset
|
715 |
|
22907
f978a4a64728
8035648: Don't use Handle in java_lang_String::print
stefank
parents:
22186
diff
changeset
|
716 |
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
|
717 |
assert(java_string->klass() == SystemDictionary::String_klass(), "must be java_string"); |
48618
688e5cbd0b91
8192003: Refactor weak references in StringTable to use the Access API
eosterlund
parents:
47998
diff
changeset
|
718 |
typeArrayOop value = java_lang_String::value_no_keepalive(java_string); |
23871
0456e228b90d
8039348: -XX:+TraceDeoptimization -XX:+Verbose -Xcomp can crash VM
mgronlun
parents:
22907
diff
changeset
|
719 |
|
1 | 720 |
if (value == NULL) { |
721 |
// This can happen if, e.g., printing a String |
|
722 |
// object before its initializer has been called |
|
23871
0456e228b90d
8039348: -XX:+TraceDeoptimization -XX:+Verbose -Xcomp can crash VM
mgronlun
parents:
22907
diff
changeset
|
723 |
st->print("NULL"); |
0456e228b90d
8039348: -XX:+TraceDeoptimization -XX:+Verbose -Xcomp can crash VM
mgronlun
parents:
22907
diff
changeset
|
724 |
return; |
1 | 725 |
} |
23871
0456e228b90d
8039348: -XX:+TraceDeoptimization -XX:+Verbose -Xcomp can crash VM
mgronlun
parents:
22907
diff
changeset
|
726 |
|
0456e228b90d
8039348: -XX:+TraceDeoptimization -XX:+Verbose -Xcomp can crash VM
mgronlun
parents:
22907
diff
changeset
|
727 |
int length = java_lang_String::length(java_string); |
33628 | 728 |
bool is_latin1 = java_lang_String::is_latin1(java_string); |
23871
0456e228b90d
8039348: -XX:+TraceDeoptimization -XX:+Verbose -Xcomp can crash VM
mgronlun
parents:
22907
diff
changeset
|
729 |
|
0456e228b90d
8039348: -XX:+TraceDeoptimization -XX:+Verbose -Xcomp can crash VM
mgronlun
parents:
22907
diff
changeset
|
730 |
st->print("\""); |
0456e228b90d
8039348: -XX:+TraceDeoptimization -XX:+Verbose -Xcomp can crash VM
mgronlun
parents:
22907
diff
changeset
|
731 |
for (int index = 0; index < length; index++) { |
33628 | 732 |
st->print("%c", (!is_latin1) ? value->char_at(index) : |
733 |
((jchar) value->byte_at(index)) & 0xff ); |
|
23871
0456e228b90d
8039348: -XX:+TraceDeoptimization -XX:+Verbose -Xcomp can crash VM
mgronlun
parents:
22907
diff
changeset
|
734 |
} |
0456e228b90d
8039348: -XX:+TraceDeoptimization -XX:+Verbose -Xcomp can crash VM
mgronlun
parents:
22907
diff
changeset
|
735 |
st->print("\""); |
1 | 736 |
} |
737 |
||
23872
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
738 |
|
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
739 |
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
|
740 |
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
|
741 |
if (fd->has_initial_value()) { |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
742 |
BasicType t = fd->field_type(); |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
743 |
switch (t) { |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
744 |
case T_BYTE: |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
745 |
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
|
746 |
break; |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
747 |
case T_BOOLEAN: |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
748 |
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
|
749 |
break; |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
750 |
case T_CHAR: |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
751 |
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
|
752 |
break; |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
753 |
case T_SHORT: |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
754 |
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
|
755 |
break; |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
756 |
case T_INT: |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
757 |
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
|
758 |
break; |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
759 |
case T_FLOAT: |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
760 |
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
|
761 |
break; |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
762 |
case T_DOUBLE: |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
763 |
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
|
764 |
break; |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
765 |
case T_LONG: |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
766 |
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
|
767 |
break; |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
768 |
case T_OBJECT: |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
769 |
{ |
49329 | 770 |
assert(fd->signature() == vmSymbols::string_signature(), |
771 |
"just checking"); |
|
50056
ca1f2d4d4ec8
8202709: Move oopDesc::is_archive_object to MetaspaceShared::is_archive_object
stefank
parents:
50036
diff
changeset
|
772 |
if (DumpSharedSpaces && MetaspaceShared::is_archive_object(mirror())) { |
49329 | 773 |
// Archive the String field and update the pointer. |
774 |
oop s = mirror()->obj_field(fd->offset()); |
|
775 |
oop archived_s = StringTable::create_archived_string(s, CHECK); |
|
776 |
mirror()->obj_field_put(fd->offset(), archived_s); |
|
777 |
} else { |
|
778 |
oop string = fd->string_initial_value(CHECK); |
|
779 |
mirror()->obj_field_put(fd->offset(), string); |
|
780 |
} |
|
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
781 |
} |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
782 |
break; |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
783 |
default: |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
784 |
THROW_MSG(vmSymbols::java_lang_ClassFormatError(), |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
785 |
"Illegal ConstantValue attribute in class file"); |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
786 |
} |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
787 |
} |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
788 |
} |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
789 |
|
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
790 |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
791 |
void java_lang_Class::fixup_mirror(Klass* k, TRAPS) { |
13738
d67be49a5beb
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
13728
diff
changeset
|
792 |
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
|
793 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
794 |
// 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
|
795 |
if (!k->is_shared()) { |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
796 |
if (k->is_instance_klass()) { |
17826
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
797 |
// 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
|
798 |
// 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
|
799 |
// update all the static field offsets to included the size. |
50532 | 800 |
for (JavaFieldStream fs(InstanceKlass::cast(k)); !fs.done(); fs.next()) { |
17826
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
801 |
if (fs.access_flags().is_static()) { |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
802 |
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
|
803 |
fs.set_offset(real_offset); |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
804 |
} |
10546 | 805 |
} |
806 |
} |
|
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
807 |
} |
49329 | 808 |
|
809 |
if (k->is_shared() && k->has_raw_archived_mirror()) { |
|
810 |
if (MetaspaceShared::open_archive_heap_region_mapped()) { |
|
50532 | 811 |
bool present = restore_archived_mirror(k, Handle(), Handle(), Handle(), CHECK); |
812 |
assert(present, "Missing archived mirror for %s", k->external_name()); |
|
49329 | 813 |
return; |
814 |
} else { |
|
815 |
k->set_java_mirror_handle(NULL); |
|
816 |
k->clear_has_raw_archived_mirror(); |
|
817 |
} |
|
818 |
} |
|
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46257
diff
changeset
|
819 |
create_mirror(k, Handle(), Handle(), Handle(), CHECK); |
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
820 |
} |
1 | 821 |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
822 |
void java_lang_Class::initialize_mirror_fields(Klass* k, |
23872
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
823 |
Handle mirror, |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
824 |
Handle protection_domain, |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
825 |
TRAPS) { |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
826 |
// Allocate a simple java object for a lock. |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
827 |
// 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
|
828 |
// it can be held across a java call. |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
829 |
typeArrayOop r = oopFactory::new_typeArray(T_INT, 0, CHECK); |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
830 |
set_init_lock(mirror(), r); |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
831 |
|
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
832 |
// Set protection domain also |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
833 |
set_protection_domain(mirror(), protection_domain()); |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
834 |
|
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
835 |
// Initialize static fields |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
836 |
InstanceKlass::cast(k)->do_local_static_fields(&initialize_static_field, mirror, CHECK); |
23872
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
837 |
} |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
838 |
|
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
43929
diff
changeset
|
839 |
// Set the java.lang.Module module field in the java_lang_Class mirror |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
840 |
void java_lang_Class::set_mirror_module_field(Klass* k, Handle mirror, Handle module, TRAPS) { |
41183
207b92e69457
8163406: The fixup_module_list must be protected by Module_lock when inserting new entries
lfoltan
parents:
40892
diff
changeset
|
841 |
if (module.is_null()) { |
207b92e69457
8163406: The fixup_module_list must be protected by Module_lock when inserting new entries
lfoltan
parents:
40892
diff
changeset
|
842 |
// During startup, the module may be NULL only if java.base has not been defined yet. |
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
43929
diff
changeset
|
843 |
// Put the class on the fixup_module_list to patch later when the java.lang.Module |
41183
207b92e69457
8163406: The fixup_module_list must be protected by Module_lock when inserting new entries
lfoltan
parents:
40892
diff
changeset
|
844 |
// for java.base is known. |
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
43929
diff
changeset
|
845 |
assert(!Universe::is_module_initialized(), "Incorrect java.lang.Module pre module system initialization"); |
41691
1be281ee5de4
8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents:
41183
diff
changeset
|
846 |
|
1be281ee5de4
8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents:
41183
diff
changeset
|
847 |
bool javabase_was_defined = false; |
1be281ee5de4
8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents:
41183
diff
changeset
|
848 |
{ |
1be281ee5de4
8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents:
41183
diff
changeset
|
849 |
MutexLocker m1(Module_lock, THREAD); |
1be281ee5de4
8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents:
41183
diff
changeset
|
850 |
// Keep list of classes needing java.base module fixup |
1be281ee5de4
8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents:
41183
diff
changeset
|
851 |
if (!ModuleEntryTable::javabase_defined()) { |
46772
902c68ab7f57
8185103: TestThreadDumpMonitorContention.java crashed due to SIGSEGV in G1SATBCardTableModRefBS::write_ref_field_pre_work
hseigel
parents:
46722
diff
changeset
|
852 |
assert(k->java_mirror() != NULL, "Class's mirror is null"); |
41691
1be281ee5de4
8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents:
41183
diff
changeset
|
853 |
k->class_loader_data()->inc_keep_alive(); |
46772
902c68ab7f57
8185103: TestThreadDumpMonitorContention.java crashed due to SIGSEGV in G1SATBCardTableModRefBS::write_ref_field_pre_work
hseigel
parents:
46722
diff
changeset
|
854 |
assert(fixup_module_field_list() != NULL, "fixup_module_field_list not initialized"); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
855 |
fixup_module_field_list()->push(k); |
41691
1be281ee5de4
8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents:
41183
diff
changeset
|
856 |
} else { |
1be281ee5de4
8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents:
41183
diff
changeset
|
857 |
javabase_was_defined = true; |
41183
207b92e69457
8163406: The fixup_module_list must be protected by Module_lock when inserting new entries
lfoltan
parents:
40892
diff
changeset
|
858 |
} |
41691
1be281ee5de4
8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents:
41183
diff
changeset
|
859 |
} |
1be281ee5de4
8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents:
41183
diff
changeset
|
860 |
|
1be281ee5de4
8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents:
41183
diff
changeset
|
861 |
// If java.base was already defined then patch this particular class with java.base. |
1be281ee5de4
8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents:
41183
diff
changeset
|
862 |
if (javabase_was_defined) { |
41183
207b92e69457
8163406: The fixup_module_list must be protected by Module_lock when inserting new entries
lfoltan
parents:
40892
diff
changeset
|
863 |
ModuleEntry *javabase_entry = ModuleEntryTable::javabase_moduleEntry(); |
46961
c9094b1e5f87
8186088: ConstantPoolCache::_resolved_references is not a JNIHandle
coleenp
parents:
46773
diff
changeset
|
864 |
assert(javabase_entry != NULL && javabase_entry->module() != NULL, |
42636
aafc434ba580
8169734: Update uses of string "java.base" to macro
rprotacio
parents:
42574
diff
changeset
|
865 |
"Setting class module field, " JAVA_BASE_NAME " should be defined"); |
46773
fb17cc9a6847
8185717: Make ModuleEntry->module() return an oop not a jobject
hseigel
parents:
46772
diff
changeset
|
866 |
Handle javabase_handle(THREAD, javabase_entry->module()); |
41183
207b92e69457
8163406: The fixup_module_list must be protected by Module_lock when inserting new entries
lfoltan
parents:
40892
diff
changeset
|
867 |
set_module(mirror(), javabase_handle()); |
207b92e69457
8163406: The fixup_module_list must be protected by Module_lock when inserting new entries
lfoltan
parents:
40892
diff
changeset
|
868 |
} |
207b92e69457
8163406: The fixup_module_list must be protected by Module_lock when inserting new entries
lfoltan
parents:
40892
diff
changeset
|
869 |
} else { |
207b92e69457
8163406: The fixup_module_list must be protected by Module_lock when inserting new entries
lfoltan
parents:
40892
diff
changeset
|
870 |
assert(Universe::is_module_initialized() || |
207b92e69457
8163406: The fixup_module_list must be protected by Module_lock when inserting new entries
lfoltan
parents:
40892
diff
changeset
|
871 |
(ModuleEntryTable::javabase_defined() && |
49658 | 872 |
(oopDesc::equals(module(), ModuleEntryTable::javabase_moduleEntry()->module()))), |
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
43929
diff
changeset
|
873 |
"Incorrect java.lang.Module specification while creating mirror"); |
41183
207b92e69457
8163406: The fixup_module_list must be protected by Module_lock when inserting new entries
lfoltan
parents:
40892
diff
changeset
|
874 |
set_module(mirror(), module()); |
207b92e69457
8163406: The fixup_module_list must be protected by Module_lock when inserting new entries
lfoltan
parents:
40892
diff
changeset
|
875 |
} |
207b92e69457
8163406: The fixup_module_list must be protected by Module_lock when inserting new entries
lfoltan
parents:
40892
diff
changeset
|
876 |
} |
207b92e69457
8163406: The fixup_module_list must be protected by Module_lock when inserting new entries
lfoltan
parents:
40892
diff
changeset
|
877 |
|
46772
902c68ab7f57
8185103: TestThreadDumpMonitorContention.java crashed due to SIGSEGV in G1SATBCardTableModRefBS::write_ref_field_pre_work
hseigel
parents:
46722
diff
changeset
|
878 |
// Statically allocate fixup lists because they always get created. |
902c68ab7f57
8185103: TestThreadDumpMonitorContention.java crashed due to SIGSEGV in G1SATBCardTableModRefBS::write_ref_field_pre_work
hseigel
parents:
46722
diff
changeset
|
879 |
void java_lang_Class::allocate_fixup_lists() { |
902c68ab7f57
8185103: TestThreadDumpMonitorContention.java crashed due to SIGSEGV in G1SATBCardTableModRefBS::write_ref_field_pre_work
hseigel
parents:
46722
diff
changeset
|
880 |
GrowableArray<Klass*>* mirror_list = |
902c68ab7f57
8185103: TestThreadDumpMonitorContention.java crashed due to SIGSEGV in G1SATBCardTableModRefBS::write_ref_field_pre_work
hseigel
parents:
46722
diff
changeset
|
881 |
new (ResourceObj::C_HEAP, mtClass) GrowableArray<Klass*>(40, true); |
902c68ab7f57
8185103: TestThreadDumpMonitorContention.java crashed due to SIGSEGV in G1SATBCardTableModRefBS::write_ref_field_pre_work
hseigel
parents:
46722
diff
changeset
|
882 |
set_fixup_mirror_list(mirror_list); |
902c68ab7f57
8185103: TestThreadDumpMonitorContention.java crashed due to SIGSEGV in G1SATBCardTableModRefBS::write_ref_field_pre_work
hseigel
parents:
46722
diff
changeset
|
883 |
|
902c68ab7f57
8185103: TestThreadDumpMonitorContention.java crashed due to SIGSEGV in G1SATBCardTableModRefBS::write_ref_field_pre_work
hseigel
parents:
46722
diff
changeset
|
884 |
GrowableArray<Klass*>* module_list = |
902c68ab7f57
8185103: TestThreadDumpMonitorContention.java crashed due to SIGSEGV in G1SATBCardTableModRefBS::write_ref_field_pre_work
hseigel
parents:
46722
diff
changeset
|
885 |
new (ResourceObj::C_HEAP, mtModule) GrowableArray<Klass*>(500, true); |
902c68ab7f57
8185103: TestThreadDumpMonitorContention.java crashed due to SIGSEGV in G1SATBCardTableModRefBS::write_ref_field_pre_work
hseigel
parents:
46722
diff
changeset
|
886 |
set_fixup_module_field_list(module_list); |
902c68ab7f57
8185103: TestThreadDumpMonitorContention.java crashed due to SIGSEGV in G1SATBCardTableModRefBS::write_ref_field_pre_work
hseigel
parents:
46722
diff
changeset
|
887 |
} |
902c68ab7f57
8185103: TestThreadDumpMonitorContention.java crashed due to SIGSEGV in G1SATBCardTableModRefBS::write_ref_field_pre_work
hseigel
parents:
46722
diff
changeset
|
888 |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
889 |
void java_lang_Class::create_mirror(Klass* k, Handle class_loader, |
36508 | 890 |
Handle module, Handle protection_domain, TRAPS) { |
46710
941f16147746
8182397: Race in field updates when creating ArrayKlasses can lead to crash
coleenp
parents:
46643
diff
changeset
|
891 |
assert(k != NULL, "Use create_basic_type_mirror for primitive types"); |
1 | 892 |
assert(k->java_mirror() == NULL, "should only assign mirror once"); |
46772
902c68ab7f57
8185103: TestThreadDumpMonitorContention.java crashed due to SIGSEGV in G1SATBCardTableModRefBS::write_ref_field_pre_work
hseigel
parents:
46722
diff
changeset
|
893 |
|
1 | 894 |
// Use this moment of initialization to cache modifier_flags also, |
895 |
// to support Class.getModifiers(). Instance classes recalculate |
|
896 |
// the cached flags after the class file is parsed, but before the |
|
897 |
// class is put into the system dictionary. |
|
23872
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
898 |
int computed_modifiers = k->compute_modifier_flags(CHECK); |
1 | 899 |
k->set_modifier_flags(computed_modifiers); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
900 |
// 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
|
901 |
// the mirror. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
902 |
if (SystemDictionary::Class_klass_loaded()) { |
1 | 903 |
// Allocate mirror (java.lang.Class instance) |
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46257
diff
changeset
|
904 |
oop mirror_oop = InstanceMirrorKlass::cast(SystemDictionary::Class_klass())->allocate_instance(k, CHECK); |
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46257
diff
changeset
|
905 |
Handle mirror(THREAD, mirror_oop); |
46710
941f16147746
8182397: Race in field updates when creating ArrayKlasses can lead to crash
coleenp
parents:
46643
diff
changeset
|
906 |
Handle comp_mirror; |
23872
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
907 |
|
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
908 |
// Setup indirection from mirror->klass |
46710
941f16147746
8182397: Race in field updates when creating ArrayKlasses can lead to crash
coleenp
parents:
46643
diff
changeset
|
909 |
java_lang_Class::set_klass(mirror(), k); |
13738
d67be49a5beb
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
13728
diff
changeset
|
910 |
|
d67be49a5beb
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
13728
diff
changeset
|
911 |
InstanceMirrorKlass* mk = InstanceMirrorKlass::cast(mirror->klass()); |
23872
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
912 |
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
|
913 |
|
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
914 |
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
|
915 |
|
1 | 916 |
// It might also have a component mirror. This mirror must already exist. |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
917 |
if (k->is_array_klass()) { |
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
918 |
if (k->is_typeArray_klass()) { |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
919 |
BasicType type = TypeArrayKlass::cast(k)->element_type(); |
46710
941f16147746
8182397: Race in field updates when creating ArrayKlasses can lead to crash
coleenp
parents:
46643
diff
changeset
|
920 |
comp_mirror = Handle(THREAD, Universe::java_mirror(type)); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
921 |
} else { |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
922 |
assert(k->is_objArray_klass(), "Must be"); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
923 |
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
|
924 |
assert(element_klass != NULL, "Must have an element klass"); |
46710
941f16147746
8182397: Race in field updates when creating ArrayKlasses can lead to crash
coleenp
parents:
46643
diff
changeset
|
925 |
comp_mirror = Handle(THREAD, element_klass->java_mirror()); |
1 | 926 |
} |
46710
941f16147746
8182397: Race in field updates when creating ArrayKlasses can lead to crash
coleenp
parents:
46643
diff
changeset
|
927 |
assert(comp_mirror() != NULL, "must have a mirror"); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
928 |
|
23872
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
929 |
// 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
|
930 |
// (array_klass) k -> mirror -> component_mirror -> array_klass -> k |
46710
941f16147746
8182397: Race in field updates when creating ArrayKlasses can lead to crash
coleenp
parents:
46643
diff
changeset
|
931 |
set_component_mirror(mirror(), comp_mirror()); |
941f16147746
8182397: Race in field updates when creating ArrayKlasses can lead to crash
coleenp
parents:
46643
diff
changeset
|
932 |
// See below for ordering dependencies between field array_klass in component mirror |
941f16147746
8182397: Race in field updates when creating ArrayKlasses can lead to crash
coleenp
parents:
46643
diff
changeset
|
933 |
// and java_mirror in this klass. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
934 |
} else { |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
935 |
assert(k->is_instance_klass(), "Must be"); |
17826
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
936 |
|
23872
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
937 |
initialize_mirror_fields(k, mirror, protection_domain, THREAD); |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
938 |
if (HAS_PENDING_EXCEPTION) { |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
939 |
// 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
|
940 |
// 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
|
941 |
// 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
|
942 |
// it represents no class. |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
943 |
java_lang_Class::set_klass(mirror(), NULL); |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
944 |
return; |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
945 |
} |
1 | 946 |
} |
23872
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
947 |
|
25326
85b2f2e63e3e
6642881: Improve performance of Class.getClassLoader()
coleenp
parents:
25057
diff
changeset
|
948 |
// set the classLoader field in the java_lang_Class instance |
49658 | 949 |
assert(oopDesc::equals(class_loader(), k->class_loader()), "should be same"); |
25326
85b2f2e63e3e
6642881: Improve performance of Class.getClassLoader()
coleenp
parents:
25057
diff
changeset
|
950 |
set_class_loader(mirror(), class_loader()); |
85b2f2e63e3e
6642881: Improve performance of Class.getClassLoader()
coleenp
parents:
25057
diff
changeset
|
951 |
|
46710
941f16147746
8182397: Race in field updates when creating ArrayKlasses can lead to crash
coleenp
parents:
46643
diff
changeset
|
952 |
// Setup indirection from klass->mirror |
23872
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
953 |
// after any exceptions can happen during allocations. |
47580 | 954 |
k->set_java_mirror(mirror); |
46772
902c68ab7f57
8185103: TestThreadDumpMonitorContention.java crashed due to SIGSEGV in G1SATBCardTableModRefBS::write_ref_field_pre_work
hseigel
parents:
46722
diff
changeset
|
955 |
|
902c68ab7f57
8185103: TestThreadDumpMonitorContention.java crashed due to SIGSEGV in G1SATBCardTableModRefBS::write_ref_field_pre_work
hseigel
parents:
46722
diff
changeset
|
956 |
// Set the module field in the java_lang_Class instance. This must be done |
902c68ab7f57
8185103: TestThreadDumpMonitorContention.java crashed due to SIGSEGV in G1SATBCardTableModRefBS::write_ref_field_pre_work
hseigel
parents:
46722
diff
changeset
|
957 |
// after the mirror is set. |
902c68ab7f57
8185103: TestThreadDumpMonitorContention.java crashed due to SIGSEGV in G1SATBCardTableModRefBS::write_ref_field_pre_work
hseigel
parents:
46722
diff
changeset
|
958 |
set_mirror_module_field(k, mirror, module, THREAD); |
902c68ab7f57
8185103: TestThreadDumpMonitorContention.java crashed due to SIGSEGV in G1SATBCardTableModRefBS::write_ref_field_pre_work
hseigel
parents:
46722
diff
changeset
|
959 |
|
46710
941f16147746
8182397: Race in field updates when creating ArrayKlasses can lead to crash
coleenp
parents:
46643
diff
changeset
|
960 |
if (comp_mirror() != NULL) { |
941f16147746
8182397: Race in field updates when creating ArrayKlasses can lead to crash
coleenp
parents:
46643
diff
changeset
|
961 |
// Set after k->java_mirror() is published, because compiled code running |
941f16147746
8182397: Race in field updates when creating ArrayKlasses can lead to crash
coleenp
parents:
46643
diff
changeset
|
962 |
// concurrently doesn't expect a k to have a null java_mirror. |
941f16147746
8182397: Race in field updates when creating ArrayKlasses can lead to crash
coleenp
parents:
46643
diff
changeset
|
963 |
release_set_array_klass(comp_mirror(), k); |
23872
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
23871
diff
changeset
|
964 |
} |
1 | 965 |
} else { |
46772
902c68ab7f57
8185103: TestThreadDumpMonitorContention.java crashed due to SIGSEGV in G1SATBCardTableModRefBS::write_ref_field_pre_work
hseigel
parents:
46722
diff
changeset
|
966 |
assert(fixup_mirror_list() != NULL, "fixup_mirror_list not initialized"); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
967 |
fixup_mirror_list()->push(k); |
1 | 968 |
} |
969 |
} |
|
970 |
||
49329 | 971 |
#if INCLUDE_CDS_JAVA_HEAP |
972 |
// Clears mirror fields. Static final fields with initial values are reloaded |
|
973 |
// from constant pool. The object identity hash is in the object header and is |
|
974 |
// not affected. |
|
975 |
class ResetMirrorField: public FieldClosure { |
|
976 |
private: |
|
977 |
Handle _m; |
|
978 |
||
979 |
public: |
|
980 |
ResetMirrorField(Handle mirror) : _m(mirror) {} |
|
981 |
||
982 |
void do_field(fieldDescriptor* fd) { |
|
983 |
assert(DumpSharedSpaces, "dump time only"); |
|
984 |
assert(_m.not_null(), "Mirror cannot be NULL"); |
|
985 |
||
986 |
if (fd->is_static() && fd->has_initial_value()) { |
|
987 |
initialize_static_field(fd, _m, Thread::current()); |
|
988 |
return; |
|
989 |
} |
|
990 |
||
991 |
BasicType ft = fd->field_type(); |
|
992 |
switch (ft) { |
|
993 |
case T_BYTE: |
|
994 |
_m()->byte_field_put(fd->offset(), 0); |
|
995 |
break; |
|
996 |
case T_CHAR: |
|
997 |
_m()->char_field_put(fd->offset(), 0); |
|
998 |
break; |
|
999 |
case T_DOUBLE: |
|
1000 |
_m()->double_field_put(fd->offset(), 0); |
|
1001 |
break; |
|
1002 |
case T_FLOAT: |
|
1003 |
_m()->float_field_put(fd->offset(), 0); |
|
1004 |
break; |
|
1005 |
case T_INT: |
|
1006 |
_m()->int_field_put(fd->offset(), 0); |
|
1007 |
break; |
|
1008 |
case T_LONG: |
|
1009 |
_m()->long_field_put(fd->offset(), 0); |
|
1010 |
break; |
|
1011 |
case T_SHORT: |
|
1012 |
_m()->short_field_put(fd->offset(), 0); |
|
1013 |
break; |
|
1014 |
case T_BOOLEAN: |
|
1015 |
_m()->bool_field_put(fd->offset(), false); |
|
1016 |
break; |
|
1017 |
case T_ARRAY: |
|
1018 |
case T_OBJECT: { |
|
1019 |
// It might be useful to cache the String field, but |
|
1020 |
// for now just clear out any reference field |
|
1021 |
oop o = _m()->obj_field(fd->offset()); |
|
1022 |
_m()->obj_field_put(fd->offset(), NULL); |
|
1023 |
break; |
|
1024 |
} |
|
1025 |
default: |
|
1026 |
ShouldNotReachHere(); |
|
1027 |
break; |
|
1028 |
} |
|
1029 |
} |
|
1030 |
}; |
|
1031 |
||
1032 |
void java_lang_Class::archive_basic_type_mirrors(TRAPS) { |
|
1033 |
assert(MetaspaceShared::is_heap_object_archiving_allowed(), |
|
1034 |
"MetaspaceShared::is_heap_object_archiving_allowed() must be true"); |
|
1035 |
||
1036 |
for (int t = 0; t <= T_VOID; t++) { |
|
1037 |
oop m = Universe::_mirrors[t]; |
|
1038 |
if (m != NULL) { |
|
1039 |
// Update the field at _array_klass_offset to point to the relocated array klass. |
|
1040 |
oop archived_m = MetaspaceShared::archive_heap_object(m, THREAD); |
|
51425
4e9667589c43
8209389: SIGSEGV in WalkOopAndArchiveClosure::do_oop_work.
jiangli
parents:
51417
diff
changeset
|
1041 |
assert(archived_m != NULL, "sanity"); |
49329 | 1042 |
Klass *ak = (Klass*)(archived_m->metadata_field(_array_klass_offset)); |
1043 |
assert(ak != NULL || t == T_VOID, "should not be NULL"); |
|
1044 |
if (ak != NULL) { |
|
1045 |
Klass *reloc_ak = MetaspaceShared::get_relocated_klass(ak); |
|
1046 |
archived_m->metadata_field_put(_array_klass_offset, reloc_ak); |
|
1047 |
} |
|
1048 |
||
1049 |
// Clear the fields. Just to be safe |
|
1050 |
Klass *k = m->klass(); |
|
1051 |
Handle archived_mirror_h(THREAD, archived_m); |
|
1052 |
ResetMirrorField reset(archived_mirror_h); |
|
1053 |
InstanceKlass::cast(k)->do_nonstatic_fields(&reset); |
|
1054 |
||
50951
b96466cdfc45
8202035: Archive the set of ModuleDescriptor and ModuleReference objects for observable system modules with unnamed initial module.
jiangli
parents:
50882
diff
changeset
|
1055 |
log_trace(cds, heap, mirror)( |
b96466cdfc45
8202035: Archive the set of ModuleDescriptor and ModuleReference objects for observable system modules with unnamed initial module.
jiangli
parents:
50882
diff
changeset
|
1056 |
"Archived %s mirror object from " PTR_FORMAT " ==> " PTR_FORMAT, |
b96466cdfc45
8202035: Archive the set of ModuleDescriptor and ModuleReference objects for observable system modules with unnamed initial module.
jiangli
parents:
50882
diff
changeset
|
1057 |
type2name((BasicType)t), p2i(Universe::_mirrors[t]), p2i(archived_m)); |
49329 | 1058 |
|
1059 |
Universe::_mirrors[t] = archived_m; |
|
1060 |
} |
|
1061 |
} |
|
1062 |
||
1063 |
assert(Universe::_mirrors[T_INT] != NULL && |
|
1064 |
Universe::_mirrors[T_FLOAT] != NULL && |
|
1065 |
Universe::_mirrors[T_DOUBLE] != NULL && |
|
1066 |
Universe::_mirrors[T_BYTE] != NULL && |
|
1067 |
Universe::_mirrors[T_BOOLEAN] != NULL && |
|
1068 |
Universe::_mirrors[T_CHAR] != NULL && |
|
1069 |
Universe::_mirrors[T_LONG] != NULL && |
|
1070 |
Universe::_mirrors[T_SHORT] != NULL && |
|
1071 |
Universe::_mirrors[T_VOID] != NULL, "sanity"); |
|
1072 |
||
1073 |
Universe::set_int_mirror(Universe::_mirrors[T_INT]); |
|
1074 |
Universe::set_float_mirror(Universe::_mirrors[T_FLOAT]); |
|
1075 |
Universe::set_double_mirror(Universe::_mirrors[T_DOUBLE]); |
|
1076 |
Universe::set_byte_mirror(Universe::_mirrors[T_BYTE]); |
|
1077 |
Universe::set_bool_mirror(Universe::_mirrors[T_BOOLEAN]); |
|
1078 |
Universe::set_char_mirror(Universe::_mirrors[T_CHAR]); |
|
1079 |
Universe::set_long_mirror(Universe::_mirrors[T_LONG]); |
|
1080 |
Universe::set_short_mirror(Universe::_mirrors[T_SHORT]); |
|
1081 |
Universe::set_void_mirror(Universe::_mirrors[T_VOID]); |
|
1082 |
} |
|
1083 |
||
1084 |
// |
|
1085 |
// After the mirror object is successfully archived, the archived |
|
1086 |
// klass is set with _has_archived_raw_mirror flag. |
|
1087 |
// |
|
1088 |
// The _has_archived_raw_mirror flag is cleared at runtime when the |
|
1089 |
// archived mirror is restored. If archived java heap data cannot |
|
1090 |
// be used at runtime, new mirror object is created for the shared |
|
1091 |
// class. The _has_archived_raw_mirror is cleared also during the process. |
|
1092 |
oop java_lang_Class::archive_mirror(Klass* k, TRAPS) { |
|
1093 |
assert(MetaspaceShared::is_heap_object_archiving_allowed(), |
|
1094 |
"MetaspaceShared::is_heap_object_archiving_allowed() must be true"); |
|
1095 |
||
1096 |
// Mirror is already archived |
|
1097 |
if (k->has_raw_archived_mirror()) { |
|
1098 |
assert(k->archived_java_mirror_raw() != NULL, "no archived mirror"); |
|
1099 |
return k->archived_java_mirror_raw(); |
|
1100 |
} |
|
1101 |
||
1102 |
// No mirror |
|
1103 |
oop mirror = k->java_mirror(); |
|
1104 |
if (mirror == NULL) { |
|
1105 |
return NULL; |
|
1106 |
} |
|
1107 |
||
1108 |
if (k->is_instance_klass()) { |
|
1109 |
InstanceKlass *ik = InstanceKlass::cast(k); |
|
1110 |
assert(ik->signers() == NULL && !k->has_signer_and_not_archived(), |
|
1111 |
"class with signer cannot be supported"); |
|
1112 |
||
1113 |
if (!(ik->is_shared_boot_class() || ik->is_shared_platform_class() || |
|
1114 |
ik->is_shared_app_class())) { |
|
1115 |
// Archiving mirror for classes from non-builtin loaders is not |
|
1116 |
// supported. Clear the _java_mirror within the archived class. |
|
1117 |
k->set_java_mirror_handle(NULL); |
|
1118 |
return NULL; |
|
1119 |
} |
|
1120 |
} |
|
1121 |
||
1122 |
// Now start archiving the mirror object |
|
1123 |
oop archived_mirror = MetaspaceShared::archive_heap_object(mirror, THREAD); |
|
1124 |
if (archived_mirror == NULL) { |
|
1125 |
return NULL; |
|
1126 |
} |
|
1127 |
||
1128 |
archived_mirror = process_archived_mirror(k, mirror, archived_mirror, THREAD); |
|
1129 |
if (archived_mirror == NULL) { |
|
1130 |
return NULL; |
|
1131 |
} |
|
1132 |
||
1133 |
k->set_archived_java_mirror_raw(archived_mirror); |
|
1134 |
||
1135 |
k->set_has_raw_archived_mirror(); |
|
1136 |
||
1137 |
ResourceMark rm; |
|
50951
b96466cdfc45
8202035: Archive the set of ModuleDescriptor and ModuleReference objects for observable system modules with unnamed initial module.
jiangli
parents:
50882
diff
changeset
|
1138 |
log_trace(cds, heap, mirror)( |
b96466cdfc45
8202035: Archive the set of ModuleDescriptor and ModuleReference objects for observable system modules with unnamed initial module.
jiangli
parents:
50882
diff
changeset
|
1139 |
"Archived %s mirror object from " PTR_FORMAT " ==> " PTR_FORMAT, |
b96466cdfc45
8202035: Archive the set of ModuleDescriptor and ModuleReference objects for observable system modules with unnamed initial module.
jiangli
parents:
50882
diff
changeset
|
1140 |
k->external_name(), p2i(mirror), p2i(archived_mirror)); |
49329 | 1141 |
|
1142 |
return archived_mirror; |
|
1143 |
} |
|
1144 |
||
1145 |
// The process is based on create_mirror(). |
|
1146 |
oop java_lang_Class::process_archived_mirror(Klass* k, oop mirror, |
|
1147 |
oop archived_mirror, |
|
1148 |
Thread *THREAD) { |
|
1149 |
// Clear nonstatic fields in archived mirror. Some of the fields will be set |
|
1150 |
// to archived metadata and objects below. |
|
1151 |
Klass *c = archived_mirror->klass(); |
|
1152 |
Handle archived_mirror_h(THREAD, archived_mirror); |
|
1153 |
ResetMirrorField reset(archived_mirror_h); |
|
1154 |
InstanceKlass::cast(c)->do_nonstatic_fields(&reset); |
|
1155 |
||
1156 |
if (k->is_array_klass()) { |
|
1157 |
oop archived_comp_mirror; |
|
1158 |
if (k->is_typeArray_klass()) { |
|
1159 |
// The primitive type mirrors are already archived. Get the archived mirror. |
|
1160 |
oop comp_mirror = java_lang_Class::component_mirror(mirror); |
|
1161 |
archived_comp_mirror = MetaspaceShared::find_archived_heap_object(comp_mirror); |
|
1162 |
assert(archived_comp_mirror != NULL, "Must be"); |
|
1163 |
} else { |
|
1164 |
assert(k->is_objArray_klass(), "Must be"); |
|
1165 |
Klass* element_klass = ObjArrayKlass::cast(k)->element_klass(); |
|
1166 |
assert(element_klass != NULL, "Must have an element klass"); |
|
1167 |
archived_comp_mirror = archive_mirror(element_klass, THREAD); |
|
1168 |
if (archived_comp_mirror == NULL) { |
|
1169 |
return NULL; |
|
1170 |
} |
|
1171 |
} |
|
1172 |
java_lang_Class::set_component_mirror(archived_mirror, archived_comp_mirror); |
|
1173 |
} else { |
|
1174 |
assert(k->is_instance_klass(), "Must be"); |
|
1175 |
||
1176 |
// Reset local static fields in the mirror |
|
1177 |
InstanceKlass::cast(k)->do_local_static_fields(&reset); |
|
1178 |
||
1179 |
java_lang_Class:set_init_lock(archived_mirror, NULL); |
|
1180 |
||
1181 |
set_protection_domain(archived_mirror, NULL); |
|
1182 |
} |
|
1183 |
||
1184 |
// clear class loader and mirror_module_field |
|
1185 |
set_class_loader(archived_mirror, NULL); |
|
1186 |
set_module(archived_mirror, NULL); |
|
1187 |
||
1188 |
// The archived mirror's field at _klass_offset is still pointing to the original |
|
1189 |
// klass. Updated the field in the archived mirror to point to the relocated |
|
1190 |
// klass in the archive. |
|
1191 |
Klass *reloc_k = MetaspaceShared::get_relocated_klass(as_Klass(mirror)); |
|
50951
b96466cdfc45
8202035: Archive the set of ModuleDescriptor and ModuleReference objects for observable system modules with unnamed initial module.
jiangli
parents:
50882
diff
changeset
|
1192 |
log_debug(cds, heap, mirror)( |
b96466cdfc45
8202035: Archive the set of ModuleDescriptor and ModuleReference objects for observable system modules with unnamed initial module.
jiangli
parents:
50882
diff
changeset
|
1193 |
"Relocate mirror metadata field at _klass_offset from " PTR_FORMAT " ==> " PTR_FORMAT, |
b96466cdfc45
8202035: Archive the set of ModuleDescriptor and ModuleReference objects for observable system modules with unnamed initial module.
jiangli
parents:
50882
diff
changeset
|
1194 |
p2i(as_Klass(mirror)), p2i(reloc_k)); |
49329 | 1195 |
archived_mirror->metadata_field_put(_klass_offset, reloc_k); |
1196 |
||
1197 |
// The field at _array_klass_offset is pointing to the original one dimension |
|
1198 |
// higher array klass if exists. Relocate the pointer. |
|
1199 |
Klass *arr = array_klass_acquire(mirror); |
|
1200 |
if (arr != NULL) { |
|
1201 |
Klass *reloc_arr = MetaspaceShared::get_relocated_klass(arr); |
|
50951
b96466cdfc45
8202035: Archive the set of ModuleDescriptor and ModuleReference objects for observable system modules with unnamed initial module.
jiangli
parents:
50882
diff
changeset
|
1202 |
log_debug(cds, heap, mirror)( |
b96466cdfc45
8202035: Archive the set of ModuleDescriptor and ModuleReference objects for observable system modules with unnamed initial module.
jiangli
parents:
50882
diff
changeset
|
1203 |
"Relocate mirror metadata field at _array_klass_offset from " PTR_FORMAT " ==> " PTR_FORMAT, |
b96466cdfc45
8202035: Archive the set of ModuleDescriptor and ModuleReference objects for observable system modules with unnamed initial module.
jiangli
parents:
50882
diff
changeset
|
1204 |
p2i(arr), p2i(reloc_arr)); |
49329 | 1205 |
archived_mirror->metadata_field_put(_array_klass_offset, reloc_arr); |
1206 |
} |
|
1207 |
return archived_mirror; |
|
1208 |
} |
|
1209 |
||
50532 | 1210 |
// Returns true if the mirror is updated, false if no archived mirror |
1211 |
// data is present. After the archived mirror object is restored, the |
|
1212 |
// shared klass' _has_raw_archived_mirror flag is cleared. |
|
1213 |
bool java_lang_Class::restore_archived_mirror(Klass *k, |
|
49329 | 1214 |
Handle class_loader, Handle module, |
1215 |
Handle protection_domain, TRAPS) { |
|
50532 | 1216 |
oop m = MetaspaceShared::materialize_archived_object(k->archived_java_mirror_raw()); |
1217 |
||
1218 |
if (m == NULL) { |
|
1219 |
return false; |
|
1220 |
} |
|
1221 |
||
1222 |
log_debug(cds, mirror)("Archived mirror is: " PTR_FORMAT, p2i(m)); |
|
1223 |
||
1224 |
// mirror is archived, restore |
|
1225 |
assert(MetaspaceShared::is_archive_object(m), "must be archived mirror object"); |
|
1226 |
Handle mirror(THREAD, m); |
|
49329 | 1227 |
|
1228 |
// The java.lang.Class field offsets were archived and reloaded from archive. |
|
1229 |
// No need to put classes on the fixup_mirror_list before java.lang.Class |
|
1230 |
// is loaded. |
|
1231 |
||
1232 |
if (!k->is_array_klass()) { |
|
1233 |
// - local static final fields with initial values were initialized at dump time |
|
1234 |
||
1235 |
// create the init_lock |
|
50532 | 1236 |
typeArrayOop r = oopFactory::new_typeArray(T_INT, 0, CHECK_(false)); |
49329 | 1237 |
set_init_lock(mirror(), r); |
1238 |
||
1239 |
if (protection_domain.not_null()) { |
|
1240 |
set_protection_domain(mirror(), protection_domain()); |
|
1241 |
} |
|
1242 |
} |
|
1243 |
||
1244 |
assert(class_loader() == k->class_loader(), "should be same"); |
|
1245 |
if (class_loader.not_null()) { |
|
1246 |
set_class_loader(mirror(), class_loader()); |
|
1247 |
} |
|
1248 |
||
1249 |
k->set_java_mirror(mirror); |
|
1250 |
k->clear_has_raw_archived_mirror(); |
|
1251 |
||
1252 |
set_mirror_module_field(k, mirror, module, THREAD); |
|
1253 |
||
1254 |
ResourceMark rm; |
|
50951
b96466cdfc45
8202035: Archive the set of ModuleDescriptor and ModuleReference objects for observable system modules with unnamed initial module.
jiangli
parents:
50882
diff
changeset
|
1255 |
log_trace(cds, heap, mirror)( |
b96466cdfc45
8202035: Archive the set of ModuleDescriptor and ModuleReference objects for observable system modules with unnamed initial module.
jiangli
parents:
50882
diff
changeset
|
1256 |
"Restored %s archived mirror " PTR_FORMAT, k->external_name(), p2i(mirror())); |
50532 | 1257 |
|
1258 |
return true; |
|
49329 | 1259 |
} |
1260 |
#endif // INCLUDE_CDS_JAVA_HEAP |
|
1261 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
1262 |
void java_lang_Class::fixup_module_field(Klass* k, Handle module) { |
36508 | 1263 |
assert(_module_offset != 0, "must have been computed already"); |
1264 |
java_lang_Class::set_module(k->java_mirror(), module()); |
|
1265 |
} |
|
1 | 1266 |
|
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
1267 |
int java_lang_Class::oop_size(oop java_class) { |
10546 | 1268 |
assert(_oop_size_offset != 0, "must be set"); |
39695
946f1321c075
8158946: btree009 fails with assert(s > 0) failed: Bad size calculated
drwhite
parents:
39402
diff
changeset
|
1269 |
int size = java_class->int_field(_oop_size_offset); |
946f1321c075
8158946: btree009 fails with assert(s > 0) failed: Bad size calculated
drwhite
parents:
39402
diff
changeset
|
1270 |
assert(size > 0, "Oop size must be greater than zero, not %d", size); |
946f1321c075
8158946: btree009 fails with assert(s > 0) failed: Bad size calculated
drwhite
parents:
39402
diff
changeset
|
1271 |
return size; |
946f1321c075
8158946: btree009 fails with assert(s > 0) failed: Bad size calculated
drwhite
parents:
39402
diff
changeset
|
1272 |
} |
946f1321c075
8158946: btree009 fails with assert(s > 0) failed: Bad size calculated
drwhite
parents:
39402
diff
changeset
|
1273 |
|
50882
80abf702eed8
8205683: Refactor heap allocation to separate concerns
eosterlund
parents:
50819
diff
changeset
|
1274 |
void java_lang_Class::set_oop_size(HeapWord* java_class, int size) { |
10546 | 1275 |
assert(_oop_size_offset != 0, "must be set"); |
39695
946f1321c075
8158946: btree009 fails with assert(s > 0) failed: Bad size calculated
drwhite
parents:
39402
diff
changeset
|
1276 |
assert(size > 0, "Oop size must be greater than zero, not %d", size); |
50882
80abf702eed8
8205683: Refactor heap allocation to separate concerns
eosterlund
parents:
50819
diff
changeset
|
1277 |
*(int*)(((char*)java_class) + _oop_size_offset) = size; |
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
1278 |
} |
39695
946f1321c075
8158946: btree009 fails with assert(s > 0) failed: Bad size calculated
drwhite
parents:
39402
diff
changeset
|
1279 |
|
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
1280 |
int java_lang_Class::static_oop_field_count(oop java_class) { |
10546 | 1281 |
assert(_static_oop_field_count_offset != 0, "must be set"); |
1282 |
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
|
1283 |
} |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
1284 |
void java_lang_Class::set_static_oop_field_count(oop java_class, int size) { |
10546 | 1285 |
assert(_static_oop_field_count_offset != 0, "must be set"); |
1286 |
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
|
1287 |
} |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
1288 |
|
17826
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1289 |
oop java_lang_Class::protection_domain(oop java_class) { |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1290 |
assert(_protection_domain_offset != 0, "must be set"); |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1291 |
return java_class->obj_field(_protection_domain_offset); |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1292 |
} |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1293 |
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
|
1294 |
assert(_protection_domain_offset != 0, "must be set"); |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1295 |
java_class->obj_field_put(_protection_domain_offset, pd); |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1296 |
} |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1297 |
|
25465
17a6bddcfa5d
8047737: Move array component mirror to instance of java/lang/Class
coleenp
parents:
25326
diff
changeset
|
1298 |
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
|
1299 |
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
|
1300 |
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
|
1301 |
} |
17a6bddcfa5d
8047737: Move array component mirror to instance of java/lang/Class
coleenp
parents:
25326
diff
changeset
|
1302 |
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
|
1303 |
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
|
1304 |
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
|
1305 |
} |
17a6bddcfa5d
8047737: Move array component mirror to instance of java/lang/Class
coleenp
parents:
25326
diff
changeset
|
1306 |
|
17826
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1307 |
oop java_lang_Class::init_lock(oop java_class) { |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1308 |
assert(_init_lock_offset != 0, "must be set"); |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1309 |
return java_class->obj_field(_init_lock_offset); |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1310 |
} |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1311 |
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
|
1312 |
assert(_init_lock_offset != 0, "must be set"); |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1313 |
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
|
1314 |
} |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1315 |
|
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1316 |
objArrayOop java_lang_Class::signers(oop java_class) { |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1317 |
assert(_signers_offset != 0, "must be set"); |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1318 |
return (objArrayOop)java_class->obj_field(_signers_offset); |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1319 |
} |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1320 |
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
|
1321 |
assert(_signers_offset != 0, "must be set"); |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1322 |
java_class->obj_field_put(_signers_offset, (oop)signers); |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1323 |
} |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1324 |
|
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
1325 |
|
25326
85b2f2e63e3e
6642881: Improve performance of Class.getClassLoader()
coleenp
parents:
25057
diff
changeset
|
1326 |
void java_lang_Class::set_class_loader(oop java_class, oop loader) { |
85b2f2e63e3e
6642881: Improve performance of Class.getClassLoader()
coleenp
parents:
25057
diff
changeset
|
1327 |
// 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
|
1328 |
if (_class_loader_offset != 0) { |
85b2f2e63e3e
6642881: Improve performance of Class.getClassLoader()
coleenp
parents:
25057
diff
changeset
|
1329 |
java_class->obj_field_put(_class_loader_offset, loader); |
85b2f2e63e3e
6642881: Improve performance of Class.getClassLoader()
coleenp
parents:
25057
diff
changeset
|
1330 |
} |
85b2f2e63e3e
6642881: Improve performance of Class.getClassLoader()
coleenp
parents:
25057
diff
changeset
|
1331 |
} |
85b2f2e63e3e
6642881: Improve performance of Class.getClassLoader()
coleenp
parents:
25057
diff
changeset
|
1332 |
|
85b2f2e63e3e
6642881: Improve performance of Class.getClassLoader()
coleenp
parents:
25057
diff
changeset
|
1333 |
oop java_lang_Class::class_loader(oop java_class) { |
85b2f2e63e3e
6642881: Improve performance of Class.getClassLoader()
coleenp
parents:
25057
diff
changeset
|
1334 |
assert(_class_loader_offset != 0, "must be set"); |
85b2f2e63e3e
6642881: Improve performance of Class.getClassLoader()
coleenp
parents:
25057
diff
changeset
|
1335 |
return java_class->obj_field(_class_loader_offset); |
85b2f2e63e3e
6642881: Improve performance of Class.getClassLoader()
coleenp
parents:
25057
diff
changeset
|
1336 |
} |
85b2f2e63e3e
6642881: Improve performance of Class.getClassLoader()
coleenp
parents:
25057
diff
changeset
|
1337 |
|
36508 | 1338 |
oop java_lang_Class::module(oop java_class) { |
1339 |
assert(_module_offset != 0, "must be set"); |
|
1340 |
return java_class->obj_field(_module_offset); |
|
1341 |
} |
|
1342 |
||
1343 |
void java_lang_Class::set_module(oop java_class, oop module) { |
|
1344 |
assert(_module_offset != 0, "must be set"); |
|
1345 |
java_class->obj_field_put(_module_offset, module); |
|
1346 |
} |
|
1347 |
||
1 | 1348 |
oop java_lang_Class::create_basic_type_mirror(const char* basic_type_name, BasicType type, TRAPS) { |
1349 |
// This should be improved by adding a field at the Java level or by |
|
1350 |
// introducing a new VM klass (see comment in ClassFileParser) |
|
13738
d67be49a5beb
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
13728
diff
changeset
|
1351 |
oop java_class = InstanceMirrorKlass::cast(SystemDictionary::Class_klass())->allocate_instance(NULL, CHECK_0); |
1 | 1352 |
if (type != T_VOID) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
1353 |
Klass* aklass = Universe::typeArrayKlassObj(type); |
1 | 1354 |
assert(aklass != NULL, "correct bootstrap"); |
46710
941f16147746
8182397: Race in field updates when creating ArrayKlasses can lead to crash
coleenp
parents:
46643
diff
changeset
|
1355 |
release_set_array_klass(java_class, aklass); |
1 | 1356 |
} |
10742 | 1357 |
#ifdef ASSERT |
13738
d67be49a5beb
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
13728
diff
changeset
|
1358 |
InstanceMirrorKlass* mk = InstanceMirrorKlass::cast(SystemDictionary::Class_klass()); |
10742 | 1359 |
assert(java_lang_Class::static_oop_field_count(java_class) == 0, "should have been zeroed by allocation"); |
1360 |
#endif |
|
1 | 1361 |
return java_class; |
1362 |
} |
|
1363 |
||
1364 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
1365 |
Klass* java_lang_Class::as_Klass(oop java_class) { |
1 | 1366 |
//%note memory_2 |
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
8676
diff
changeset
|
1367 |
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
|
1368 |
Klass* k = ((Klass*)java_class->metadata_field(_klass_offset)); |
1 | 1369 |
assert(k == NULL || k->is_klass(), "type check"); |
1370 |
return k; |
|
1371 |
} |
|
1372 |
||
1373 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
1374 |
void java_lang_Class::set_klass(oop java_class, Klass* klass) { |
10742 | 1375 |
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
|
1376 |
java_class->metadata_field_put(_klass_offset, klass); |
10742 | 1377 |
} |
1378 |
||
1379 |
||
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1380 |
void java_lang_Class::print_signature(oop java_class, outputStream* st) { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1381 |
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
|
1382 |
Symbol* name = NULL; |
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1383 |
bool is_instance = false; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1384 |
if (is_primitive(java_class)) { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1385 |
name = vmSymbols::type_signature(primitive_type(java_class)); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1386 |
} else { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
1387 |
Klass* k = as_Klass(java_class); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
1388 |
is_instance = k->is_instance_klass(); |
14488 | 1389 |
name = k->name(); |
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1390 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1391 |
if (name == NULL) { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1392 |
st->print("<null>"); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1393 |
return; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1394 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1395 |
if (is_instance) st->print("L"); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1396 |
st->write((char*) name->base(), (int) name->utf8_length()); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1397 |
if (is_instance) st->print(";"); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1398 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1399 |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
1400 |
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
|
1401 |
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
|
1402 |
Symbol* name; |
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1403 |
if (is_primitive(java_class)) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
1404 |
name = vmSymbols::type_signature(primitive_type(java_class)); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
1405 |
// 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
|
1406 |
// 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
|
1407 |
// 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
|
1408 |
name->increment_refcount(); |
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1409 |
} else { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
1410 |
Klass* k = as_Klass(java_class); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
1411 |
if (!k->is_instance_klass()) { |
14488 | 1412 |
name = k->name(); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
1413 |
name->increment_refcount(); |
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1414 |
} else { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1415 |
ResourceMark rm; |
14488 | 1416 |
const char* sigstr = k->signature_name(); |
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1417 |
int siglen = (int) strlen(sigstr); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
1418 |
if (!intern_if_not_found) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
1419 |
name = SymbolTable::probe(sigstr, siglen); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
1420 |
} else { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
1421 |
name = SymbolTable::new_symbol(sigstr, siglen, THREAD); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
1422 |
} |
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1423 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1424 |
} |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
1425 |
return name; |
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1426 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1427 |
|
31970
4bb8e8a13f6a
8048353: jstack -l crashes VM when a Java mirror for a primitive type is locked
vkempik
parents:
31587
diff
changeset
|
1428 |
// Returns the Java name for this Java mirror (Resource allocated) |
4bb8e8a13f6a
8048353: jstack -l crashes VM when a Java mirror for a primitive type is locked
vkempik
parents:
31587
diff
changeset
|
1429 |
// See Klass::external_name(). |
4bb8e8a13f6a
8048353: jstack -l crashes VM when a Java mirror for a primitive type is locked
vkempik
parents:
31587
diff
changeset
|
1430 |
// For primitive type Java mirrors, its type name is returned. |
4bb8e8a13f6a
8048353: jstack -l crashes VM when a Java mirror for a primitive type is locked
vkempik
parents:
31587
diff
changeset
|
1431 |
const char* java_lang_Class::as_external_name(oop java_class) { |
4bb8e8a13f6a
8048353: jstack -l crashes VM when a Java mirror for a primitive type is locked
vkempik
parents:
31587
diff
changeset
|
1432 |
assert(java_lang_Class::is_instance(java_class), "must be a Class object"); |
4bb8e8a13f6a
8048353: jstack -l crashes VM when a Java mirror for a primitive type is locked
vkempik
parents:
31587
diff
changeset
|
1433 |
const char* name = NULL; |
4bb8e8a13f6a
8048353: jstack -l crashes VM when a Java mirror for a primitive type is locked
vkempik
parents:
31587
diff
changeset
|
1434 |
if (is_primitive(java_class)) { |
4bb8e8a13f6a
8048353: jstack -l crashes VM when a Java mirror for a primitive type is locked
vkempik
parents:
31587
diff
changeset
|
1435 |
name = type2name(primitive_type(java_class)); |
4bb8e8a13f6a
8048353: jstack -l crashes VM when a Java mirror for a primitive type is locked
vkempik
parents:
31587
diff
changeset
|
1436 |
} else { |
4bb8e8a13f6a
8048353: jstack -l crashes VM when a Java mirror for a primitive type is locked
vkempik
parents:
31587
diff
changeset
|
1437 |
name = as_Klass(java_class)->external_name(); |
4bb8e8a13f6a
8048353: jstack -l crashes VM when a Java mirror for a primitive type is locked
vkempik
parents:
31587
diff
changeset
|
1438 |
} |
4bb8e8a13f6a
8048353: jstack -l crashes VM when a Java mirror for a primitive type is locked
vkempik
parents:
31587
diff
changeset
|
1439 |
if (name == NULL) { |
4bb8e8a13f6a
8048353: jstack -l crashes VM when a Java mirror for a primitive type is locked
vkempik
parents:
31587
diff
changeset
|
1440 |
name = "<null>"; |
4bb8e8a13f6a
8048353: jstack -l crashes VM when a Java mirror for a primitive type is locked
vkempik
parents:
31587
diff
changeset
|
1441 |
} |
4bb8e8a13f6a
8048353: jstack -l crashes VM when a Java mirror for a primitive type is locked
vkempik
parents:
31587
diff
changeset
|
1442 |
return name; |
4bb8e8a13f6a
8048353: jstack -l crashes VM when a Java mirror for a primitive type is locked
vkempik
parents:
31587
diff
changeset
|
1443 |
} |
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1444 |
|
46722
ae2cfffe2e64
8185296: java_lang_Class::array_klass should be array_klass_acquire
coleenp
parents:
46710
diff
changeset
|
1445 |
Klass* java_lang_Class::array_klass_acquire(oop java_class) { |
ae2cfffe2e64
8185296: java_lang_Class::array_klass should be array_klass_acquire
coleenp
parents:
46710
diff
changeset
|
1446 |
Klass* k = ((Klass*)java_class->metadata_field_acquire(_array_klass_offset)); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
1447 |
assert(k == NULL || k->is_klass() && k->is_array_klass(), "should be array klass"); |
1 | 1448 |
return k; |
1449 |
} |
|
1450 |
||
1451 |
||
46710
941f16147746
8182397: Race in field updates when creating ArrayKlasses can lead to crash
coleenp
parents:
46643
diff
changeset
|
1452 |
void java_lang_Class::release_set_array_klass(oop java_class, Klass* klass) { |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
1453 |
assert(klass->is_klass() && klass->is_array_klass(), "should be array klass"); |
46710
941f16147746
8182397: Race in field updates when creating ArrayKlasses can lead to crash
coleenp
parents:
46643
diff
changeset
|
1454 |
java_class->release_metadata_field_put(_array_klass_offset, klass); |
1 | 1455 |
} |
1456 |
||
1457 |
||
1458 |
bool java_lang_Class::is_primitive(oop java_class) { |
|
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1459 |
// should assert: |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1460 |
//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
|
1461 |
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
|
1462 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
1463 |
#ifdef ASSERT |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
1464 |
if (is_primitive) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
1465 |
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
|
1466 |
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
|
1467 |
"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
|
1468 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
1469 |
#endif |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
1470 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
1471 |
return is_primitive; |
1 | 1472 |
} |
1473 |
||
1474 |
||
1475 |
BasicType java_lang_Class::primitive_type(oop java_class) { |
|
1476 |
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
|
1477 |
Klass* ak = ((Klass*)java_class->metadata_field(_array_klass_offset)); |
1 | 1478 |
BasicType type = T_VOID; |
1479 |
if (ak != NULL) { |
|
1480 |
// 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
|
1481 |
type = ArrayKlass::cast(ak)->element_type(); |
1 | 1482 |
} else { |
49658 | 1483 |
assert(oopDesc::equals(java_class, Universe::void_mirror()), "only valid non-array primitive"); |
1 | 1484 |
} |
49658 | 1485 |
assert(oopDesc::equals(Universe::java_mirror(type), java_class), "must be consistent"); |
1 | 1486 |
return type; |
1487 |
} |
|
1488 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
1489 |
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
|
1490 |
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
|
1491 |
if (is_primitive(java_class)) { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1492 |
if (reference_klass != NULL) |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1493 |
(*reference_klass) = NULL; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1494 |
return primitive_type(java_class); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1495 |
} else { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1496 |
if (reference_klass != NULL) |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
1497 |
(*reference_klass) = as_Klass(java_class); |
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1498 |
return T_OBJECT; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1499 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1500 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
1501 |
|
1 | 1502 |
|
1503 |
oop java_lang_Class::primitive_mirror(BasicType t) { |
|
1504 |
oop mirror = Universe::java_mirror(t); |
|
4571 | 1505 |
assert(mirror != NULL && mirror->is_a(SystemDictionary::Class_klass()), "must be a Class"); |
1 | 1506 |
assert(java_lang_Class::is_primitive(mirror), "must be primitive"); |
1507 |
return mirror; |
|
1508 |
} |
|
1509 |
||
1510 |
bool java_lang_Class::offsets_computed = false; |
|
1511 |
int java_lang_Class::classRedefinedCount_offset = -1; |
|
1512 |
||
49329 | 1513 |
#define CLASS_FIELDS_DO(macro) \ |
1514 |
macro(classRedefinedCount_offset, k, "classRedefinedCount", int_signature, false) ; \ |
|
1515 |
macro(_class_loader_offset, k, "classLoader", classloader_signature, false); \ |
|
1516 |
macro(_component_mirror_offset, k, "componentType", class_signature, false); \ |
|
1517 |
macro(_module_offset, k, "module", module_signature, false) |
|
1518 |
||
1 | 1519 |
void java_lang_Class::compute_offsets() { |
49329 | 1520 |
if (offsets_computed) { |
1521 |
return; |
|
1522 |
} |
|
1523 |
||
1 | 1524 |
offsets_computed = true; |
1525 |
||
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
1526 |
InstanceKlass* k = SystemDictionary::Class_klass(); |
49329 | 1527 |
CLASS_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
36508 | 1528 |
|
26412
80741eb33ba2
8049105: Move array component mirror to instance of java/lang/Class (hotspot part 2)
coleenp
parents:
25714
diff
changeset
|
1529 |
// 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
|
1530 |
// 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
|
1531 |
// 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
|
1532 |
_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
|
1533 |
|
10546 | 1534 |
CLASS_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET); |
1 | 1535 |
} |
1536 |
||
49329 | 1537 |
#if INCLUDE_CDS |
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
1538 |
void java_lang_Class::serialize_offsets(SerializeClosure* f) { |
49329 | 1539 |
f->do_u4((u4*)&offsets_computed); |
1540 |
f->do_u4((u4*)&_init_lock_offset); |
|
1541 |
||
1542 |
CLASS_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
|
1543 |
||
1544 |
CLASS_INJECTED_FIELDS(INJECTED_FIELD_SERIALIZE_OFFSET); |
|
1545 |
} |
|
1546 |
#endif |
|
1547 |
||
1 | 1548 |
int java_lang_Class::classRedefinedCount(oop the_class_mirror) { |
25057 | 1549 |
if (classRedefinedCount_offset == -1) { |
1 | 1550 |
// If we don't have an offset for it then just return -1 as a marker. |
1551 |
return -1; |
|
1552 |
} |
|
1553 |
||
1554 |
return the_class_mirror->int_field(classRedefinedCount_offset); |
|
1555 |
} |
|
1556 |
||
1557 |
void java_lang_Class::set_classRedefinedCount(oop the_class_mirror, int value) { |
|
25057 | 1558 |
if (classRedefinedCount_offset == -1) { |
1 | 1559 |
// If we don't have an offset for it then nothing to set. |
1560 |
return; |
|
1561 |
} |
|
1562 |
||
1563 |
the_class_mirror->int_field_put(classRedefinedCount_offset, value); |
|
1564 |
} |
|
1565 |
||
1566 |
||
1567 |
// Note: JDK1.1 and before had a privateInfo_offset field which was used for the |
|
1568 |
// platform thread structure, and a eetop offset which was used for thread |
|
1569 |
// local storage (and unused by the HotSpot VM). In JDK1.2 the two structures |
|
1570 |
// merged, so in the HotSpot VM we just use the eetop field for the thread |
|
1571 |
// instead of the privateInfo_offset. |
|
1572 |
// |
|
1573 |
// Note: The stackSize field is only present starting in 1.4. |
|
1574 |
||
1575 |
int java_lang_Thread::_name_offset = 0; |
|
1576 |
int java_lang_Thread::_group_offset = 0; |
|
1577 |
int java_lang_Thread::_contextClassLoader_offset = 0; |
|
1578 |
int java_lang_Thread::_inheritedAccessControlContext_offset = 0; |
|
1579 |
int java_lang_Thread::_priority_offset = 0; |
|
1580 |
int java_lang_Thread::_eetop_offset = 0; |
|
1581 |
int java_lang_Thread::_daemon_offset = 0; |
|
1582 |
int java_lang_Thread::_stillborn_offset = 0; |
|
1583 |
int java_lang_Thread::_stackSize_offset = 0; |
|
1584 |
int java_lang_Thread::_tid_offset = 0; |
|
1585 |
int java_lang_Thread::_thread_status_offset = 0; |
|
1586 |
int java_lang_Thread::_park_blocker_offset = 0; |
|
1587 |
int java_lang_Thread::_park_event_offset = 0 ; |
|
1588 |
||
49329 | 1589 |
#define THREAD_FIELDS_DO(macro) \ |
1590 |
macro(_name_offset, k, vmSymbols::name_name(), string_signature, false); \ |
|
1591 |
macro(_group_offset, k, vmSymbols::group_name(), threadgroup_signature, false); \ |
|
1592 |
macro(_contextClassLoader_offset, k, vmSymbols::contextClassLoader_name(), classloader_signature, false); \ |
|
1593 |
macro(_inheritedAccessControlContext_offset, k, vmSymbols::inheritedAccessControlContext_name(), accesscontrolcontext_signature, false); \ |
|
1594 |
macro(_priority_offset, k, vmSymbols::priority_name(), int_signature, false); \ |
|
1595 |
macro(_daemon_offset, k, vmSymbols::daemon_name(), bool_signature, false); \ |
|
1596 |
macro(_eetop_offset, k, "eetop", long_signature, false); \ |
|
1597 |
macro(_stillborn_offset, k, "stillborn", bool_signature, false); \ |
|
1598 |
macro(_stackSize_offset, k, "stackSize", long_signature, false); \ |
|
1599 |
macro(_tid_offset, k, "tid", long_signature, false); \ |
|
1600 |
macro(_thread_status_offset, k, "threadStatus", int_signature, false); \ |
|
1601 |
macro(_park_blocker_offset, k, "parkBlocker", object_signature, false); \ |
|
1602 |
macro(_park_event_offset, k, "nativeParkEventPointer", long_signature, false) |
|
1 | 1603 |
|
1604 |
void java_lang_Thread::compute_offsets() { |
|
1605 |
assert(_group_offset == 0, "offsets should be initialized only once"); |
|
1606 |
||
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
1607 |
InstanceKlass* k = SystemDictionary::Thread_klass(); |
49329 | 1608 |
THREAD_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
1609 |
} |
|
1610 |
||
1611 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
1612 |
void java_lang_Thread::serialize_offsets(SerializeClosure* f) { |
49329 | 1613 |
THREAD_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
1614 |
} |
|
1615 |
#endif |
|
1 | 1616 |
|
1617 |
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
|
1618 |
return (JavaThread*)java_thread->address_field(_eetop_offset); |
1 | 1619 |
} |
1620 |
||
1621 |
||
1622 |
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
|
1623 |
java_thread->address_field_put(_eetop_offset, (address)thread); |
1 | 1624 |
} |
1625 |
||
1626 |
||
27654 | 1627 |
oop java_lang_Thread::name(oop java_thread) { |
1628 |
return java_thread->obj_field(_name_offset); |
|
1629 |
} |
|
1630 |
||
1631 |
||
1632 |
void java_lang_Thread::set_name(oop java_thread, oop name) { |
|
1 | 1633 |
java_thread->obj_field_put(_name_offset, name); |
1634 |
} |
|
1635 |
||
1636 |
||
1637 |
ThreadPriority java_lang_Thread::priority(oop java_thread) { |
|
1638 |
return (ThreadPriority)java_thread->int_field(_priority_offset); |
|
1639 |
} |
|
1640 |
||
1641 |
||
1642 |
void java_lang_Thread::set_priority(oop java_thread, ThreadPriority priority) { |
|
1643 |
java_thread->int_field_put(_priority_offset, priority); |
|
1644 |
} |
|
1645 |
||
1646 |
||
1647 |
oop java_lang_Thread::threadGroup(oop java_thread) { |
|
1648 |
return java_thread->obj_field(_group_offset); |
|
1649 |
} |
|
1650 |
||
1651 |
||
1652 |
bool java_lang_Thread::is_stillborn(oop java_thread) { |
|
1653 |
return java_thread->bool_field(_stillborn_offset) != 0; |
|
1654 |
} |
|
1655 |
||
1656 |
||
1657 |
// We never have reason to turn the stillborn bit off |
|
1658 |
void java_lang_Thread::set_stillborn(oop java_thread) { |
|
1659 |
java_thread->bool_field_put(_stillborn_offset, true); |
|
1660 |
} |
|
1661 |
||
1662 |
||
1663 |
bool java_lang_Thread::is_alive(oop java_thread) { |
|
1664 |
JavaThread* thr = java_lang_Thread::thread(java_thread); |
|
1665 |
return (thr != NULL); |
|
1666 |
} |
|
1667 |
||
1668 |
||
1669 |
bool java_lang_Thread::is_daemon(oop java_thread) { |
|
1670 |
return java_thread->bool_field(_daemon_offset) != 0; |
|
1671 |
} |
|
1672 |
||
1673 |
||
1674 |
void java_lang_Thread::set_daemon(oop java_thread) { |
|
1675 |
java_thread->bool_field_put(_daemon_offset, true); |
|
1676 |
} |
|
1677 |
||
1678 |
oop java_lang_Thread::context_class_loader(oop java_thread) { |
|
1679 |
return java_thread->obj_field(_contextClassLoader_offset); |
|
1680 |
} |
|
1681 |
||
1682 |
oop java_lang_Thread::inherited_access_control_context(oop java_thread) { |
|
1683 |
return java_thread->obj_field(_inheritedAccessControlContext_offset); |
|
1684 |
} |
|
1685 |
||
1686 |
||
1687 |
jlong java_lang_Thread::stackSize(oop java_thread) { |
|
1688 |
if (_stackSize_offset > 0) { |
|
1689 |
return java_thread->long_field(_stackSize_offset); |
|
1690 |
} else { |
|
1691 |
return 0; |
|
1692 |
} |
|
1693 |
} |
|
1694 |
||
1695 |
// Write the thread status value to threadStatus field in java.lang.Thread java class. |
|
1696 |
void java_lang_Thread::set_thread_status(oop java_thread, |
|
1697 |
java_lang_Thread::ThreadStatus status) { |
|
1698 |
// The threadStatus is only present starting in 1.5 |
|
1699 |
if (_thread_status_offset > 0) { |
|
1700 |
java_thread->int_field_put(_thread_status_offset, status); |
|
1701 |
} |
|
1702 |
} |
|
1703 |
||
1704 |
// Read thread status value from threadStatus field in java.lang.Thread java class. |
|
1705 |
java_lang_Thread::ThreadStatus java_lang_Thread::get_thread_status(oop java_thread) { |
|
46643 | 1706 |
// Make sure the caller is operating on behalf of the VM or is |
1707 |
// running VM code (state == _thread_in_vm). |
|
1708 |
assert(Threads_lock->owned_by_self() || Thread::current()->is_VM_thread() || |
|
1 | 1709 |
JavaThread::current()->thread_state() == _thread_in_vm, |
1710 |
"Java Thread is not running in vm"); |
|
1711 |
// The threadStatus is only present starting in 1.5 |
|
1712 |
if (_thread_status_offset > 0) { |
|
1713 |
return (java_lang_Thread::ThreadStatus)java_thread->int_field(_thread_status_offset); |
|
1714 |
} else { |
|
1715 |
// All we can easily figure out is if it is alive, but that is |
|
1716 |
// enough info for a valid unknown status. |
|
1717 |
// These aren't restricted to valid set ThreadStatus values, so |
|
1718 |
// use JVMTI values and cast. |
|
1719 |
JavaThread* thr = java_lang_Thread::thread(java_thread); |
|
1720 |
if (thr == NULL) { |
|
1721 |
// the thread hasn't run yet or is in the process of exiting |
|
1722 |
return NEW; |
|
1723 |
} |
|
1724 |
return (java_lang_Thread::ThreadStatus)JVMTI_THREAD_STATE_ALIVE; |
|
1725 |
} |
|
1726 |
} |
|
1727 |
||
1728 |
||
1729 |
jlong java_lang_Thread::thread_id(oop java_thread) { |
|
1730 |
// The thread ID field is only present starting in 1.5 |
|
1731 |
if (_tid_offset > 0) { |
|
1732 |
return java_thread->long_field(_tid_offset); |
|
1733 |
} else { |
|
1734 |
return 0; |
|
1735 |
} |
|
1736 |
} |
|
1737 |
||
1738 |
oop java_lang_Thread::park_blocker(oop java_thread) { |
|
950 | 1739 |
assert(JDK_Version::current().supports_thread_park_blocker() && |
1740 |
_park_blocker_offset != 0, "Must support parkBlocker field"); |
|
1 | 1741 |
|
1742 |
if (_park_blocker_offset > 0) { |
|
1743 |
return java_thread->obj_field(_park_blocker_offset); |
|
1744 |
} |
|
1745 |
||
1746 |
return NULL; |
|
1747 |
} |
|
1748 |
||
1749 |
jlong java_lang_Thread::park_event(oop java_thread) { |
|
1750 |
if (_park_event_offset > 0) { |
|
1751 |
return java_thread->long_field(_park_event_offset); |
|
1752 |
} |
|
1753 |
return 0; |
|
1754 |
} |
|
1755 |
||
1756 |
bool java_lang_Thread::set_park_event(oop java_thread, jlong ptr) { |
|
1757 |
if (_park_event_offset > 0) { |
|
1758 |
java_thread->long_field_put(_park_event_offset, ptr); |
|
1759 |
return true; |
|
1760 |
} |
|
1761 |
return false; |
|
1762 |
} |
|
1763 |
||
1764 |
||
1765 |
const char* java_lang_Thread::thread_status_name(oop java_thread) { |
|
25057 | 1766 |
assert(_thread_status_offset != 0, "Must have thread status"); |
1 | 1767 |
ThreadStatus status = (java_lang_Thread::ThreadStatus)java_thread->int_field(_thread_status_offset); |
1768 |
switch (status) { |
|
1769 |
case NEW : return "NEW"; |
|
1770 |
case RUNNABLE : return "RUNNABLE"; |
|
1771 |
case SLEEPING : return "TIMED_WAITING (sleeping)"; |
|
1772 |
case IN_OBJECT_WAIT : return "WAITING (on object monitor)"; |
|
1773 |
case IN_OBJECT_WAIT_TIMED : return "TIMED_WAITING (on object monitor)"; |
|
1774 |
case PARKED : return "WAITING (parking)"; |
|
1775 |
case PARKED_TIMED : return "TIMED_WAITING (parking)"; |
|
1776 |
case BLOCKED_ON_MONITOR_ENTER : return "BLOCKED (on object monitor)"; |
|
1777 |
case TERMINATED : return "TERMINATED"; |
|
1778 |
default : return "UNKNOWN"; |
|
1779 |
}; |
|
1780 |
} |
|
1781 |
int java_lang_ThreadGroup::_parent_offset = 0; |
|
1782 |
int java_lang_ThreadGroup::_name_offset = 0; |
|
1783 |
int java_lang_ThreadGroup::_threads_offset = 0; |
|
1784 |
int java_lang_ThreadGroup::_groups_offset = 0; |
|
1785 |
int java_lang_ThreadGroup::_maxPriority_offset = 0; |
|
1786 |
int java_lang_ThreadGroup::_destroyed_offset = 0; |
|
1787 |
int java_lang_ThreadGroup::_daemon_offset = 0; |
|
1788 |
int java_lang_ThreadGroup::_nthreads_offset = 0; |
|
1789 |
int java_lang_ThreadGroup::_ngroups_offset = 0; |
|
1790 |
||
1791 |
oop java_lang_ThreadGroup::parent(oop java_thread_group) { |
|
46968
9119841280f4
8160399: is_oop_or_null involves undefined behavior
coleenp
parents:
46773
diff
changeset
|
1792 |
assert(oopDesc::is_oop(java_thread_group), "thread group must be oop"); |
1 | 1793 |
return java_thread_group->obj_field(_parent_offset); |
1794 |
} |
|
1795 |
||
1796 |
// ("name as oop" accessor is not necessary) |
|
1797 |
||
33628 | 1798 |
const char* java_lang_ThreadGroup::name(oop java_thread_group) { |
1 | 1799 |
oop name = java_thread_group->obj_field(_name_offset); |
1800 |
// ThreadGroup.name can be null |
|
33628 | 1801 |
if (name != NULL) { |
1802 |
return java_lang_String::as_utf8_string(name); |
|
1803 |
} |
|
1804 |
return NULL; |
|
1 | 1805 |
} |
1806 |
||
1807 |
int java_lang_ThreadGroup::nthreads(oop java_thread_group) { |
|
46968
9119841280f4
8160399: is_oop_or_null involves undefined behavior
coleenp
parents:
46773
diff
changeset
|
1808 |
assert(oopDesc::is_oop(java_thread_group), "thread group must be oop"); |
1 | 1809 |
return java_thread_group->int_field(_nthreads_offset); |
1810 |
} |
|
1811 |
||
1812 |
objArrayOop java_lang_ThreadGroup::threads(oop java_thread_group) { |
|
1813 |
oop threads = java_thread_group->obj_field(_threads_offset); |
|
1814 |
assert(threads != NULL, "threadgroups should have threads"); |
|
1815 |
assert(threads->is_objArray(), "just checking"); // Todo: Add better type checking code |
|
1816 |
return objArrayOop(threads); |
|
1817 |
} |
|
1818 |
||
1819 |
int java_lang_ThreadGroup::ngroups(oop java_thread_group) { |
|
46968
9119841280f4
8160399: is_oop_or_null involves undefined behavior
coleenp
parents:
46773
diff
changeset
|
1820 |
assert(oopDesc::is_oop(java_thread_group), "thread group must be oop"); |
1 | 1821 |
return java_thread_group->int_field(_ngroups_offset); |
1822 |
} |
|
1823 |
||
1824 |
objArrayOop java_lang_ThreadGroup::groups(oop java_thread_group) { |
|
1825 |
oop groups = java_thread_group->obj_field(_groups_offset); |
|
1826 |
assert(groups == NULL || groups->is_objArray(), "just checking"); // Todo: Add better type checking code |
|
1827 |
return objArrayOop(groups); |
|
1828 |
} |
|
1829 |
||
1830 |
ThreadPriority java_lang_ThreadGroup::maxPriority(oop java_thread_group) { |
|
46968
9119841280f4
8160399: is_oop_or_null involves undefined behavior
coleenp
parents:
46773
diff
changeset
|
1831 |
assert(oopDesc::is_oop(java_thread_group), "thread group must be oop"); |
1 | 1832 |
return (ThreadPriority) java_thread_group->int_field(_maxPriority_offset); |
1833 |
} |
|
1834 |
||
1835 |
bool java_lang_ThreadGroup::is_destroyed(oop java_thread_group) { |
|
46968
9119841280f4
8160399: is_oop_or_null involves undefined behavior
coleenp
parents:
46773
diff
changeset
|
1836 |
assert(oopDesc::is_oop(java_thread_group), "thread group must be oop"); |
1 | 1837 |
return java_thread_group->bool_field(_destroyed_offset) != 0; |
1838 |
} |
|
1839 |
||
1840 |
bool java_lang_ThreadGroup::is_daemon(oop java_thread_group) { |
|
46968
9119841280f4
8160399: is_oop_or_null involves undefined behavior
coleenp
parents:
46773
diff
changeset
|
1841 |
assert(oopDesc::is_oop(java_thread_group), "thread group must be oop"); |
1 | 1842 |
return java_thread_group->bool_field(_daemon_offset) != 0; |
1843 |
} |
|
1844 |
||
49329 | 1845 |
#define THREADGROUP_FIELDS_DO(macro) \ |
1846 |
macro(_parent_offset, k, vmSymbols::parent_name(), threadgroup_signature, false); \ |
|
1847 |
macro(_name_offset, k, vmSymbols::name_name(), string_signature, false); \ |
|
1848 |
macro(_threads_offset, k, vmSymbols::threads_name(), thread_array_signature, false); \ |
|
1849 |
macro(_groups_offset, k, vmSymbols::groups_name(), threadgroup_array_signature, false); \ |
|
1850 |
macro(_maxPriority_offset, k, vmSymbols::maxPriority_name(), int_signature, false); \ |
|
1851 |
macro(_destroyed_offset, k, vmSymbols::destroyed_name(), bool_signature, false); \ |
|
1852 |
macro(_daemon_offset, k, vmSymbols::daemon_name(), bool_signature, false); \ |
|
1853 |
macro(_nthreads_offset, k, vmSymbols::nthreads_name(), int_signature, false); \ |
|
1854 |
macro(_ngroups_offset, k, vmSymbols::ngroups_name(), int_signature, false) |
|
1855 |
||
1 | 1856 |
void java_lang_ThreadGroup::compute_offsets() { |
1857 |
assert(_parent_offset == 0, "offsets should be initialized only once"); |
|
1858 |
||
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
1859 |
InstanceKlass* k = SystemDictionary::ThreadGroup_klass(); |
49329 | 1860 |
THREADGROUP_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
1861 |
} |
|
1862 |
||
1863 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
1864 |
void java_lang_ThreadGroup::serialize_offsets(SerializeClosure* f) { |
49329 | 1865 |
THREADGROUP_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
1866 |
} |
|
1867 |
#endif |
|
1868 |
||
1869 |
#define THROWABLE_FIELDS_DO(macro) \ |
|
1870 |
macro(backtrace_offset, k, "backtrace", object_signature, false); \ |
|
1871 |
macro(detailMessage_offset, k, "detailMessage", string_signature, false); \ |
|
1872 |
macro(stackTrace_offset, k, "stackTrace", java_lang_StackTraceElement_array, false); \ |
|
1873 |
macro(depth_offset, k, "depth", int_signature, false); \ |
|
1874 |
macro(static_unassigned_stacktrace_offset, k, "UNASSIGNED_STACK", java_lang_StackTraceElement_array, true) |
|
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
1875 |
|
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
1876 |
void java_lang_Throwable::compute_offsets() { |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
1877 |
InstanceKlass* k = SystemDictionary::Throwable_klass(); |
49329 | 1878 |
THROWABLE_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
1879 |
} |
|
1880 |
||
1881 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
1882 |
void java_lang_Throwable::serialize_offsets(SerializeClosure* f) { |
49329 | 1883 |
THROWABLE_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
1884 |
} |
|
1885 |
#endif |
|
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
1886 |
|
10233
b40fd2bd2fac
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
10018
diff
changeset
|
1887 |
oop java_lang_Throwable::unassigned_stacktrace() { |
33602 | 1888 |
InstanceKlass* ik = SystemDictionary::Throwable_klass(); |
49473
26958d06b585
8199739: Use HeapAccess when loading oops from static fields in javaClasses.cpp
rkennke
parents:
49449
diff
changeset
|
1889 |
oop base = ik->static_field_base_raw(); |
26958d06b585
8199739: Use HeapAccess when loading oops from static fields in javaClasses.cpp
rkennke
parents:
49449
diff
changeset
|
1890 |
return base->obj_field(static_unassigned_stacktrace_offset); |
10233
b40fd2bd2fac
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
10018
diff
changeset
|
1891 |
} |
b40fd2bd2fac
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
10018
diff
changeset
|
1892 |
|
1 | 1893 |
oop java_lang_Throwable::backtrace(oop throwable) { |
1894 |
return throwable->obj_field_acquire(backtrace_offset); |
|
1895 |
} |
|
1896 |
||
1897 |
||
1898 |
void java_lang_Throwable::set_backtrace(oop throwable, oop value) { |
|
1899 |
throwable->release_obj_field_put(backtrace_offset, value); |
|
1900 |
} |
|
1901 |
||
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
1902 |
int java_lang_Throwable::depth(oop throwable) { |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
1903 |
return throwable->int_field(depth_offset); |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
1904 |
} |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
1905 |
|
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
1906 |
void java_lang_Throwable::set_depth(oop throwable, int value) { |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
1907 |
throwable->int_field_put(depth_offset, value); |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
1908 |
} |
1 | 1909 |
|
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46257
diff
changeset
|
1910 |
oop java_lang_Throwable::message(oop throwable) { |
1 | 1911 |
return throwable->obj_field(detailMessage_offset); |
1912 |
} |
|
1913 |
||
1914 |
||
25624
b3bd733f04e9
8048933: -XX:+TraceExceptions output should include the message
coleenp
parents:
25465
diff
changeset
|
1915 |
// Return Symbol for detailed_message or NULL |
b3bd733f04e9
8048933: -XX:+TraceExceptions output should include the message
coleenp
parents:
25465
diff
changeset
|
1916 |
Symbol* java_lang_Throwable::detail_message(oop throwable) { |
b3bd733f04e9
8048933: -XX:+TraceExceptions output should include the message
coleenp
parents:
25465
diff
changeset
|
1917 |
PRESERVE_EXCEPTION_MARK; // Keep original exception |
b3bd733f04e9
8048933: -XX:+TraceExceptions output should include the message
coleenp
parents:
25465
diff
changeset
|
1918 |
oop detailed_message = java_lang_Throwable::message(throwable); |
b3bd733f04e9
8048933: -XX:+TraceExceptions output should include the message
coleenp
parents:
25465
diff
changeset
|
1919 |
if (detailed_message != NULL) { |
b3bd733f04e9
8048933: -XX:+TraceExceptions output should include the message
coleenp
parents:
25465
diff
changeset
|
1920 |
return java_lang_String::as_symbol(detailed_message, THREAD); |
b3bd733f04e9
8048933: -XX:+TraceExceptions output should include the message
coleenp
parents:
25465
diff
changeset
|
1921 |
} |
b3bd733f04e9
8048933: -XX:+TraceExceptions output should include the message
coleenp
parents:
25465
diff
changeset
|
1922 |
return NULL; |
b3bd733f04e9
8048933: -XX:+TraceExceptions output should include the message
coleenp
parents:
25465
diff
changeset
|
1923 |
} |
b3bd733f04e9
8048933: -XX:+TraceExceptions output should include the message
coleenp
parents:
25465
diff
changeset
|
1924 |
|
1 | 1925 |
void java_lang_Throwable::set_message(oop throwable, oop value) { |
1926 |
throwable->obj_field_put(detailMessage_offset, value); |
|
1927 |
} |
|
1928 |
||
1929 |
||
10233
b40fd2bd2fac
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
10018
diff
changeset
|
1930 |
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
|
1931 |
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
|
1932 |
} |
b40fd2bd2fac
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
10018
diff
changeset
|
1933 |
|
1 | 1934 |
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
|
1935 |
set_stacktrace(throwable, NULL); |
1 | 1936 |
} |
1937 |
||
1938 |
||
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46257
diff
changeset
|
1939 |
void java_lang_Throwable::print(oop throwable, outputStream* st) { |
1 | 1940 |
ResourceMark rm; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
1941 |
Klass* k = throwable->klass(); |
1 | 1942 |
assert(k != NULL, "just checking"); |
33602 | 1943 |
st->print("%s", k->external_name()); |
1 | 1944 |
oop msg = message(throwable); |
1945 |
if (msg != NULL) { |
|
1946 |
st->print(": %s", java_lang_String::as_utf8_string(msg)); |
|
1947 |
} |
|
1948 |
} |
|
1949 |
||
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1950 |
// After this many redefines, the stack trace is unreliable. |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1951 |
const int MAX_VERSION = USHRT_MAX; |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1952 |
|
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1953 |
static inline bool version_matches(Method* method, int version) { |
30107
e3d259b825a1
8067662: "java.lang.NullPointerException: Method name is null" from StackTraceElement.<init>
sspitsyn
parents:
29081
diff
changeset
|
1954 |
assert(version < MAX_VERSION, "version is too big"); |
e3d259b825a1
8067662: "java.lang.NullPointerException: Method name is null" from StackTraceElement.<init>
sspitsyn
parents:
29081
diff
changeset
|
1955 |
return method != NULL && (method->constants()->version() == version); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1956 |
} |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1957 |
|
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
1958 |
|
1 | 1959 |
// This class provides a simple wrapper over the internal structure of |
1960 |
// exception backtrace to insulate users of the backtrace from needing |
|
1961 |
// to know what it looks like. |
|
1962 |
class BacktraceBuilder: public StackObj { |
|
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
1963 |
friend class BacktraceIterator; |
1 | 1964 |
private: |
1965 |
Handle _backtrace; |
|
1966 |
objArrayOop _head; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
1967 |
typeArrayOop _methods; |
1 | 1968 |
typeArrayOop _bcis; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
1969 |
objArrayOop _mirrors; |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
1970 |
typeArrayOop _names; // needed to insulate method name against redefinition |
1 | 1971 |
int _index; |
35492
c8c0273e6b91
8146690: Make all classes in GC follow the naming convention.
david
parents:
34317
diff
changeset
|
1972 |
NoSafepointVerifier _nsv; |
1 | 1973 |
|
1974 |
enum { |
|
1975 |
trace_methods_offset = java_lang_Throwable::trace_methods_offset, |
|
30107
e3d259b825a1
8067662: "java.lang.NullPointerException: Method name is null" from StackTraceElement.<init>
sspitsyn
parents:
29081
diff
changeset
|
1976 |
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
|
1977 |
trace_mirrors_offset = java_lang_Throwable::trace_mirrors_offset, |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
1978 |
trace_names_offset = java_lang_Throwable::trace_names_offset, |
1 | 1979 |
trace_next_offset = java_lang_Throwable::trace_next_offset, |
1980 |
trace_size = java_lang_Throwable::trace_size, |
|
1981 |
trace_chunk_size = java_lang_Throwable::trace_chunk_size |
|
1982 |
}; |
|
1983 |
||
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1984 |
// get info out of chunks |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1985 |
static typeArrayOop get_methods(objArrayHandle chunk) { |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1986 |
typeArrayOop methods = typeArrayOop(chunk->obj_at(trace_methods_offset)); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1987 |
assert(methods != NULL, "method array should be initialized in backtrace"); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1988 |
return methods; |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1989 |
} |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1990 |
static typeArrayOop get_bcis(objArrayHandle chunk) { |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1991 |
typeArrayOop bcis = typeArrayOop(chunk->obj_at(trace_bcis_offset)); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1992 |
assert(bcis != NULL, "bci array should be initialized in backtrace"); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1993 |
return bcis; |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1994 |
} |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1995 |
static objArrayOop get_mirrors(objArrayHandle chunk) { |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1996 |
objArrayOop mirrors = objArrayOop(chunk->obj_at(trace_mirrors_offset)); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1997 |
assert(mirrors != NULL, "mirror array should be initialized in backtrace"); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1998 |
return mirrors; |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
1999 |
} |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2000 |
static typeArrayOop get_names(objArrayHandle chunk) { |
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2001 |
typeArrayOop names = typeArrayOop(chunk->obj_at(trace_names_offset)); |
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2002 |
assert(names != NULL, "names array should be initialized in backtrace"); |
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2003 |
return names; |
30107
e3d259b825a1
8067662: "java.lang.NullPointerException: Method name is null" from StackTraceElement.<init>
sspitsyn
parents:
29081
diff
changeset
|
2004 |
} |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2005 |
|
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2006 |
public: |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2007 |
|
1 | 2008 |
// constructor for new backtrace |
51334
cc2c79d22508
8208671: Runtime, JFR, Serviceability changes to allow enabling -Wreorder
tschatzl
parents:
51097
diff
changeset
|
2009 |
BacktraceBuilder(TRAPS): _head(NULL), _methods(NULL), _bcis(NULL), _mirrors(NULL), _names(NULL) { |
1 | 2010 |
expand(CHECK); |
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46257
diff
changeset
|
2011 |
_backtrace = Handle(THREAD, _head); |
1 | 2012 |
_index = 0; |
2013 |
} |
|
2014 |
||
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46257
diff
changeset
|
2015 |
BacktraceBuilder(Thread* thread, objArrayHandle backtrace) { |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2016 |
_methods = get_methods(backtrace); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2017 |
_bcis = get_bcis(backtrace); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2018 |
_mirrors = get_mirrors(backtrace); |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2019 |
_names = get_names(backtrace); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2020 |
assert(_methods->length() == _bcis->length() && |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2021 |
_methods->length() == _mirrors->length() && |
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2022 |
_mirrors->length() == _names->length(), |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2023 |
"method and source information arrays should match"); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2024 |
|
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2025 |
// head is the preallocated backtrace |
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46257
diff
changeset
|
2026 |
_head = backtrace(); |
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46257
diff
changeset
|
2027 |
_backtrace = Handle(thread, _head); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2028 |
_index = 0; |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2029 |
} |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2030 |
|
1 | 2031 |
void expand(TRAPS) { |
2032 |
objArrayHandle old_head(THREAD, _head); |
|
35492
c8c0273e6b91
8146690: Make all classes in GC follow the naming convention.
david
parents:
34317
diff
changeset
|
2033 |
PauseNoSafepointVerifier pnsv(&_nsv); |
1 | 2034 |
|
2035 |
objArrayOop head = oopFactory::new_objectArray(trace_size, CHECK); |
|
2036 |
objArrayHandle new_head(THREAD, head); |
|
2037 |
||
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2038 |
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
|
2039 |
typeArrayHandle new_methods(THREAD, methods); |
1 | 2040 |
|
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2041 |
typeArrayOop bcis = oopFactory::new_intArray(trace_chunk_size, CHECK); |
1 | 2042 |
typeArrayHandle new_bcis(THREAD, bcis); |
2043 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
2044 |
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
|
2045 |
objArrayHandle new_mirrors(THREAD, mirrors); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
2046 |
|
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2047 |
typeArrayOop names = oopFactory::new_symbolArray(trace_chunk_size, CHECK); |
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2048 |
typeArrayHandle new_names(THREAD, names); |
30107
e3d259b825a1
8067662: "java.lang.NullPointerException: Method name is null" from StackTraceElement.<init>
sspitsyn
parents:
29081
diff
changeset
|
2049 |
|
1 | 2050 |
if (!old_head.is_null()) { |
2051 |
old_head->obj_at_put(trace_next_offset, new_head()); |
|
2052 |
} |
|
2053 |
new_head->obj_at_put(trace_methods_offset, new_methods()); |
|
2054 |
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
|
2055 |
new_head->obj_at_put(trace_mirrors_offset, new_mirrors()); |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2056 |
new_head->obj_at_put(trace_names_offset, new_names()); |
1 | 2057 |
|
2058 |
_head = new_head(); |
|
2059 |
_methods = new_methods(); |
|
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2060 |
_bcis = new_bcis(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
2061 |
_mirrors = new_mirrors(); |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2062 |
_names = new_names(); |
1 | 2063 |
_index = 0; |
2064 |
} |
|
2065 |
||
2066 |
oop backtrace() { |
|
2067 |
return _backtrace(); |
|
2068 |
} |
|
2069 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
2070 |
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
|
2071 |
// 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
|
2072 |
// 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
|
2073 |
// 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
|
2074 |
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
|
2075 |
|
1 | 2076 |
if (_index >= trace_chunk_size) { |
2077 |
methodHandle mhandle(THREAD, method); |
|
2078 |
expand(CHECK); |
|
2079 |
method = mhandle(); |
|
2080 |
} |
|
2081 |
||
48814
f01f81fa1242
8194246: JVM crashes when calling getStackTrace if stack contains a method that is a member of a very large class
coleenp
parents:
48620
diff
changeset
|
2082 |
_methods->ushort_at_put(_index, method->orig_method_idnum()); |
34280 | 2083 |
_bcis->int_at_put(_index, Backtrace::merge_bci_and_version(bci, method->constants()->version())); |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2084 |
|
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2085 |
// Note:this doesn't leak symbols because the mirror in the backtrace keeps the |
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2086 |
// klass owning the symbols alive so their refcounts aren't decremented. |
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2087 |
Symbol* name = method->name(); |
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2088 |
_names->symbol_at_put(_index, name); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2089 |
|
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2090 |
// 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
|
2091 |
// from being unloaded while we still have this stack trace. |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2092 |
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
|
2093 |
_mirrors->obj_at_put(_index, method->method_holder()->java_mirror()); |
1 | 2094 |
_index++; |
2095 |
} |
|
2096 |
||
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2097 |
}; |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2098 |
|
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2099 |
struct BacktraceElement : public StackObj { |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2100 |
int _method_id; |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2101 |
int _bci; |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2102 |
int _version; |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2103 |
Symbol* _name; |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2104 |
Handle _mirror; |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2105 |
BacktraceElement(Handle mirror, int mid, int version, int bci, Symbol* name) : |
51334
cc2c79d22508
8208671: Runtime, JFR, Serviceability changes to allow enabling -Wreorder
tschatzl
parents:
51097
diff
changeset
|
2106 |
_method_id(mid), _bci(bci), _version(version), _name(name), _mirror(mirror) {} |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2107 |
}; |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2108 |
|
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2109 |
class BacktraceIterator : public StackObj { |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2110 |
int _index; |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2111 |
objArrayHandle _result; |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2112 |
objArrayHandle _mirrors; |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2113 |
typeArrayHandle _methods; |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2114 |
typeArrayHandle _bcis; |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2115 |
typeArrayHandle _names; |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2116 |
|
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2117 |
void init(objArrayHandle result, Thread* thread) { |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2118 |
// Get method id, bci, version and mirror from chunk |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2119 |
_result = result; |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2120 |
if (_result.not_null()) { |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2121 |
_methods = typeArrayHandle(thread, BacktraceBuilder::get_methods(_result)); |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2122 |
_bcis = typeArrayHandle(thread, BacktraceBuilder::get_bcis(_result)); |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2123 |
_mirrors = objArrayHandle(thread, BacktraceBuilder::get_mirrors(_result)); |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2124 |
_names = typeArrayHandle(thread, BacktraceBuilder::get_names(_result)); |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2125 |
_index = 0; |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2126 |
} |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2127 |
} |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2128 |
public: |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2129 |
BacktraceIterator(objArrayHandle result, Thread* thread) { |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2130 |
init(result, thread); |
37082
1a8577705228
8151728: jni test crashes JVM assert(_handle != __null) failed: resolving NULL handle
coleenp
parents:
37064
diff
changeset
|
2131 |
assert(_methods.is_null() || _methods->length() == java_lang_Throwable::trace_chunk_size, "lengths don't match"); |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2132 |
} |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2133 |
|
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2134 |
BacktraceElement next(Thread* thread) { |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2135 |
BacktraceElement e (Handle(thread, _mirrors->obj_at(_index)), |
48814
f01f81fa1242
8194246: JVM crashes when calling getStackTrace if stack contains a method that is a member of a very large class
coleenp
parents:
48620
diff
changeset
|
2136 |
_methods->ushort_at(_index), |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2137 |
Backtrace::version_at(_bcis->int_at(_index)), |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2138 |
Backtrace::bci_at(_bcis->int_at(_index)), |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2139 |
_names->symbol_at(_index)); |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2140 |
_index++; |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2141 |
|
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2142 |
if (_index >= java_lang_Throwable::trace_chunk_size) { |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2143 |
int next_offset = java_lang_Throwable::trace_next_offset; |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2144 |
// Get next chunk |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2145 |
objArrayHandle result (thread, objArrayOop(_result->obj_at(next_offset))); |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2146 |
init(result, thread); |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2147 |
} |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2148 |
return e; |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2149 |
} |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2150 |
|
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2151 |
bool repeat() { |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2152 |
return _result.not_null() && _mirrors->obj_at(_index) != NULL; |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2153 |
} |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2154 |
}; |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2155 |
|
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2156 |
|
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2157 |
// Print stack trace element to resource allocated buffer |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2158 |
static void print_stack_element_to_stream(outputStream* st, Handle mirror, int method_id, |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2159 |
int version, int bci, Symbol* name) { |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2160 |
ResourceMark rm; |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2161 |
|
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2162 |
// Get strings and string lengths |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2163 |
InstanceKlass* holder = InstanceKlass::cast(java_lang_Class::as_Klass(mirror())); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2164 |
const char* klass_name = holder->external_name(); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2165 |
int buf_len = (int)strlen(klass_name); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2166 |
|
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2167 |
char* method_name = name->as_C_string(); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2168 |
buf_len += (int)strlen(method_name); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2169 |
|
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2170 |
char* source_file_name = NULL; |
34280 | 2171 |
Symbol* source = Backtrace::get_source_file_name(holder, version); |
31985
f63ab3cbd931
8087315: SIGBUS error in nsk/jvmti/RedefineClasses/StressRedefine
coleenp
parents:
31587
diff
changeset
|
2172 |
if (source != NULL) { |
f63ab3cbd931
8087315: SIGBUS error in nsk/jvmti/RedefineClasses/StressRedefine
coleenp
parents:
31587
diff
changeset
|
2173 |
source_file_name = source->as_C_string(); |
f63ab3cbd931
8087315: SIGBUS error in nsk/jvmti/RedefineClasses/StressRedefine
coleenp
parents:
31587
diff
changeset
|
2174 |
buf_len += (int)strlen(source_file_name); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2175 |
} |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2176 |
|
36508 | 2177 |
char *module_name = NULL, *module_version = NULL; |
2178 |
ModuleEntry* module = holder->module(); |
|
2179 |
if (module->is_named()) { |
|
2180 |
module_name = module->name()->as_C_string(); |
|
2181 |
buf_len += (int)strlen(module_name); |
|
2182 |
if (module->version() != NULL) { |
|
2183 |
module_version = module->version()->as_C_string(); |
|
2184 |
buf_len += (int)strlen(module_version); |
|
2185 |
} |
|
2186 |
} |
|
2187 |
||
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2188 |
// 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
|
2189 |
char* buf = NEW_RESOURCE_ARRAY(char, buf_len + 64); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2190 |
|
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2191 |
// Print stack trace line in buffer |
36508 | 2192 |
sprintf(buf, "\tat %s.%s(", klass_name, method_name); |
2193 |
||
2194 |
// Print module information |
|
2195 |
if (module_name != NULL) { |
|
2196 |
if (module_version != NULL) { |
|
2197 |
sprintf(buf + (int)strlen(buf), "%s@%s/", module_name, module_version); |
|
2198 |
} else { |
|
2199 |
sprintf(buf + (int)strlen(buf), "%s/", module_name); |
|
2200 |
} |
|
2201 |
} |
|
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2202 |
|
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2203 |
// The method can be NULL if the requested class version is gone |
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2204 |
Method* method = holder->method_with_orig_idnum(method_id, version); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2205 |
if (!version_matches(method, version)) { |
36508 | 2206 |
strcat(buf, "Redefined)"); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2207 |
} else { |
34280 | 2208 |
int line_number = Backtrace::get_line_number(method, bci); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2209 |
if (line_number == -2) { |
36508 | 2210 |
strcat(buf, "Native Method)"); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2211 |
} else { |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2212 |
if (source_file_name != NULL && (line_number != -1)) { |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2213 |
// Sourcename and linenumber |
36508 | 2214 |
sprintf(buf + (int)strlen(buf), "%s:%d)", source_file_name, line_number); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2215 |
} else if (source_file_name != NULL) { |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2216 |
// Just sourcename |
36508 | 2217 |
sprintf(buf + (int)strlen(buf), "%s)", source_file_name); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2218 |
} else { |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2219 |
// Neither sourcename nor linenumber |
36508 | 2220 |
sprintf(buf + (int)strlen(buf), "Unknown Source)"); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2221 |
} |
38133
78b95467b9f1
8151956: Support non-continuous CodeBlobs in HotSpot
rbackman
parents:
37438
diff
changeset
|
2222 |
CompiledMethod* nm = method->code(); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2223 |
if (WizardMode && nm != NULL) { |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2224 |
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
|
2225 |
} |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2226 |
} |
1 | 2227 |
} |
2228 |
||
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2229 |
st->print_cr("%s", buf); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2230 |
} |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2231 |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33198
diff
changeset
|
2232 |
void java_lang_Throwable::print_stack_element(outputStream *st, const methodHandle& method, int bci) { |
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46257
diff
changeset
|
2233 |
Handle mirror (Thread::current(), method->method_holder()->java_mirror()); |
30107
e3d259b825a1
8067662: "java.lang.NullPointerException: Method name is null" from StackTraceElement.<init>
sspitsyn
parents:
29081
diff
changeset
|
2234 |
int method_id = method->orig_method_idnum(); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2235 |
int version = method->constants()->version(); |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2236 |
print_stack_element_to_stream(st, mirror, method_id, version, bci, method->name()); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2237 |
} |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2238 |
|
35143
33daaea9d5c2
8145435: [JVMCI] some tests on Windows fail with: assert(!thread->is_Java_thread()) failed: must not be java thread
twisti
parents:
34317
diff
changeset
|
2239 |
/** |
33daaea9d5c2
8145435: [JVMCI] some tests on Windows fail with: assert(!thread->is_Java_thread()) failed: must not be java thread
twisti
parents:
34317
diff
changeset
|
2240 |
* Print the throwable message and its stack trace plus all causes by walking the |
33daaea9d5c2
8145435: [JVMCI] some tests on Windows fail with: assert(!thread->is_Java_thread()) failed: must not be java thread
twisti
parents:
34317
diff
changeset
|
2241 |
* cause chain. The output looks the same as of Throwable.printStackTrace(). |
33daaea9d5c2
8145435: [JVMCI] some tests on Windows fail with: assert(!thread->is_Java_thread()) failed: must not be java thread
twisti
parents:
34317
diff
changeset
|
2242 |
*/ |
33daaea9d5c2
8145435: [JVMCI] some tests on Windows fail with: assert(!thread->is_Java_thread()) failed: must not be java thread
twisti
parents:
34317
diff
changeset
|
2243 |
void java_lang_Throwable::print_stack_trace(Handle throwable, outputStream* st) { |
33daaea9d5c2
8145435: [JVMCI] some tests on Windows fail with: assert(!thread->is_Java_thread()) failed: must not be java thread
twisti
parents:
34317
diff
changeset
|
2244 |
// First, print the message. |
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46257
diff
changeset
|
2245 |
print(throwable(), st); |
35143
33daaea9d5c2
8145435: [JVMCI] some tests on Windows fail with: assert(!thread->is_Java_thread()) failed: must not be java thread
twisti
parents:
34317
diff
changeset
|
2246 |
st->cr(); |
33daaea9d5c2
8145435: [JVMCI] some tests on Windows fail with: assert(!thread->is_Java_thread()) failed: must not be java thread
twisti
parents:
34317
diff
changeset
|
2247 |
|
33daaea9d5c2
8145435: [JVMCI] some tests on Windows fail with: assert(!thread->is_Java_thread()) failed: must not be java thread
twisti
parents:
34317
diff
changeset
|
2248 |
// Now print the stack trace. |
33daaea9d5c2
8145435: [JVMCI] some tests on Windows fail with: assert(!thread->is_Java_thread()) failed: must not be java thread
twisti
parents:
34317
diff
changeset
|
2249 |
Thread* THREAD = Thread::current(); |
33daaea9d5c2
8145435: [JVMCI] some tests on Windows fail with: assert(!thread->is_Java_thread()) failed: must not be java thread
twisti
parents:
34317
diff
changeset
|
2250 |
while (throwable.not_null()) { |
33daaea9d5c2
8145435: [JVMCI] some tests on Windows fail with: assert(!thread->is_Java_thread()) failed: must not be java thread
twisti
parents:
34317
diff
changeset
|
2251 |
objArrayHandle result (THREAD, objArrayOop(backtrace(throwable()))); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2252 |
if (result.is_null()) { |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2253 |
st->print_raw_cr("\t<<no stack trace available>>"); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2254 |
return; |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2255 |
} |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2256 |
BacktraceIterator iter(result, THREAD); |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2257 |
|
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2258 |
while (iter.repeat()) { |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2259 |
BacktraceElement bte = iter.next(THREAD); |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2260 |
print_stack_element_to_stream(st, bte._mirror, bte._method_id, bte._version, bte._bci, bte._name); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2261 |
} |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2262 |
{ |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2263 |
// Call getCause() which doesn't necessarily return the _cause field. |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2264 |
EXCEPTION_MARK; |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2265 |
JavaValue cause(T_OBJECT); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2266 |
JavaCalls::call_virtual(&cause, |
35143
33daaea9d5c2
8145435: [JVMCI] some tests on Windows fail with: assert(!thread->is_Java_thread()) failed: must not be java thread
twisti
parents:
34317
diff
changeset
|
2267 |
throwable, |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
2268 |
throwable->klass(), |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2269 |
vmSymbols::getCause_name(), |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2270 |
vmSymbols::void_throwable_signature(), |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2271 |
THREAD); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2272 |
// 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
|
2273 |
if (HAS_PENDING_EXCEPTION) { |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2274 |
CLEAR_PENDING_EXCEPTION; |
35143
33daaea9d5c2
8145435: [JVMCI] some tests on Windows fail with: assert(!thread->is_Java_thread()) failed: must not be java thread
twisti
parents:
34317
diff
changeset
|
2275 |
throwable = Handle(); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2276 |
} else { |
35143
33daaea9d5c2
8145435: [JVMCI] some tests on Windows fail with: assert(!thread->is_Java_thread()) failed: must not be java thread
twisti
parents:
34317
diff
changeset
|
2277 |
throwable = Handle(THREAD, (oop) cause.get_jobject()); |
33daaea9d5c2
8145435: [JVMCI] some tests on Windows fail with: assert(!thread->is_Java_thread()) failed: must not be java thread
twisti
parents:
34317
diff
changeset
|
2278 |
if (throwable.not_null()) { |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2279 |
st->print("Caused by: "); |
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46257
diff
changeset
|
2280 |
print(throwable(), st); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2281 |
st->cr(); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2282 |
} |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2283 |
} |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2284 |
} |
1 | 2285 |
} |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2286 |
} |
1 | 2287 |
|
35557
029dcb9bfa8b
8146246: JVMCICompiler::abort_on_pending_exception: assert(!thread->owns_locks()) failed: must release all locks when leaving VM
twisti
parents:
35143
diff
changeset
|
2288 |
/** |
029dcb9bfa8b
8146246: JVMCICompiler::abort_on_pending_exception: assert(!thread->owns_locks()) failed: must release all locks when leaving VM
twisti
parents:
35143
diff
changeset
|
2289 |
* Print the throwable stack trace by calling the Java method java.lang.Throwable.printStackTrace(). |
029dcb9bfa8b
8146246: JVMCICompiler::abort_on_pending_exception: assert(!thread->owns_locks()) failed: must release all locks when leaving VM
twisti
parents:
35143
diff
changeset
|
2290 |
*/ |
029dcb9bfa8b
8146246: JVMCICompiler::abort_on_pending_exception: assert(!thread->owns_locks()) failed: must release all locks when leaving VM
twisti
parents:
35143
diff
changeset
|
2291 |
void java_lang_Throwable::java_printStackTrace(Handle throwable, TRAPS) { |
029dcb9bfa8b
8146246: JVMCICompiler::abort_on_pending_exception: assert(!thread->owns_locks()) failed: must release all locks when leaving VM
twisti
parents:
35143
diff
changeset
|
2292 |
assert(throwable->is_a(SystemDictionary::Throwable_klass()), "Throwable instance expected"); |
029dcb9bfa8b
8146246: JVMCICompiler::abort_on_pending_exception: assert(!thread->owns_locks()) failed: must release all locks when leaving VM
twisti
parents:
35143
diff
changeset
|
2293 |
JavaValue result(T_VOID); |
029dcb9bfa8b
8146246: JVMCICompiler::abort_on_pending_exception: assert(!thread->owns_locks()) failed: must release all locks when leaving VM
twisti
parents:
35143
diff
changeset
|
2294 |
JavaCalls::call_virtual(&result, |
029dcb9bfa8b
8146246: JVMCICompiler::abort_on_pending_exception: assert(!thread->owns_locks()) failed: must release all locks when leaving VM
twisti
parents:
35143
diff
changeset
|
2295 |
throwable, |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
2296 |
SystemDictionary::Throwable_klass(), |
35557
029dcb9bfa8b
8146246: JVMCICompiler::abort_on_pending_exception: assert(!thread->owns_locks()) failed: must release all locks when leaving VM
twisti
parents:
35143
diff
changeset
|
2297 |
vmSymbols::printStackTrace_name(), |
029dcb9bfa8b
8146246: JVMCICompiler::abort_on_pending_exception: assert(!thread->owns_locks()) failed: must release all locks when leaving VM
twisti
parents:
35143
diff
changeset
|
2298 |
vmSymbols::void_method_signature(), |
029dcb9bfa8b
8146246: JVMCICompiler::abort_on_pending_exception: assert(!thread->owns_locks()) failed: must release all locks when leaving VM
twisti
parents:
35143
diff
changeset
|
2299 |
THREAD); |
029dcb9bfa8b
8146246: JVMCICompiler::abort_on_pending_exception: assert(!thread->owns_locks()) failed: must release all locks when leaving VM
twisti
parents:
35143
diff
changeset
|
2300 |
} |
029dcb9bfa8b
8146246: JVMCICompiler::abort_on_pending_exception: assert(!thread->owns_locks()) failed: must release all locks when leaving VM
twisti
parents:
35143
diff
changeset
|
2301 |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33198
diff
changeset
|
2302 |
void java_lang_Throwable::fill_in_stack_trace(Handle throwable, const methodHandle& method, TRAPS) { |
1 | 2303 |
if (!StackTraceInThrowable) return; |
2304 |
ResourceMark rm(THREAD); |
|
2305 |
||
2306 |
// Start out by clearing the backtrace for this object, in case the VM |
|
2307 |
// runs out of memory while allocating the stack trace |
|
2308 |
set_backtrace(throwable(), NULL); |
|
25057 | 2309 |
// Clear lazily constructed Java level stacktrace if refilling occurs |
2310 |
// This is unnecessary in 1.7+ but harmless |
|
2311 |
clear_stacktrace(throwable()); |
|
1 | 2312 |
|
2313 |
int max_depth = MaxJavaStackTraceDepth; |
|
2314 |
JavaThread* thread = (JavaThread*)THREAD; |
|
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2315 |
|
1 | 2316 |
BacktraceBuilder bt(CHECK); |
2317 |
||
9321
c29711c6ae35
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
9133
diff
changeset
|
2318 |
// 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
|
2319 |
// with bci 0 |
c29711c6ae35
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
9133
diff
changeset
|
2320 |
if (!thread->has_last_Java_frame()) { |
c29711c6ae35
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
9133
diff
changeset
|
2321 |
if (max_depth >= 1 && method() != NULL) { |
c29711c6ae35
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
9133
diff
changeset
|
2322 |
bt.push(method(), 0, CHECK); |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2323 |
log_info(stacktrace)("%s, %d", throwable->klass()->external_name(), 1); |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2324 |
set_depth(throwable(), 1); |
9321
c29711c6ae35
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
9133
diff
changeset
|
2325 |
set_backtrace(throwable(), bt.backtrace()); |
c29711c6ae35
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
9133
diff
changeset
|
2326 |
} |
c29711c6ae35
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
9133
diff
changeset
|
2327 |
return; |
c29711c6ae35
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
9133
diff
changeset
|
2328 |
} |
c29711c6ae35
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
9133
diff
changeset
|
2329 |
|
1 | 2330 |
// Instead of using vframe directly, this version of fill_in_stack_trace |
2331 |
// basically handles everything by hand. This significantly improved the |
|
2332 |
// speed of this method call up to 28.5% on Solaris sparc. 27.1% on Windows. |
|
2333 |
// See bug 6333838 for more details. |
|
2334 |
// The "ASSERT" here is to verify this method generates the exactly same stack |
|
2335 |
// trace as utilizing vframe. |
|
2336 |
#ifdef ASSERT |
|
2337 |
vframeStream st(thread); |
|
2338 |
methodHandle st_method(THREAD, st.method()); |
|
2339 |
#endif |
|
2340 |
int total_count = 0; |
|
2341 |
RegisterMap map(thread, false); |
|
2342 |
int decode_offset = 0; |
|
38133
78b95467b9f1
8151956: Support non-continuous CodeBlobs in HotSpot
rbackman
parents:
37438
diff
changeset
|
2343 |
CompiledMethod* nm = NULL; |
1 | 2344 |
bool skip_fillInStackTrace_check = false; |
2345 |
bool skip_throwableInit_check = false; |
|
13392
1ef07ae0723d
7187290: nightly failures after JSR 292 lazy method handle update
twisti
parents:
13391
diff
changeset
|
2346 |
bool skip_hidden = !ShowHiddenFrames; |
1 | 2347 |
|
48823
99c973b56994
7179701: MaxJavaStackTraceDepth of zero is not handled correctly/consistently in the VM
coleenp
parents:
48814
diff
changeset
|
2348 |
for (frame fr = thread->last_frame(); max_depth == 0 || max_depth != total_count;) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
2349 |
Method* method = NULL; |
1 | 2350 |
int bci = 0; |
2351 |
||
2352 |
// Compiled java method case. |
|
2353 |
if (decode_offset != 0) { |
|
2354 |
DebugInfoReadStream stream(nm, decode_offset); |
|
2355 |
decode_offset = stream.read_int(); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
2356 |
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
|
2357 |
bci = stream.read_bci(); |
1 | 2358 |
} else { |
2359 |
if (fr.is_first_frame()) break; |
|
2360 |
address pc = fr.pc(); |
|
2361 |
if (fr.is_interpreted_frame()) { |
|
25714
87fa6860b5ae
8004128: NPG: remove stackwalking in Threads::gc_prologue and gc_epilogue code
coleenp
parents:
25624
diff
changeset
|
2362 |
address bcp = fr.interpreter_frame_bcp(); |
1 | 2363 |
method = fr.interpreter_frame_method(); |
25714
87fa6860b5ae
8004128: NPG: remove stackwalking in Threads::gc_prologue and gc_epilogue code
coleenp
parents:
25624
diff
changeset
|
2364 |
bci = method->bci_from(bcp); |
1 | 2365 |
fr = fr.sender(&map); |
2366 |
} else { |
|
2367 |
CodeBlob* cb = fr.cb(); |
|
2368 |
// HMMM QQQ might be nice to have frame return nm as NULL if cb is non-NULL |
|
2369 |
// but non nmethod |
|
2370 |
fr = fr.sender(&map); |
|
38133
78b95467b9f1
8151956: Support non-continuous CodeBlobs in HotSpot
rbackman
parents:
37438
diff
changeset
|
2371 |
if (cb == NULL || !cb->is_compiled()) { |
1 | 2372 |
continue; |
2373 |
} |
|
38133
78b95467b9f1
8151956: Support non-continuous CodeBlobs in HotSpot
rbackman
parents:
37438
diff
changeset
|
2374 |
nm = cb->as_compiled_method(); |
1 | 2375 |
if (nm->method()->is_native()) { |
2376 |
method = nm->method(); |
|
2377 |
bci = 0; |
|
2378 |
} else { |
|
2379 |
PcDesc* pd = nm->pc_desc_at(pc); |
|
2380 |
decode_offset = pd->scope_decode_offset(); |
|
2381 |
// if decode_offset is not equal to 0, it will execute the |
|
2382 |
// "compiled java method case" at the beginning of the loop. |
|
2383 |
continue; |
|
2384 |
} |
|
2385 |
} |
|
2386 |
} |
|
2387 |
#ifdef ASSERT |
|
9132
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2388 |
assert(st_method() == method && st.bci() == bci, |
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2389 |
"Wrong stack trace"); |
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2390 |
st.next(); |
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2391 |
// 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
|
2392 |
// of the Method* in case we GC. |
9132
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2393 |
if (!st.at_end()) { |
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2394 |
st_method = st.method(); |
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2395 |
} |
1 | 2396 |
#endif |
9132
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2397 |
|
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2398 |
// the format of the stacktrace will be: |
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2399 |
// - 1 or more fillInStackTrace frames for the exception class (skipped) |
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2400 |
// - 0 or more <init> methods for the exception class (skipped) |
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2401 |
// - rest of the stack |
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2402 |
|
1 | 2403 |
if (!skip_fillInStackTrace_check) { |
31587
e48945b7849c
8076112: Add @HotSpotIntrinsicCandidate annotation to indicate methods for which Java Runtime has intrinsics
zmajo
parents:
31046
diff
changeset
|
2404 |
if (method->name() == vmSymbols::fillInStackTrace_name() && |
9132
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2405 |
throwable->is_a(method->method_holder())) { |
1 | 2406 |
continue; |
2407 |
} |
|
9132
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2408 |
else { |
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2409 |
skip_fillInStackTrace_check = true; // gone past them all |
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2410 |
} |
1 | 2411 |
} |
2412 |
if (!skip_throwableInit_check) { |
|
9132
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2413 |
assert(skip_fillInStackTrace_check, "logic error in backtrace filtering"); |
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2414 |
|
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2415 |
// skip <init> methods of the exception class and superclasses |
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2416 |
// This is simlar to classic VM. |
1 | 2417 |
if (method->name() == vmSymbols::object_initializer_name() && |
2418 |
throwable->is_a(method->method_holder())) { |
|
2419 |
continue; |
|
2420 |
} else { |
|
9132
59f29856d4b2
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
8728
diff
changeset
|
2421 |
// there are none or we've seen them all - either way stop checking |
1 | 2422 |
skip_throwableInit_check = true; |
2423 |
} |
|
2424 |
} |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
2425 |
if (method->is_hidden()) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
2426 |
if (skip_hidden) continue; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
2427 |
} |
1 | 2428 |
bt.push(method, bci, CHECK); |
2429 |
total_count++; |
|
2430 |
} |
|
2431 |
||
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2432 |
log_info(stacktrace)("%s, %d", throwable->klass()->external_name(), total_count); |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2433 |
|
1 | 2434 |
// Put completed stack trace into throwable object |
2435 |
set_backtrace(throwable(), bt.backtrace()); |
|
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2436 |
set_depth(throwable(), total_count); |
1 | 2437 |
} |
2438 |
||
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33198
diff
changeset
|
2439 |
void java_lang_Throwable::fill_in_stack_trace(Handle throwable, const methodHandle& method) { |
1 | 2440 |
// No-op if stack trace is disabled |
2441 |
if (!StackTraceInThrowable) { |
|
2442 |
return; |
|
2443 |
} |
|
2444 |
||
2445 |
// Disable stack traces for some preallocated out of memory errors |
|
2446 |
if (!Universe::should_fill_in_stack_trace(throwable)) { |
|
2447 |
return; |
|
2448 |
} |
|
2449 |
||
2450 |
PRESERVE_EXCEPTION_MARK; |
|
2451 |
||
2452 |
JavaThread* thread = JavaThread::active(); |
|
9321
c29711c6ae35
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
9133
diff
changeset
|
2453 |
fill_in_stack_trace(throwable, method, thread); |
1 | 2454 |
// ignore exceptions thrown during stack trace filling |
2455 |
CLEAR_PENDING_EXCEPTION; |
|
2456 |
} |
|
2457 |
||
2458 |
void java_lang_Throwable::allocate_backtrace(Handle throwable, TRAPS) { |
|
2459 |
// Allocate stack trace - backtrace is created but not filled in |
|
2460 |
||
2461 |
// No-op if stack trace is disabled |
|
2462 |
if (!StackTraceInThrowable) return; |
|
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2463 |
BacktraceBuilder bt(CHECK); // creates a backtrace |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2464 |
set_backtrace(throwable(), bt.backtrace()); |
1 | 2465 |
} |
2466 |
||
2467 |
||
2468 |
void java_lang_Throwable::fill_in_stack_trace_of_preallocated_backtrace(Handle throwable) { |
|
2469 |
// Fill in stack trace into preallocated backtrace (no GC) |
|
2470 |
||
2471 |
// No-op if stack trace is disabled |
|
2472 |
if (!StackTraceInThrowable) return; |
|
2473 |
||
4571 | 2474 |
assert(throwable->is_a(SystemDictionary::Throwable_klass()), "sanity check"); |
1 | 2475 |
|
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2476 |
JavaThread* THREAD = JavaThread::current(); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2477 |
|
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2478 |
objArrayHandle backtrace (THREAD, (objArrayOop)java_lang_Throwable::backtrace(throwable())); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2479 |
assert(backtrace.not_null(), "backtrace should have been preallocated"); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2480 |
|
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2481 |
ResourceMark rm(THREAD); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2482 |
vframeStream st(THREAD); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2483 |
|
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46257
diff
changeset
|
2484 |
BacktraceBuilder bt(THREAD, backtrace); |
1 | 2485 |
|
2486 |
// Unlike fill_in_stack_trace we do not skip fillInStackTrace or throwable init |
|
2487 |
// methods as preallocated errors aren't created by "java" code. |
|
2488 |
||
2489 |
// fill in as much stack trace as possible |
|
2490 |
int chunk_count = 0; |
|
2491 |
for (;!st.at_end(); st.next()) { |
|
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2492 |
bt.push(st.method(), st.bci(), CHECK); |
1 | 2493 |
chunk_count++; |
2494 |
||
2495 |
// Bail-out for deep stacks |
|
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2496 |
if (chunk_count >= trace_chunk_size) break; |
1 | 2497 |
} |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2498 |
set_depth(throwable(), chunk_count); |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2499 |
log_info(stacktrace)("%s, %d", throwable->klass()->external_name(), chunk_count); |
10233
b40fd2bd2fac
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
10018
diff
changeset
|
2500 |
|
25057 | 2501 |
// We support the Throwable immutability protocol defined for Java 7. |
2502 |
java_lang_Throwable::set_stacktrace(throwable(), java_lang_Throwable::unassigned_stacktrace()); |
|
2503 |
assert(java_lang_Throwable::unassigned_stacktrace() != NULL, "not initialized"); |
|
1 | 2504 |
} |
2505 |
||
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2506 |
void java_lang_Throwable::get_stack_trace_elements(Handle throwable, |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2507 |
objArrayHandle stack_trace_array_h, TRAPS) { |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2508 |
|
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2509 |
if (throwable.is_null() || stack_trace_array_h.is_null()) { |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2510 |
THROW(vmSymbols::java_lang_NullPointerException()); |
1 | 2511 |
} |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2512 |
|
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2513 |
assert(stack_trace_array_h->is_objArray(), "Stack trace array should be an array of StackTraceElenent"); |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2514 |
|
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2515 |
if (stack_trace_array_h->length() != depth(throwable())) { |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2516 |
THROW(vmSymbols::java_lang_IndexOutOfBoundsException()); |
1 | 2517 |
} |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2518 |
|
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2519 |
objArrayHandle result(THREAD, objArrayOop(backtrace(throwable()))); |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2520 |
BacktraceIterator iter(result, THREAD); |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2521 |
|
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2522 |
int index = 0; |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2523 |
while (iter.repeat()) { |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2524 |
BacktraceElement bte = iter.next(THREAD); |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2525 |
|
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2526 |
Handle stack_trace_element(THREAD, stack_trace_array_h->obj_at(index++)); |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2527 |
|
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2528 |
if (stack_trace_element.is_null()) { |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2529 |
THROW(vmSymbols::java_lang_NullPointerException()); |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2530 |
} |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2531 |
|
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2532 |
InstanceKlass* holder = InstanceKlass::cast(java_lang_Class::as_Klass(bte._mirror())); |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2533 |
methodHandle method (THREAD, holder->method_with_orig_idnum(bte._method_id, bte._version)); |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2534 |
|
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2535 |
java_lang_StackTraceElement::fill_in(stack_trace_element, holder, |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2536 |
method, |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2537 |
bte._version, |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2538 |
bte._bci, |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2539 |
bte._name, CHECK); |
1 | 2540 |
} |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2541 |
} |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2542 |
|
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2543 |
oop java_lang_StackTraceElement::create(const methodHandle& method, int bci, TRAPS) { |
1 | 2544 |
// Allocate java.lang.StackTraceElement instance |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
2545 |
InstanceKlass* k = SystemDictionary::StackTraceElement_klass(); |
379
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
2546 |
assert(k != NULL, "must be loaded in 1.4+"); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
2547 |
if (k->should_be_initialized()) { |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
2548 |
k->initialize(CHECK_0); |
1 | 2549 |
} |
2550 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
2551 |
Handle element = k->allocate_instance_handle(CHECK_0); |
34280 | 2552 |
|
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2553 |
int version = method->constants()->version(); |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2554 |
fill_in(element, method->method_holder(), method, version, bci, method->name(), CHECK_0); |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2555 |
return element(); |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2556 |
} |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2557 |
|
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2558 |
void java_lang_StackTraceElement::fill_in(Handle element, |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2559 |
InstanceKlass* holder, const methodHandle& method, |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2560 |
int version, int bci, Symbol* name, TRAPS) { |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2561 |
assert(element->is_a(SystemDictionary::StackTraceElement_klass()), "sanity check"); |
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2562 |
|
1 | 2563 |
// Fill in class name |
2564 |
ResourceMark rm(THREAD); |
|
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2565 |
const char* str = holder->external_name(); |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2566 |
oop classname = StringTable::intern((char*) str, CHECK); |
1 | 2567 |
java_lang_StackTraceElement::set_declaringClass(element(), classname); |
41877 | 2568 |
java_lang_StackTraceElement::set_declaringClassObject(element(), holder->java_mirror()); |
2569 |
||
2570 |
oop loader = holder->class_loader(); |
|
2571 |
if (loader != NULL) { |
|
2572 |
oop loader_name = java_lang_ClassLoader::name(loader); |
|
2573 |
if (loader_name != NULL) |
|
2574 |
java_lang_StackTraceElement::set_classLoaderName(element(), loader_name); |
|
2575 |
} |
|
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2576 |
|
1 | 2577 |
// Fill in method name |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2578 |
oop methodname = StringTable::intern(name, CHECK); |
1 | 2579 |
java_lang_StackTraceElement::set_methodName(element(), methodname); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2580 |
|
36508 | 2581 |
// Fill in module name and version |
2582 |
ModuleEntry* module = holder->module(); |
|
2583 |
if (module->is_named()) { |
|
37179 | 2584 |
oop module_name = StringTable::intern(module->name(), CHECK); |
36508 | 2585 |
java_lang_StackTraceElement::set_moduleName(element(), module_name); |
2586 |
oop module_version; |
|
2587 |
if (module->version() != NULL) { |
|
37179 | 2588 |
module_version = StringTable::intern(module->version(), CHECK); |
36508 | 2589 |
} else { |
2590 |
module_version = NULL; |
|
2591 |
} |
|
2592 |
java_lang_StackTraceElement::set_moduleVersion(element(), module_version); |
|
2593 |
} |
|
2594 |
||
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2595 |
if (method() == NULL || !version_matches(method(), version)) { |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2596 |
// 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
|
2597 |
java_lang_StackTraceElement::set_fileName(element(), NULL); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2598 |
java_lang_StackTraceElement::set_lineNumber(element(), -1); |
1 | 2599 |
} else { |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2600 |
// Fill in source file name and line number. |
34280 | 2601 |
Symbol* source = Backtrace::get_source_file_name(holder, version); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2602 |
if (ShowHiddenFrames && source == NULL) |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2603 |
source = vmSymbols::unknown_class_name(); |
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
2604 |
oop filename = StringTable::intern(source, CHECK); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2605 |
java_lang_StackTraceElement::set_fileName(element(), filename); |
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2606 |
|
34280 | 2607 |
int line_number = Backtrace::get_line_number(method, bci); |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2608 |
java_lang_StackTraceElement::set_lineNumber(element(), line_number); |
1 | 2609 |
} |
15229
5341188db763
7174978: NPG: Fix bactrace builder for class redefinition
coleenp
parents:
15102
diff
changeset
|
2610 |
} |
1 | 2611 |
|
34280 | 2612 |
Method* java_lang_StackFrameInfo::get_method(Handle stackFrame, InstanceKlass* holder, TRAPS) { |
37438 | 2613 |
Handle mname(THREAD, stackFrame->obj_field(_memberName_offset)); |
2614 |
Method* method = (Method*)java_lang_invoke_MemberName::vmtarget(mname()); |
|
2615 |
// we should expand MemberName::name when Throwable uses StackTrace |
|
2616 |
// MethodHandles::expand_MemberName(mname, MethodHandles::_suppress_defc|MethodHandles::_suppress_type, CHECK_NULL); |
|
2617 |
return method; |
|
34280 | 2618 |
} |
2619 |
||
46505
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
2620 |
void java_lang_StackFrameInfo::set_method_and_bci(Handle stackFrame, const methodHandle& method, int bci, TRAPS) { |
34280 | 2621 |
// set Method* or mid/cpref |
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46257
diff
changeset
|
2622 |
Handle mname(Thread::current(), stackFrame->obj_field(_memberName_offset)); |
37438 | 2623 |
InstanceKlass* ik = method->method_holder(); |
46505
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
2624 |
CallInfo info(method(), ik, CHECK); |
37438 | 2625 |
MethodHandles::init_method_MemberName(mname, info); |
34280 | 2626 |
// set bci |
2627 |
java_lang_StackFrameInfo::set_bci(stackFrame(), bci); |
|
2628 |
// method may be redefined; store the version |
|
2629 |
int version = method->constants()->version(); |
|
2630 |
assert((jushort)version == version, "version should be short"); |
|
2631 |
java_lang_StackFrameInfo::set_version(stackFrame(), (short)version); |
|
2632 |
} |
|
2633 |
||
37438 | 2634 |
void java_lang_StackFrameInfo::to_stack_trace_element(Handle stackFrame, Handle stack_trace_element, TRAPS) { |
34280 | 2635 |
ResourceMark rm(THREAD); |
47818
2f6ab27efb60
8185925: StackFrameInfo::walker field can be replaced with bitmap to save footprint
bchristi
parents:
47580
diff
changeset
|
2636 |
Handle mname(THREAD, stackFrame->obj_field(java_lang_StackFrameInfo::_memberName_offset)); |
2f6ab27efb60
8185925: StackFrameInfo::walker field can be replaced with bitmap to save footprint
bchristi
parents:
47580
diff
changeset
|
2637 |
Klass* clazz = java_lang_Class::as_Klass(java_lang_invoke_MemberName::clazz(mname())); |
2f6ab27efb60
8185925: StackFrameInfo::walker field can be replaced with bitmap to save footprint
bchristi
parents:
47580
diff
changeset
|
2638 |
InstanceKlass* holder = InstanceKlass::cast(clazz); |
34280 | 2639 |
Method* method = java_lang_StackFrameInfo::get_method(stackFrame, holder, CHECK); |
37438 | 2640 |
|
34280 | 2641 |
short version = stackFrame->short_field(_version_offset); |
37438 | 2642 |
short bci = stackFrame->short_field(_bci_offset); |
46257
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2643 |
Symbol* name = method->name(); |
3e95288ce4ca
8140685: Fix backtrace building to not rely on constant pool merging
coleenp
parents:
42656
diff
changeset
|
2644 |
java_lang_StackTraceElement::fill_in(stack_trace_element, holder, method, version, bci, name, CHECK); |
34280 | 2645 |
} |
2646 |
||
49329 | 2647 |
#define STACKFRAMEINFO_FIELDS_DO(macro) \ |
2648 |
macro(_memberName_offset, k, "memberName", object_signature, false); \ |
|
2649 |
macro(_bci_offset, k, "bci", short_signature, false) |
|
2650 |
||
34280 | 2651 |
void java_lang_StackFrameInfo::compute_offsets() { |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
2652 |
InstanceKlass* k = SystemDictionary::StackFrameInfo_klass(); |
49329 | 2653 |
STACKFRAMEINFO_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
34280 | 2654 |
STACKFRAMEINFO_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET); |
2655 |
} |
|
2656 |
||
49329 | 2657 |
#if INCLUDE_CDS |
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
2658 |
void java_lang_StackFrameInfo::serialize_offsets(SerializeClosure* f) { |
49329 | 2659 |
STACKFRAMEINFO_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
2660 |
STACKFRAMEINFO_INJECTED_FIELDS(INJECTED_FIELD_SERIALIZE_OFFSET); |
|
2661 |
} |
|
2662 |
#endif |
|
2663 |
||
2664 |
#define LIVESTACKFRAMEINFO_FIELDS_DO(macro) \ |
|
2665 |
macro(_monitors_offset, k, "monitors", object_array_signature, false); \ |
|
2666 |
macro(_locals_offset, k, "locals", object_array_signature, false); \ |
|
2667 |
macro(_operands_offset, k, "operands", object_array_signature, false); \ |
|
2668 |
macro(_mode_offset, k, "mode", int_signature, false) |
|
2669 |
||
34280 | 2670 |
void java_lang_LiveStackFrameInfo::compute_offsets() { |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
2671 |
InstanceKlass* k = SystemDictionary::LiveStackFrameInfo_klass(); |
49329 | 2672 |
LIVESTACKFRAMEINFO_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
2673 |
} |
|
2674 |
||
2675 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
2676 |
void java_lang_LiveStackFrameInfo::serialize_offsets(SerializeClosure* f) { |
49329 | 2677 |
LIVESTACKFRAMEINFO_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
2678 |
} |
|
2679 |
#endif |
|
2680 |
||
2681 |
#define ACCESSIBLEOBJECT_FIELDS_DO(macro) \ |
|
2682 |
macro(override_offset, k, "override", bool_signature, false) |
|
34280 | 2683 |
|
1 | 2684 |
void java_lang_reflect_AccessibleObject::compute_offsets() { |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
2685 |
InstanceKlass* k = SystemDictionary::reflect_AccessibleObject_klass(); |
49329 | 2686 |
ACCESSIBLEOBJECT_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
2687 |
} |
|
2688 |
||
2689 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
2690 |
void java_lang_reflect_AccessibleObject::serialize_offsets(SerializeClosure* f) { |
49329 | 2691 |
ACCESSIBLEOBJECT_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
2692 |
} |
|
2693 |
#endif |
|
1 | 2694 |
|
2695 |
jboolean java_lang_reflect_AccessibleObject::override(oop reflect) { |
|
2696 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2697 |
return (jboolean) reflect->bool_field(override_offset); |
|
2698 |
} |
|
2699 |
||
2700 |
void java_lang_reflect_AccessibleObject::set_override(oop reflect, jboolean value) { |
|
2701 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2702 |
reflect->bool_field_put(override_offset, (int) value); |
|
2703 |
} |
|
2704 |
||
49329 | 2705 |
#define METHOD_FIELDS_DO(macro) \ |
2706 |
macro(clazz_offset, k, vmSymbols::clazz_name(), class_signature, false); \ |
|
2707 |
macro(name_offset, k, vmSymbols::name_name(), string_signature, false); \ |
|
2708 |
macro(returnType_offset, k, vmSymbols::returnType_name(), class_signature, false); \ |
|
2709 |
macro(parameterTypes_offset, k, vmSymbols::parameterTypes_name(), class_array_signature, false); \ |
|
2710 |
macro(exceptionTypes_offset, k, vmSymbols::exceptionTypes_name(), class_array_signature, false); \ |
|
2711 |
macro(slot_offset, k, vmSymbols::slot_name(), int_signature, false); \ |
|
2712 |
macro(modifiers_offset, k, vmSymbols::modifiers_name(), int_signature, false); \ |
|
2713 |
macro##_OPTIONAL(signature_offset, k, vmSymbols::signature_name(), string_signature); \ |
|
2714 |
macro##_OPTIONAL(annotations_offset, k, vmSymbols::annotations_name(), byte_array_signature); \ |
|
2715 |
macro##_OPTIONAL(parameter_annotations_offset, k, vmSymbols::parameter_annotations_name(), byte_array_signature); \ |
|
2716 |
macro##_OPTIONAL(annotation_default_offset, k, vmSymbols::annotation_default_name(), byte_array_signature); \ |
|
2717 |
macro##_OPTIONAL(type_annotations_offset, k, vmSymbols::type_annotations_name(), byte_array_signature) |
|
2718 |
||
1 | 2719 |
void java_lang_reflect_Method::compute_offsets() { |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
2720 |
InstanceKlass* k = SystemDictionary::reflect_Method_klass(); |
1 | 2721 |
// The generic signature and annotations fields are only present in 1.5 |
2722 |
signature_offset = -1; |
|
2723 |
annotations_offset = -1; |
|
2724 |
parameter_annotations_offset = -1; |
|
2725 |
annotation_default_offset = -1; |
|
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
2726 |
type_annotations_offset = -1; |
49329 | 2727 |
METHOD_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
2728 |
} |
|
2729 |
||
2730 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
2731 |
void java_lang_reflect_Method::serialize_offsets(SerializeClosure* f) { |
49329 | 2732 |
METHOD_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
2733 |
} |
|
2734 |
#endif |
|
1 | 2735 |
|
2736 |
Handle java_lang_reflect_Method::create(TRAPS) { |
|
2737 |
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
|
2738 |
Klass* klass = SystemDictionary::reflect_Method_klass(); |
1 | 2739 |
// This class is eagerly initialized during VM initialization, since we keep a refence |
2740 |
// to one of the methods |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
2741 |
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
|
2742 |
return InstanceKlass::cast(klass)->allocate_instance_handle(THREAD); |
1 | 2743 |
} |
2744 |
||
2745 |
oop java_lang_reflect_Method::clazz(oop reflect) { |
|
2746 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2747 |
return reflect->obj_field(clazz_offset); |
|
2748 |
} |
|
2749 |
||
2750 |
void java_lang_reflect_Method::set_clazz(oop reflect, oop value) { |
|
2751 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2752 |
reflect->obj_field_put(clazz_offset, value); |
|
2753 |
} |
|
2754 |
||
2755 |
int java_lang_reflect_Method::slot(oop reflect) { |
|
2756 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2757 |
return reflect->int_field(slot_offset); |
|
2758 |
} |
|
2759 |
||
2760 |
void java_lang_reflect_Method::set_slot(oop reflect, int value) { |
|
2761 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2762 |
reflect->int_field_put(slot_offset, value); |
|
2763 |
} |
|
2764 |
||
2765 |
oop java_lang_reflect_Method::name(oop method) { |
|
2766 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2767 |
return method->obj_field(name_offset); |
|
2768 |
} |
|
2769 |
||
2770 |
void java_lang_reflect_Method::set_name(oop method, oop value) { |
|
2771 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2772 |
method->obj_field_put(name_offset, value); |
|
2773 |
} |
|
2774 |
||
2775 |
oop java_lang_reflect_Method::return_type(oop method) { |
|
2776 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2777 |
return method->obj_field(returnType_offset); |
|
2778 |
} |
|
2779 |
||
2780 |
void java_lang_reflect_Method::set_return_type(oop method, oop value) { |
|
2781 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2782 |
method->obj_field_put(returnType_offset, value); |
|
2783 |
} |
|
2784 |
||
2785 |
oop java_lang_reflect_Method::parameter_types(oop method) { |
|
2786 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2787 |
return method->obj_field(parameterTypes_offset); |
|
2788 |
} |
|
2789 |
||
2790 |
void java_lang_reflect_Method::set_parameter_types(oop method, oop value) { |
|
2791 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2792 |
method->obj_field_put(parameterTypes_offset, value); |
|
2793 |
} |
|
2794 |
||
2795 |
oop java_lang_reflect_Method::exception_types(oop method) { |
|
2796 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2797 |
return method->obj_field(exceptionTypes_offset); |
|
2798 |
} |
|
2799 |
||
2800 |
void java_lang_reflect_Method::set_exception_types(oop method, oop value) { |
|
2801 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2802 |
method->obj_field_put(exceptionTypes_offset, value); |
|
2803 |
} |
|
2804 |
||
2805 |
int java_lang_reflect_Method::modifiers(oop method) { |
|
2806 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2807 |
return method->int_field(modifiers_offset); |
|
2808 |
} |
|
2809 |
||
2810 |
void java_lang_reflect_Method::set_modifiers(oop method, int value) { |
|
2811 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2812 |
method->int_field_put(modifiers_offset, value); |
|
2813 |
} |
|
2814 |
||
2815 |
bool java_lang_reflect_Method::has_signature_field() { |
|
2816 |
return (signature_offset >= 0); |
|
2817 |
} |
|
2818 |
||
2819 |
oop java_lang_reflect_Method::signature(oop method) { |
|
2820 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2821 |
assert(has_signature_field(), "signature field must be present"); |
|
2822 |
return method->obj_field(signature_offset); |
|
2823 |
} |
|
2824 |
||
2825 |
void java_lang_reflect_Method::set_signature(oop method, oop value) { |
|
2826 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2827 |
assert(has_signature_field(), "signature field must be present"); |
|
2828 |
method->obj_field_put(signature_offset, value); |
|
2829 |
} |
|
2830 |
||
2831 |
bool java_lang_reflect_Method::has_annotations_field() { |
|
2832 |
return (annotations_offset >= 0); |
|
2833 |
} |
|
2834 |
||
2835 |
oop java_lang_reflect_Method::annotations(oop method) { |
|
2836 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2837 |
assert(has_annotations_field(), "annotations field must be present"); |
|
2838 |
return method->obj_field(annotations_offset); |
|
2839 |
} |
|
2840 |
||
2841 |
void java_lang_reflect_Method::set_annotations(oop method, oop value) { |
|
2842 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2843 |
assert(has_annotations_field(), "annotations field must be present"); |
|
2844 |
method->obj_field_put(annotations_offset, value); |
|
2845 |
} |
|
2846 |
||
2847 |
bool java_lang_reflect_Method::has_parameter_annotations_field() { |
|
2848 |
return (parameter_annotations_offset >= 0); |
|
2849 |
} |
|
2850 |
||
2851 |
oop java_lang_reflect_Method::parameter_annotations(oop method) { |
|
2852 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2853 |
assert(has_parameter_annotations_field(), "parameter annotations field must be present"); |
|
2854 |
return method->obj_field(parameter_annotations_offset); |
|
2855 |
} |
|
2856 |
||
2857 |
void java_lang_reflect_Method::set_parameter_annotations(oop method, oop value) { |
|
2858 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2859 |
assert(has_parameter_annotations_field(), "parameter annotations field must be present"); |
|
2860 |
method->obj_field_put(parameter_annotations_offset, value); |
|
2861 |
} |
|
2862 |
||
2863 |
bool java_lang_reflect_Method::has_annotation_default_field() { |
|
2864 |
return (annotation_default_offset >= 0); |
|
2865 |
} |
|
2866 |
||
2867 |
oop java_lang_reflect_Method::annotation_default(oop method) { |
|
2868 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2869 |
assert(has_annotation_default_field(), "annotation default field must be present"); |
|
2870 |
return method->obj_field(annotation_default_offset); |
|
2871 |
} |
|
2872 |
||
2873 |
void java_lang_reflect_Method::set_annotation_default(oop method, oop value) { |
|
2874 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2875 |
assert(has_annotation_default_field(), "annotation default field must be present"); |
|
2876 |
method->obj_field_put(annotation_default_offset, value); |
|
2877 |
} |
|
2878 |
||
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
2879 |
bool java_lang_reflect_Method::has_type_annotations_field() { |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
2880 |
return (type_annotations_offset >= 0); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
2881 |
} |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
2882 |
|
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
2883 |
oop java_lang_reflect_Method::type_annotations(oop method) { |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
2884 |
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
|
2885 |
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
|
2886 |
return method->obj_field(type_annotations_offset); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
2887 |
} |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
2888 |
|
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
2889 |
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
|
2890 |
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
|
2891 |
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
|
2892 |
method->obj_field_put(type_annotations_offset, value); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
2893 |
} |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
2894 |
|
49329 | 2895 |
#define CONSTRUCTOR_FIELDS_DO(macro) \ |
2896 |
macro(clazz_offset, k, vmSymbols::clazz_name(), class_signature, false); \ |
|
2897 |
macro(parameterTypes_offset, k, vmSymbols::parameterTypes_name(), class_array_signature, false); \ |
|
2898 |
macro(exceptionTypes_offset, k, vmSymbols::exceptionTypes_name(), class_array_signature, false); \ |
|
2899 |
macro(slot_offset, k, vmSymbols::slot_name(), int_signature, false); \ |
|
2900 |
macro(modifiers_offset, k, vmSymbols::modifiers_name(), int_signature, false); \ |
|
2901 |
macro##_OPTIONAL(signature_offset, k, vmSymbols::signature_name(), string_signature); \ |
|
2902 |
macro##_OPTIONAL(annotations_offset, k, vmSymbols::annotations_name(), byte_array_signature); \ |
|
2903 |
macro##_OPTIONAL(parameter_annotations_offset, k, vmSymbols::parameter_annotations_name(), byte_array_signature); \ |
|
2904 |
macro##_OPTIONAL(type_annotations_offset, k, vmSymbols::type_annotations_name(), byte_array_signature) |
|
2905 |
||
2906 |
||
1 | 2907 |
void java_lang_reflect_Constructor::compute_offsets() { |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
2908 |
InstanceKlass* k = SystemDictionary::reflect_Constructor_klass(); |
1 | 2909 |
// The generic signature and annotations fields are only present in 1.5 |
2910 |
signature_offset = -1; |
|
2911 |
annotations_offset = -1; |
|
2912 |
parameter_annotations_offset = -1; |
|
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
2913 |
type_annotations_offset = -1; |
49329 | 2914 |
CONSTRUCTOR_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
2915 |
} |
|
2916 |
||
2917 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
2918 |
void java_lang_reflect_Constructor::serialize_offsets(SerializeClosure* f) { |
49329 | 2919 |
CONSTRUCTOR_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
2920 |
} |
|
2921 |
#endif |
|
1 | 2922 |
|
2923 |
Handle java_lang_reflect_Constructor::create(TRAPS) { |
|
2924 |
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
|
2925 |
Symbol* name = vmSymbols::java_lang_reflect_Constructor(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
2926 |
Klass* k = SystemDictionary::resolve_or_fail(name, true, CHECK_NH); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
2927 |
InstanceKlass* ik = InstanceKlass::cast(k); |
1 | 2928 |
// Ensure it is initialized |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
2929 |
ik->initialize(CHECK_NH); |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
2930 |
return ik->allocate_instance_handle(THREAD); |
1 | 2931 |
} |
2932 |
||
2933 |
oop java_lang_reflect_Constructor::clazz(oop reflect) { |
|
2934 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2935 |
return reflect->obj_field(clazz_offset); |
|
2936 |
} |
|
2937 |
||
2938 |
void java_lang_reflect_Constructor::set_clazz(oop reflect, oop value) { |
|
2939 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2940 |
reflect->obj_field_put(clazz_offset, value); |
|
2941 |
} |
|
2942 |
||
2943 |
oop java_lang_reflect_Constructor::parameter_types(oop constructor) { |
|
2944 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2945 |
return constructor->obj_field(parameterTypes_offset); |
|
2946 |
} |
|
2947 |
||
2948 |
void java_lang_reflect_Constructor::set_parameter_types(oop constructor, oop value) { |
|
2949 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2950 |
constructor->obj_field_put(parameterTypes_offset, value); |
|
2951 |
} |
|
2952 |
||
2953 |
oop java_lang_reflect_Constructor::exception_types(oop constructor) { |
|
2954 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2955 |
return constructor->obj_field(exceptionTypes_offset); |
|
2956 |
} |
|
2957 |
||
2958 |
void java_lang_reflect_Constructor::set_exception_types(oop constructor, oop value) { |
|
2959 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2960 |
constructor->obj_field_put(exceptionTypes_offset, value); |
|
2961 |
} |
|
2962 |
||
2963 |
int java_lang_reflect_Constructor::slot(oop reflect) { |
|
2964 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2965 |
return reflect->int_field(slot_offset); |
|
2966 |
} |
|
2967 |
||
2968 |
void java_lang_reflect_Constructor::set_slot(oop reflect, int value) { |
|
2969 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2970 |
reflect->int_field_put(slot_offset, value); |
|
2971 |
} |
|
2972 |
||
2973 |
int java_lang_reflect_Constructor::modifiers(oop constructor) { |
|
2974 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2975 |
return constructor->int_field(modifiers_offset); |
|
2976 |
} |
|
2977 |
||
2978 |
void java_lang_reflect_Constructor::set_modifiers(oop constructor, int value) { |
|
2979 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2980 |
constructor->int_field_put(modifiers_offset, value); |
|
2981 |
} |
|
2982 |
||
2983 |
bool java_lang_reflect_Constructor::has_signature_field() { |
|
2984 |
return (signature_offset >= 0); |
|
2985 |
} |
|
2986 |
||
2987 |
oop java_lang_reflect_Constructor::signature(oop constructor) { |
|
2988 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2989 |
assert(has_signature_field(), "signature field must be present"); |
|
2990 |
return constructor->obj_field(signature_offset); |
|
2991 |
} |
|
2992 |
||
2993 |
void java_lang_reflect_Constructor::set_signature(oop constructor, oop value) { |
|
2994 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
2995 |
assert(has_signature_field(), "signature field must be present"); |
|
2996 |
constructor->obj_field_put(signature_offset, value); |
|
2997 |
} |
|
2998 |
||
2999 |
bool java_lang_reflect_Constructor::has_annotations_field() { |
|
3000 |
return (annotations_offset >= 0); |
|
3001 |
} |
|
3002 |
||
3003 |
oop java_lang_reflect_Constructor::annotations(oop constructor) { |
|
3004 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
3005 |
assert(has_annotations_field(), "annotations field must be present"); |
|
3006 |
return constructor->obj_field(annotations_offset); |
|
3007 |
} |
|
3008 |
||
3009 |
void java_lang_reflect_Constructor::set_annotations(oop constructor, oop value) { |
|
3010 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
3011 |
assert(has_annotations_field(), "annotations field must be present"); |
|
3012 |
constructor->obj_field_put(annotations_offset, value); |
|
3013 |
} |
|
3014 |
||
3015 |
bool java_lang_reflect_Constructor::has_parameter_annotations_field() { |
|
3016 |
return (parameter_annotations_offset >= 0); |
|
3017 |
} |
|
3018 |
||
3019 |
oop java_lang_reflect_Constructor::parameter_annotations(oop method) { |
|
3020 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
3021 |
assert(has_parameter_annotations_field(), "parameter annotations field must be present"); |
|
3022 |
return method->obj_field(parameter_annotations_offset); |
|
3023 |
} |
|
3024 |
||
3025 |
void java_lang_reflect_Constructor::set_parameter_annotations(oop method, oop value) { |
|
3026 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
3027 |
assert(has_parameter_annotations_field(), "parameter annotations field must be present"); |
|
3028 |
method->obj_field_put(parameter_annotations_offset, value); |
|
3029 |
} |
|
3030 |
||
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3031 |
bool java_lang_reflect_Constructor::has_type_annotations_field() { |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3032 |
return (type_annotations_offset >= 0); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3033 |
} |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3034 |
|
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3035 |
oop java_lang_reflect_Constructor::type_annotations(oop constructor) { |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3036 |
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
|
3037 |
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
|
3038 |
return constructor->obj_field(type_annotations_offset); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3039 |
} |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3040 |
|
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3041 |
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
|
3042 |
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
|
3043 |
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
|
3044 |
constructor->obj_field_put(type_annotations_offset, value); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3045 |
} |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3046 |
|
49329 | 3047 |
#define FIELD_FIELDS_DO(macro) \ |
3048 |
macro(clazz_offset, k, vmSymbols::clazz_name(), class_signature, false); \ |
|
3049 |
macro(name_offset, k, vmSymbols::name_name(), string_signature, false); \ |
|
3050 |
macro(type_offset, k, vmSymbols::type_name(), class_signature, false); \ |
|
3051 |
macro(slot_offset, k, vmSymbols::slot_name(), int_signature, false); \ |
|
3052 |
macro(modifiers_offset, k, vmSymbols::modifiers_name(), int_signature, false); \ |
|
3053 |
macro##_OPTIONAL(signature_offset, k, vmSymbols::signature_name(), string_signature); \ |
|
3054 |
macro##_OPTIONAL(annotations_offset, k, vmSymbols::annotations_name(), byte_array_signature); \ |
|
3055 |
macro##_OPTIONAL(type_annotations_offset, k, vmSymbols::type_annotations_name(), byte_array_signature) |
|
3056 |
||
1 | 3057 |
void java_lang_reflect_Field::compute_offsets() { |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3058 |
InstanceKlass* k = SystemDictionary::reflect_Field_klass(); |
1 | 3059 |
// The generic signature and annotations fields are only present in 1.5 |
3060 |
signature_offset = -1; |
|
3061 |
annotations_offset = -1; |
|
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3062 |
type_annotations_offset = -1; |
49329 | 3063 |
FIELD_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
3064 |
} |
|
3065 |
||
3066 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
3067 |
void java_lang_reflect_Field::serialize_offsets(SerializeClosure* f) { |
49329 | 3068 |
FIELD_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
3069 |
} |
|
3070 |
#endif |
|
1 | 3071 |
|
3072 |
Handle java_lang_reflect_Field::create(TRAPS) { |
|
3073 |
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
|
3074 |
Symbol* name = vmSymbols::java_lang_reflect_Field(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
3075 |
Klass* k = SystemDictionary::resolve_or_fail(name, true, CHECK_NH); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
3076 |
InstanceKlass* ik = InstanceKlass::cast(k); |
1 | 3077 |
// Ensure it is initialized |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
3078 |
ik->initialize(CHECK_NH); |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
3079 |
return ik->allocate_instance_handle(THREAD); |
1 | 3080 |
} |
3081 |
||
3082 |
oop java_lang_reflect_Field::clazz(oop reflect) { |
|
3083 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
3084 |
return reflect->obj_field(clazz_offset); |
|
3085 |
} |
|
3086 |
||
3087 |
void java_lang_reflect_Field::set_clazz(oop reflect, oop value) { |
|
3088 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
3089 |
reflect->obj_field_put(clazz_offset, value); |
|
3090 |
} |
|
3091 |
||
3092 |
oop java_lang_reflect_Field::name(oop field) { |
|
3093 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
3094 |
return field->obj_field(name_offset); |
|
3095 |
} |
|
3096 |
||
3097 |
void java_lang_reflect_Field::set_name(oop field, oop value) { |
|
3098 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
3099 |
field->obj_field_put(name_offset, value); |
|
3100 |
} |
|
3101 |
||
3102 |
oop java_lang_reflect_Field::type(oop field) { |
|
3103 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
3104 |
return field->obj_field(type_offset); |
|
3105 |
} |
|
3106 |
||
3107 |
void java_lang_reflect_Field::set_type(oop field, oop value) { |
|
3108 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
3109 |
field->obj_field_put(type_offset, value); |
|
3110 |
} |
|
3111 |
||
3112 |
int java_lang_reflect_Field::slot(oop reflect) { |
|
3113 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
3114 |
return reflect->int_field(slot_offset); |
|
3115 |
} |
|
3116 |
||
3117 |
void java_lang_reflect_Field::set_slot(oop reflect, int value) { |
|
3118 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
3119 |
reflect->int_field_put(slot_offset, value); |
|
3120 |
} |
|
3121 |
||
3122 |
int java_lang_reflect_Field::modifiers(oop field) { |
|
3123 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
3124 |
return field->int_field(modifiers_offset); |
|
3125 |
} |
|
3126 |
||
3127 |
void java_lang_reflect_Field::set_modifiers(oop field, int value) { |
|
3128 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
3129 |
field->int_field_put(modifiers_offset, value); |
|
3130 |
} |
|
3131 |
||
3132 |
bool java_lang_reflect_Field::has_signature_field() { |
|
3133 |
return (signature_offset >= 0); |
|
3134 |
} |
|
3135 |
||
3136 |
oop java_lang_reflect_Field::signature(oop field) { |
|
3137 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
3138 |
assert(has_signature_field(), "signature field must be present"); |
|
3139 |
return field->obj_field(signature_offset); |
|
3140 |
} |
|
3141 |
||
3142 |
void java_lang_reflect_Field::set_signature(oop field, oop value) { |
|
3143 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
3144 |
assert(has_signature_field(), "signature field must be present"); |
|
3145 |
field->obj_field_put(signature_offset, value); |
|
3146 |
} |
|
3147 |
||
3148 |
bool java_lang_reflect_Field::has_annotations_field() { |
|
3149 |
return (annotations_offset >= 0); |
|
3150 |
} |
|
3151 |
||
3152 |
oop java_lang_reflect_Field::annotations(oop field) { |
|
3153 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
3154 |
assert(has_annotations_field(), "annotations field must be present"); |
|
3155 |
return field->obj_field(annotations_offset); |
|
3156 |
} |
|
3157 |
||
3158 |
void java_lang_reflect_Field::set_annotations(oop field, oop value) { |
|
3159 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
|
3160 |
assert(has_annotations_field(), "annotations field must be present"); |
|
3161 |
field->obj_field_put(annotations_offset, value); |
|
3162 |
} |
|
3163 |
||
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3164 |
bool java_lang_reflect_Field::has_type_annotations_field() { |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3165 |
return (type_annotations_offset >= 0); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3166 |
} |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3167 |
|
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3168 |
oop java_lang_reflect_Field::type_annotations(oop field) { |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3169 |
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
|
3170 |
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
|
3171 |
return field->obj_field(type_annotations_offset); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3172 |
} |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3173 |
|
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3174 |
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
|
3175 |
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
|
3176 |
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
|
3177 |
field->obj_field_put(type_annotations_offset, value); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
3178 |
} |
1 | 3179 |
|
49329 | 3180 |
#define CONSTANTPOOL_FIELDS_DO(macro) \ |
3181 |
macro(_oop_offset, k, "constantPoolOop", object_signature, false) |
|
3182 |
||
37301
a936b4e01afb
8137058: Clear out all non-Critical APIs from sun.reflect
chegar
parents:
37179
diff
changeset
|
3183 |
void reflect_ConstantPool::compute_offsets() { |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3184 |
InstanceKlass* k = SystemDictionary::reflect_ConstantPool_klass(); |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3185 |
// The field is called ConstantPool* in the sun.reflect.ConstantPool class. |
49329 | 3186 |
CONSTANTPOOL_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
3187 |
} |
|
3188 |
||
3189 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
3190 |
void reflect_ConstantPool::serialize_offsets(SerializeClosure* f) { |
49329 | 3191 |
CONSTANTPOOL_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
3192 |
} |
|
3193 |
#endif |
|
3194 |
||
3195 |
#define PARAMETER_FIELDS_DO(macro) \ |
|
3196 |
macro(name_offset, k, vmSymbols::name_name(), string_signature, false); \ |
|
3197 |
macro(modifiers_offset, k, vmSymbols::modifiers_name(), int_signature, false); \ |
|
3198 |
macro(index_offset, k, vmSymbols::index_name(), int_signature, false); \ |
|
3199 |
macro(executable_offset, k, vmSymbols::executable_name(), executable_signature, false) |
|
1 | 3200 |
|
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3201 |
void java_lang_reflect_Parameter::compute_offsets() { |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3202 |
InstanceKlass* k = SystemDictionary::reflect_Parameter_klass(); |
49329 | 3203 |
PARAMETER_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
3204 |
} |
|
3205 |
||
3206 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
3207 |
void java_lang_reflect_Parameter::serialize_offsets(SerializeClosure* f) { |
49329 | 3208 |
PARAMETER_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
3209 |
} |
|
3210 |
#endif |
|
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3211 |
|
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3212 |
Handle java_lang_reflect_Parameter::create(TRAPS) { |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3213 |
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
|
3214 |
Symbol* name = vmSymbols::java_lang_reflect_Parameter(); |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3215 |
Klass* k = SystemDictionary::resolve_or_fail(name, true, CHECK_NH); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
3216 |
InstanceKlass* ik = InstanceKlass::cast(k); |
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3217 |
// Ensure it is initialized |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
3218 |
ik->initialize(CHECK_NH); |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
3219 |
return ik->allocate_instance_handle(THREAD); |
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3220 |
} |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3221 |
|
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3222 |
oop java_lang_reflect_Parameter::name(oop param) { |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3223 |
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
|
3224 |
return param->obj_field(name_offset); |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3225 |
} |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3226 |
|
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3227 |
void java_lang_reflect_Parameter::set_name(oop param, oop value) { |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3228 |
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
|
3229 |
param->obj_field_put(name_offset, value); |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3230 |
} |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3231 |
|
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3232 |
int java_lang_reflect_Parameter::modifiers(oop param) { |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3233 |
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
|
3234 |
return param->int_field(modifiers_offset); |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3235 |
} |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3236 |
|
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3237 |
void java_lang_reflect_Parameter::set_modifiers(oop param, int value) { |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3238 |
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
|
3239 |
param->int_field_put(modifiers_offset, value); |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3240 |
} |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3241 |
|
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3242 |
int java_lang_reflect_Parameter::index(oop param) { |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3243 |
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
|
3244 |
return param->int_field(index_offset); |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3245 |
} |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3246 |
|
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3247 |
void java_lang_reflect_Parameter::set_index(oop param, int value) { |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3248 |
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
|
3249 |
param->int_field_put(index_offset, value); |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3250 |
} |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3251 |
|
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3252 |
oop java_lang_reflect_Parameter::executable(oop param) { |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3253 |
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
|
3254 |
return param->obj_field(executable_offset); |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3255 |
} |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3256 |
|
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3257 |
void java_lang_reflect_Parameter::set_executable(oop param, oop value) { |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3258 |
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
|
3259 |
param->obj_field_put(executable_offset, value); |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3260 |
} |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
3261 |
|
1 | 3262 |
|
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
43929
diff
changeset
|
3263 |
int java_lang_Module::loader_offset; |
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
43929
diff
changeset
|
3264 |
int java_lang_Module::name_offset; |
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
43929
diff
changeset
|
3265 |
int java_lang_Module::_module_entry_offset = -1; |
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
43929
diff
changeset
|
3266 |
|
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
43929
diff
changeset
|
3267 |
Handle java_lang_Module::create(Handle loader, Handle module_name, TRAPS) { |
36508 | 3268 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
50217
843fc56f4686
8203381: Replace InstanceKlass::allocate_instance_handle with JavaCalls::construct_new_instance
iklam
parents:
50176
diff
changeset
|
3269 |
return JavaCalls::construct_new_instance(SystemDictionary::Module_klass(), |
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
43929
diff
changeset
|
3270 |
vmSymbols::java_lang_module_init_signature(), |
36508 | 3271 |
loader, module_name, CHECK_NH); |
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
43929
diff
changeset
|
3272 |
} |
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
43929
diff
changeset
|
3273 |
|
49329 | 3274 |
#define MODULE_FIELDS_DO(macro) \ |
3275 |
macro(loader_offset, k, vmSymbols::loader_name(), classloader_signature, false); \ |
|
3276 |
macro(name_offset, k, vmSymbols::name_name(), string_signature, false) |
|
3277 |
||
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
43929
diff
changeset
|
3278 |
void java_lang_Module::compute_offsets() { |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3279 |
InstanceKlass* k = SystemDictionary::Module_klass(); |
49329 | 3280 |
MODULE_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3281 |
MODULE_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET); |
36508 | 3282 |
} |
3283 |
||
49329 | 3284 |
#if INCLUDE_CDS |
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
3285 |
void java_lang_Module::serialize_offsets(SerializeClosure* f) { |
49329 | 3286 |
MODULE_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
3287 |
MODULE_INJECTED_FIELDS(INJECTED_FIELD_SERIALIZE_OFFSET); |
|
3288 |
} |
|
3289 |
#endif |
|
36508 | 3290 |
|
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
43929
diff
changeset
|
3291 |
oop java_lang_Module::loader(oop module) { |
36508 | 3292 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
3293 |
return module->obj_field(loader_offset); |
|
3294 |
} |
|
3295 |
||
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
43929
diff
changeset
|
3296 |
void java_lang_Module::set_loader(oop module, oop value) { |
36508 | 3297 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
3298 |
module->obj_field_put(loader_offset, value); |
|
3299 |
} |
|
3300 |
||
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
43929
diff
changeset
|
3301 |
oop java_lang_Module::name(oop module) { |
36508 | 3302 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
3303 |
return module->obj_field(name_offset); |
|
3304 |
} |
|
3305 |
||
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
43929
diff
changeset
|
3306 |
void java_lang_Module::set_name(oop module, oop value) { |
36508 | 3307 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
3308 |
module->obj_field_put(name_offset, value); |
|
3309 |
} |
|
3310 |
||
49348
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
3311 |
ModuleEntry* java_lang_Module::module_entry(oop module) { |
36508 | 3312 |
assert(_module_entry_offset != -1, "Uninitialized module_entry_offset"); |
3313 |
assert(module != NULL, "module can't be null"); |
|
46968
9119841280f4
8160399: is_oop_or_null involves undefined behavior
coleenp
parents:
46773
diff
changeset
|
3314 |
assert(oopDesc::is_oop(module), "module must be oop"); |
36508 | 3315 |
|
3316 |
ModuleEntry* module_entry = (ModuleEntry*)module->address_field(_module_entry_offset); |
|
3317 |
if (module_entry == NULL) { |
|
3318 |
// If the inject field containing the ModuleEntry* is null then return the |
|
3319 |
// class loader's unnamed module. |
|
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
43929
diff
changeset
|
3320 |
oop loader = java_lang_Module::loader(module); |
49348
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
3321 |
Handle h_loader = Handle(Thread::current(), loader); |
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49340
diff
changeset
|
3322 |
ClassLoaderData* loader_cld = SystemDictionary::register_loader(h_loader); |
46387 | 3323 |
return loader_cld->unnamed_module(); |
36508 | 3324 |
} |
3325 |
return module_entry; |
|
3326 |
} |
|
3327 |
||
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
43929
diff
changeset
|
3328 |
void java_lang_Module::set_module_entry(oop module, ModuleEntry* module_entry) { |
36508 | 3329 |
assert(_module_entry_offset != -1, "Uninitialized module_entry_offset"); |
3330 |
assert(module != NULL, "module can't be null"); |
|
46968
9119841280f4
8160399: is_oop_or_null involves undefined behavior
coleenp
parents:
46773
diff
changeset
|
3331 |
assert(oopDesc::is_oop(module), "module must be oop"); |
36508 | 3332 |
module->address_field_put(_module_entry_offset, (address)module_entry); |
3333 |
} |
|
3334 |
||
37301
a936b4e01afb
8137058: Clear out all non-Critical APIs from sun.reflect
chegar
parents:
37179
diff
changeset
|
3335 |
Handle reflect_ConstantPool::create(TRAPS) { |
1 | 3336 |
assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
3337 |
InstanceKlass* k = SystemDictionary::reflect_ConstantPool_klass(); |
1 | 3338 |
// Ensure it is initialized |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
3339 |
k->initialize(CHECK_NH); |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
3340 |
return k->allocate_instance_handle(THREAD); |
1 | 3341 |
} |
3342 |
||
3343 |
||
37301
a936b4e01afb
8137058: Clear out all non-Critical APIs from sun.reflect
chegar
parents:
37179
diff
changeset
|
3344 |
void reflect_ConstantPool::set_cp(oop reflect, ConstantPool* value) { |
1 | 3345 |
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
|
3346 |
oop mirror = value->pool_holder()->java_mirror(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
3347 |
// 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
|
3348 |
reflect->obj_field_put(_oop_offset, mirror); |
1 | 3349 |
} |
3350 |
||
37301
a936b4e01afb
8137058: Clear out all non-Critical APIs from sun.reflect
chegar
parents:
37179
diff
changeset
|
3351 |
ConstantPool* reflect_ConstantPool::get_cp(oop reflect) { |
1 | 3352 |
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
|
3353 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
3354 |
oop mirror = reflect->obj_field(_oop_offset); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
3355 |
Klass* k = java_lang_Class::as_Klass(mirror); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
3356 |
assert(k->is_instance_klass(), "Must be"); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
3357 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
3358 |
// 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
|
3359 |
// 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
|
3360 |
// 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
|
3361 |
// 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
|
3362 |
// the original. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
3363 |
return InstanceKlass::cast(k)->constants(); |
1 | 3364 |
} |
3365 |
||
49329 | 3366 |
#define UNSAFESTATICFIELDACCESSORIMPL_FIELDS_DO(macro) \ |
3367 |
macro(_base_offset, k, "base", object_signature, false) |
|
3368 |
||
37301
a936b4e01afb
8137058: Clear out all non-Critical APIs from sun.reflect
chegar
parents:
37179
diff
changeset
|
3369 |
void reflect_UnsafeStaticFieldAccessorImpl::compute_offsets() { |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3370 |
InstanceKlass* k = SystemDictionary::reflect_UnsafeStaticFieldAccessorImpl_klass(); |
49329 | 3371 |
UNSAFESTATICFIELDACCESSORIMPL_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
3372 |
} |
|
3373 |
||
3374 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
3375 |
void reflect_UnsafeStaticFieldAccessorImpl::serialize_offsets(SerializeClosure* f) { |
49329 | 3376 |
UNSAFESTATICFIELDACCESSORIMPL_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
3377 |
} |
|
3378 |
#endif |
|
1 | 3379 |
|
379
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3380 |
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
|
3381 |
Klass* k = SystemDictionary::box_klass(type); |
379
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3382 |
if (k == NULL) return NULL; |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
3383 |
InstanceKlass* ik = InstanceKlass::cast(k); |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
3384 |
if (!ik->is_initialized()) ik->initialize(CHECK_0); |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
3385 |
return ik->allocate_instance(THREAD); |
1 | 3386 |
} |
3387 |
||
3388 |
||
3389 |
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
|
3390 |
oop box = initialize_and_allocate(type, CHECK_0); |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3391 |
if (box == NULL) return NULL; |
1 | 3392 |
switch (type) { |
3393 |
case T_BOOLEAN: |
|
3394 |
box->bool_field_put(value_offset, value->z); |
|
3395 |
break; |
|
3396 |
case T_CHAR: |
|
3397 |
box->char_field_put(value_offset, value->c); |
|
3398 |
break; |
|
3399 |
case T_FLOAT: |
|
3400 |
box->float_field_put(value_offset, value->f); |
|
3401 |
break; |
|
3402 |
case T_DOUBLE: |
|
591
04d2e26e6d69
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
379
diff
changeset
|
3403 |
box->double_field_put(long_value_offset, value->d); |
1 | 3404 |
break; |
3405 |
case T_BYTE: |
|
3406 |
box->byte_field_put(value_offset, value->b); |
|
3407 |
break; |
|
3408 |
case T_SHORT: |
|
3409 |
box->short_field_put(value_offset, value->s); |
|
3410 |
break; |
|
3411 |
case T_INT: |
|
3412 |
box->int_field_put(value_offset, value->i); |
|
3413 |
break; |
|
3414 |
case T_LONG: |
|
591
04d2e26e6d69
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
379
diff
changeset
|
3415 |
box->long_field_put(long_value_offset, value->j); |
1 | 3416 |
break; |
3417 |
default: |
|
3418 |
return NULL; |
|
3419 |
} |
|
3420 |
return box; |
|
3421 |
} |
|
3422 |
||
3423 |
||
379
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3424 |
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
|
3425 |
if (box == NULL) return T_ILLEGAL; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3426 |
BasicType type = SystemDictionary::box_klass_type(box->klass()); |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3427 |
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
|
3428 |
return T_ILLEGAL; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3429 |
return type; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3430 |
} |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3431 |
|
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3432 |
|
1 | 3433 |
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
|
3434 |
BasicType type = SystemDictionary::box_klass_type(box->klass()); |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3435 |
switch (type) { |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3436 |
case T_BOOLEAN: |
1 | 3437 |
value->z = box->bool_field(value_offset); |
379
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3438 |
break; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3439 |
case T_CHAR: |
1 | 3440 |
value->c = box->char_field(value_offset); |
379
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3441 |
break; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3442 |
case T_FLOAT: |
1 | 3443 |
value->f = box->float_field(value_offset); |
379
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3444 |
break; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3445 |
case T_DOUBLE: |
591
04d2e26e6d69
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
379
diff
changeset
|
3446 |
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
|
3447 |
break; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3448 |
case T_BYTE: |
1 | 3449 |
value->b = box->byte_field(value_offset); |
379
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3450 |
break; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3451 |
case T_SHORT: |
1 | 3452 |
value->s = box->short_field(value_offset); |
379
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3453 |
break; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3454 |
case T_INT: |
1 | 3455 |
value->i = box->int_field(value_offset); |
379
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3456 |
break; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3457 |
case T_LONG: |
591
04d2e26e6d69
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
379
diff
changeset
|
3458 |
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
|
3459 |
break; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3460 |
default: |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3461 |
return T_ILLEGAL; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3462 |
} // end switch |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3463 |
return type; |
1 | 3464 |
} |
3465 |
||
3466 |
||
3467 |
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
|
3468 |
BasicType type = SystemDictionary::box_klass_type(box->klass()); |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3469 |
switch (type) { |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3470 |
case T_BOOLEAN: |
1 | 3471 |
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
|
3472 |
break; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3473 |
case T_CHAR: |
1 | 3474 |
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
|
3475 |
break; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3476 |
case T_FLOAT: |
1 | 3477 |
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
|
3478 |
break; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3479 |
case T_DOUBLE: |
591
04d2e26e6d69
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
379
diff
changeset
|
3480 |
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
|
3481 |
break; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3482 |
case T_BYTE: |
1 | 3483 |
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
|
3484 |
break; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3485 |
case T_SHORT: |
1 | 3486 |
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
|
3487 |
break; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3488 |
case T_INT: |
1 | 3489 |
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
|
3490 |
break; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3491 |
case T_LONG: |
591
04d2e26e6d69
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
379
diff
changeset
|
3492 |
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
|
3493 |
break; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3494 |
default: |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3495 |
return T_ILLEGAL; |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3496 |
} // end switch |
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
3497 |
return type; |
1 | 3498 |
} |
3499 |
||
3500 |
||
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
3501 |
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
|
3502 |
switch (type) { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
3503 |
case T_BOOLEAN: st->print("%s", value->z ? "true" : "false"); break; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
3504 |
case T_CHAR: st->print("%d", value->c); break; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
3505 |
case T_BYTE: st->print("%d", value->b); break; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
3506 |
case T_SHORT: st->print("%d", value->s); break; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
3507 |
case T_INT: st->print("%d", value->i); break; |
46630
75aa3e39d02c
8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents:
46625
diff
changeset
|
3508 |
case T_LONG: st->print(JLONG_FORMAT, value->j); break; |
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
3509 |
case T_FLOAT: st->print("%f", value->f); break; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
3510 |
case T_DOUBLE: st->print("%lf", value->d); break; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
3511 |
default: st->print("type %d?", type); break; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
3512 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
3513 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2105
diff
changeset
|
3514 |
|
47998
fb0275c320a0
8189871: Refactor GC barriers to use declarative semantics
eosterlund
parents:
47818
diff
changeset
|
3515 |
// Support for java_lang_ref_Reference |
fb0275c320a0
8189871: Refactor GC barriers to use declarative semantics
eosterlund
parents:
47818
diff
changeset
|
3516 |
|
fb0275c320a0
8189871: Refactor GC barriers to use declarative semantics
eosterlund
parents:
47818
diff
changeset
|
3517 |
bool java_lang_ref_Reference::is_referent_field(oop obj, ptrdiff_t offset) { |
49592
77fb0be7d19f
8199946: Move load/store and encode/decode out of oopDesc
stefank
parents:
49480
diff
changeset
|
3518 |
assert(obj != NULL, "sanity"); |
47998
fb0275c320a0
8189871: Refactor GC barriers to use declarative semantics
eosterlund
parents:
47818
diff
changeset
|
3519 |
if (offset != java_lang_ref_Reference::referent_offset) { |
fb0275c320a0
8189871: Refactor GC barriers to use declarative semantics
eosterlund
parents:
47818
diff
changeset
|
3520 |
return false; |
fb0275c320a0
8189871: Refactor GC barriers to use declarative semantics
eosterlund
parents:
47818
diff
changeset
|
3521 |
} |
fb0275c320a0
8189871: Refactor GC barriers to use declarative semantics
eosterlund
parents:
47818
diff
changeset
|
3522 |
|
fb0275c320a0
8189871: Refactor GC barriers to use declarative semantics
eosterlund
parents:
47818
diff
changeset
|
3523 |
Klass* k = obj->klass(); |
fb0275c320a0
8189871: Refactor GC barriers to use declarative semantics
eosterlund
parents:
47818
diff
changeset
|
3524 |
if (!k->is_instance_klass()) { |
fb0275c320a0
8189871: Refactor GC barriers to use declarative semantics
eosterlund
parents:
47818
diff
changeset
|
3525 |
return false; |
fb0275c320a0
8189871: Refactor GC barriers to use declarative semantics
eosterlund
parents:
47818
diff
changeset
|
3526 |
} |
fb0275c320a0
8189871: Refactor GC barriers to use declarative semantics
eosterlund
parents:
47818
diff
changeset
|
3527 |
|
fb0275c320a0
8189871: Refactor GC barriers to use declarative semantics
eosterlund
parents:
47818
diff
changeset
|
3528 |
InstanceKlass* ik = InstanceKlass::cast(obj->klass()); |
fb0275c320a0
8189871: Refactor GC barriers to use declarative semantics
eosterlund
parents:
47818
diff
changeset
|
3529 |
bool is_reference = ik->reference_type() != REF_NONE; |
fb0275c320a0
8189871: Refactor GC barriers to use declarative semantics
eosterlund
parents:
47818
diff
changeset
|
3530 |
assert(!is_reference || ik->is_subclass_of(SystemDictionary::Reference_klass()), "sanity"); |
fb0275c320a0
8189871: Refactor GC barriers to use declarative semantics
eosterlund
parents:
47818
diff
changeset
|
3531 |
return is_reference; |
fb0275c320a0
8189871: Refactor GC barriers to use declarative semantics
eosterlund
parents:
47818
diff
changeset
|
3532 |
} |
fb0275c320a0
8189871: Refactor GC barriers to use declarative semantics
eosterlund
parents:
47818
diff
changeset
|
3533 |
|
1 | 3534 |
// Support for java_lang_ref_SoftReference |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3535 |
// |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3536 |
|
49329 | 3537 |
#define SOFTREFERENCE_FIELDS_DO(macro) \ |
3538 |
macro(timestamp_offset, k, "timestamp", long_signature, false); \ |
|
3539 |
macro(static_clock_offset, k, "clock", long_signature, true) |
|
3540 |
||
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3541 |
void java_lang_ref_SoftReference::compute_offsets() { |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3542 |
InstanceKlass* k = SystemDictionary::SoftReference_klass(); |
49329 | 3543 |
SOFTREFERENCE_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
3544 |
} |
|
3545 |
||
3546 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
3547 |
void java_lang_ref_SoftReference::serialize_offsets(SerializeClosure* f) { |
49329 | 3548 |
SOFTREFERENCE_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
3549 |
} |
|
3550 |
#endif |
|
1 | 3551 |
|
3552 |
jlong java_lang_ref_SoftReference::timestamp(oop ref) { |
|
3553 |
return ref->long_field(timestamp_offset); |
|
3554 |
} |
|
3555 |
||
3556 |
jlong java_lang_ref_SoftReference::clock() { |
|
33602 | 3557 |
InstanceKlass* ik = SystemDictionary::SoftReference_klass(); |
49473
26958d06b585
8199739: Use HeapAccess when loading oops from static fields in javaClasses.cpp
rkennke
parents:
49449
diff
changeset
|
3558 |
oop base = ik->static_field_base_raw(); |
26958d06b585
8199739: Use HeapAccess when loading oops from static fields in javaClasses.cpp
rkennke
parents:
49449
diff
changeset
|
3559 |
return base->long_field(static_clock_offset); |
1 | 3560 |
} |
3561 |
||
3562 |
void java_lang_ref_SoftReference::set_clock(jlong value) { |
|
33602 | 3563 |
InstanceKlass* ik = SystemDictionary::SoftReference_klass(); |
49473
26958d06b585
8199739: Use HeapAccess when loading oops from static fields in javaClasses.cpp
rkennke
parents:
49449
diff
changeset
|
3564 |
oop base = ik->static_field_base_raw(); |
26958d06b585
8199739: Use HeapAccess when loading oops from static fields in javaClasses.cpp
rkennke
parents:
49449
diff
changeset
|
3565 |
base->long_field_put(static_clock_offset, value); |
1 | 3566 |
} |
3567 |
||
19266
bb0324cbe0aa
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
18066
diff
changeset
|
3568 |
// Support for java_lang_invoke_DirectMethodHandle |
bb0324cbe0aa
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
18066
diff
changeset
|
3569 |
|
bb0324cbe0aa
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
18066
diff
changeset
|
3570 |
int java_lang_invoke_DirectMethodHandle::_member_offset; |
bb0324cbe0aa
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
18066
diff
changeset
|
3571 |
|
bb0324cbe0aa
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
18066
diff
changeset
|
3572 |
oop java_lang_invoke_DirectMethodHandle::member(oop dmh) { |
bb0324cbe0aa
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
18066
diff
changeset
|
3573 |
oop member_name = NULL; |
46968
9119841280f4
8160399: is_oop_or_null involves undefined behavior
coleenp
parents:
46773
diff
changeset
|
3574 |
assert(oopDesc::is_oop(dmh) && java_lang_invoke_DirectMethodHandle::is_instance(dmh), |
9119841280f4
8160399: is_oop_or_null involves undefined behavior
coleenp
parents:
46773
diff
changeset
|
3575 |
"a DirectMethodHandle oop is expected"); |
9119841280f4
8160399: is_oop_or_null involves undefined behavior
coleenp
parents:
46773
diff
changeset
|
3576 |
return dmh->obj_field(member_offset_in_bytes()); |
19266
bb0324cbe0aa
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
18066
diff
changeset
|
3577 |
} |
bb0324cbe0aa
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
18066
diff
changeset
|
3578 |
|
49329 | 3579 |
#define DIRECTMETHODHANDLE_FIELDS_DO(macro) \ |
3580 |
macro(_member_offset, k, "member", java_lang_invoke_MemberName_signature, false) |
|
3581 |
||
19266
bb0324cbe0aa
7187554: JSR 292: JVMTI PopFrame needs to handle appendix arguments
sspitsyn
parents:
18066
diff
changeset
|
3582 |
void java_lang_invoke_DirectMethodHandle::compute_offsets() { |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3583 |
InstanceKlass* k = SystemDictionary::DirectMethodHandle_klass(); |
49329 | 3584 |
DIRECTMETHODHANDLE_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
3585 |
} |
|
3586 |
||
3587 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
3588 |
void java_lang_invoke_DirectMethodHandle::serialize_offsets(SerializeClosure* f) { |
49329 | 3589 |
DIRECTMETHODHANDLE_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
3590 |
} |
|
3591 |
#endif |
|
1 | 3592 |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3593 |
// Support for java_lang_invoke_MethodHandle |
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3594 |
|
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3595 |
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
|
3596 |
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
|
3597 |
|
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3598 |
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
|
3599 |
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
|
3600 |
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
|
3601 |
int java_lang_invoke_MemberName::_flags_offset; |
46505
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3602 |
int java_lang_invoke_MemberName::_method_offset; |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3603 |
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
|
3604 |
|
46505
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3605 |
int java_lang_invoke_ResolvedMethodName::_vmtarget_offset; |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3606 |
int java_lang_invoke_ResolvedMethodName::_vmholder_offset; |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3607 |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
3608 |
int java_lang_invoke_LambdaForm::_vmentry_offset; |
10514
e229a19078cf
7071307: MethodHandle bimorphic inlining should consider the frequency
never
parents:
10509
diff
changeset
|
3609 |
|
49329 | 3610 |
#define METHODHANDLE_FIELDS_DO(macro) \ |
3611 |
macro(_type_offset, k, vmSymbols::type_name(), java_lang_invoke_MethodType_signature, false); \ |
|
3612 |
macro(_form_offset, k, "form", java_lang_invoke_LambdaForm_signature, false) |
|
3613 |
||
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3614 |
void java_lang_invoke_MethodHandle::compute_offsets() { |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3615 |
InstanceKlass* k = SystemDictionary::MethodHandle_klass(); |
49329 | 3616 |
METHODHANDLE_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
3617 |
} |
|
3618 |
||
3619 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
3620 |
void java_lang_invoke_MethodHandle::serialize_offsets(SerializeClosure* f) { |
49329 | 3621 |
METHODHANDLE_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
3622 |
} |
|
3623 |
#endif |
|
3624 |
||
3625 |
#define MEMBERNAME_FIELDS_DO(macro) \ |
|
3626 |
macro(_clazz_offset, k, vmSymbols::clazz_name(), class_signature, false); \ |
|
3627 |
macro(_name_offset, k, vmSymbols::name_name(), string_signature, false); \ |
|
3628 |
macro(_type_offset, k, vmSymbols::type_name(), object_signature, false); \ |
|
3629 |
macro(_flags_offset, k, vmSymbols::flags_name(), int_signature, false); \ |
|
3630 |
macro(_method_offset, k, vmSymbols::method_name(), java_lang_invoke_ResolvedMethodName_signature, false) |
|
2534 | 3631 |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3632 |
void java_lang_invoke_MemberName::compute_offsets() { |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3633 |
InstanceKlass* k = SystemDictionary::MemberName_klass(); |
49329 | 3634 |
MEMBERNAME_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
46505
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3635 |
MEMBERNAME_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET); |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3636 |
} |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3637 |
|
49329 | 3638 |
#if INCLUDE_CDS |
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
3639 |
void java_lang_invoke_MemberName::serialize_offsets(SerializeClosure* f) { |
49329 | 3640 |
MEMBERNAME_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
3641 |
MEMBERNAME_INJECTED_FIELDS(INJECTED_FIELD_SERIALIZE_OFFSET); |
|
3642 |
} |
|
3643 |
#endif |
|
3644 |
||
46505
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3645 |
void java_lang_invoke_ResolvedMethodName::compute_offsets() { |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3646 |
InstanceKlass* k = SystemDictionary::ResolvedMethodName_klass(); |
46505
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3647 |
assert(k != NULL, "jdk mismatch"); |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3648 |
RESOLVEDMETHOD_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET); |
2534 | 3649 |
} |
3650 |
||
49329 | 3651 |
#if INCLUDE_CDS |
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
3652 |
void java_lang_invoke_ResolvedMethodName::serialize_offsets(SerializeClosure* f) { |
49329 | 3653 |
RESOLVEDMETHOD_INJECTED_FIELDS(INJECTED_FIELD_SERIALIZE_OFFSET); |
3654 |
} |
|
3655 |
#endif |
|
3656 |
||
3657 |
#define LAMBDAFORM_FIELDS_DO(macro) \ |
|
3658 |
macro(_vmentry_offset, k, "vmentry", java_lang_invoke_MemberName_signature, false) |
|
3659 |
||
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
3660 |
void java_lang_invoke_LambdaForm::compute_offsets() { |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3661 |
InstanceKlass* k = SystemDictionary::LambdaForm_klass(); |
46505
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3662 |
assert (k != NULL, "jdk mismatch"); |
49329 | 3663 |
LAMBDAFORM_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
3664 |
} |
|
3665 |
||
3666 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
3667 |
void java_lang_invoke_LambdaForm::serialize_offsets(SerializeClosure* f) { |
49329 | 3668 |
LAMBDAFORM_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
3669 |
} |
|
3670 |
#endif |
|
2534 | 3671 |
|
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
27694
diff
changeset
|
3672 |
bool java_lang_invoke_LambdaForm::is_instance(oop obj) { |
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
27694
diff
changeset
|
3673 |
return obj != NULL && is_subclass(obj->klass()); |
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
27694
diff
changeset
|
3674 |
} |
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
27694
diff
changeset
|
3675 |
|
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
27694
diff
changeset
|
3676 |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3677 |
oop java_lang_invoke_MethodHandle::type(oop mh) { |
2534 | 3678 |
return mh->obj_field(_type_offset); |
3679 |
} |
|
3680 |
||
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3681 |
void java_lang_invoke_MethodHandle::set_type(oop mh, oop mtype) { |
2534 | 3682 |
mh->obj_field_put(_type_offset, mtype); |
3683 |
} |
|
3684 |
||
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
3685 |
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
|
3686 |
assert(_form_offset != 0, ""); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
3687 |
return mh->obj_field(_form_offset); |
2534 | 3688 |
} |
3689 |
||
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
3690 |
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
|
3691 |
assert(_form_offset != 0, ""); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
3692 |
mh->obj_field_put(_form_offset, lform); |
2534 | 3693 |
} |
3694 |
||
3695 |
/// MemberName accessors |
|
3696 |
||
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3697 |
oop java_lang_invoke_MemberName::clazz(oop mname) { |
2534 | 3698 |
assert(is_instance(mname), "wrong type"); |
3699 |
return mname->obj_field(_clazz_offset); |
|
3700 |
} |
|
3701 |
||
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3702 |
void java_lang_invoke_MemberName::set_clazz(oop mname, oop clazz) { |
2534 | 3703 |
assert(is_instance(mname), "wrong type"); |
3704 |
mname->obj_field_put(_clazz_offset, clazz); |
|
3705 |
} |
|
3706 |
||
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3707 |
oop java_lang_invoke_MemberName::name(oop mname) { |
2534 | 3708 |
assert(is_instance(mname), "wrong type"); |
3709 |
return mname->obj_field(_name_offset); |
|
3710 |
} |
|
3711 |
||
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3712 |
void java_lang_invoke_MemberName::set_name(oop mname, oop name) { |
2534 | 3713 |
assert(is_instance(mname), "wrong type"); |
3714 |
mname->obj_field_put(_name_offset, name); |
|
3715 |
} |
|
3716 |
||
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3717 |
oop java_lang_invoke_MemberName::type(oop mname) { |
2534 | 3718 |
assert(is_instance(mname), "wrong type"); |
3719 |
return mname->obj_field(_type_offset); |
|
3720 |
} |
|
3721 |
||
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3722 |
void java_lang_invoke_MemberName::set_type(oop mname, oop type) { |
2534 | 3723 |
assert(is_instance(mname), "wrong type"); |
3724 |
mname->obj_field_put(_type_offset, type); |
|
3725 |
} |
|
3726 |
||
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3727 |
int java_lang_invoke_MemberName::flags(oop mname) { |
2534 | 3728 |
assert(is_instance(mname), "wrong type"); |
3729 |
return mname->int_field(_flags_offset); |
|
3730 |
} |
|
3731 |
||
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3732 |
void java_lang_invoke_MemberName::set_flags(oop mname, int flags) { |
2534 | 3733 |
assert(is_instance(mname), "wrong type"); |
3734 |
mname->int_field_put(_flags_offset, flags); |
|
3735 |
} |
|
3736 |
||
46505
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3737 |
|
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3738 |
// Return vmtarget from ResolvedMethodName method field through indirection |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3739 |
Method* java_lang_invoke_MemberName::vmtarget(oop mname) { |
2534 | 3740 |
assert(is_instance(mname), "wrong type"); |
46505
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3741 |
oop method = mname->obj_field(_method_offset); |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3742 |
return method == NULL ? NULL : java_lang_invoke_ResolvedMethodName::vmtarget(method); |
2534 | 3743 |
} |
3744 |
||
27674
00cabfc45357
8042235: redefining method used by multiple MethodHandles crashes VM
coleenp
parents:
27654
diff
changeset
|
3745 |
bool java_lang_invoke_MemberName::is_method(oop mname) { |
00cabfc45357
8042235: redefining method used by multiple MethodHandles crashes VM
coleenp
parents:
27654
diff
changeset
|
3746 |
assert(is_instance(mname), "must be MemberName"); |
00cabfc45357
8042235: redefining method used by multiple MethodHandles crashes VM
coleenp
parents:
27654
diff
changeset
|
3747 |
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
|
3748 |
} |
00cabfc45357
8042235: redefining method used by multiple MethodHandles crashes VM
coleenp
parents:
27654
diff
changeset
|
3749 |
|
46505
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3750 |
void java_lang_invoke_MemberName::set_method(oop mname, oop resolved_method) { |
2534 | 3751 |
assert(is_instance(mname), "wrong type"); |
46505
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3752 |
mname->obj_field_put(_method_offset, resolved_method); |
2534 | 3753 |
} |
3754 |
||
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
3755 |
intptr_t java_lang_invoke_MemberName::vmindex(oop mname) { |
2534 | 3756 |
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
|
3757 |
return (intptr_t) mname->address_field(_vmindex_offset); |
2534 | 3758 |
} |
3759 |
||
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
3760 |
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
|
3761 |
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
|
3762 |
mname->address_field_put(_vmindex_offset, (address) index); |
2534 | 3763 |
} |
3764 |
||
46505
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3765 |
|
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3766 |
Method* java_lang_invoke_ResolvedMethodName::vmtarget(oop resolved_method) { |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3767 |
assert(is_instance(resolved_method), "wrong type"); |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3768 |
Method* m = (Method*)resolved_method->address_field(_vmtarget_offset); |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3769 |
assert(m->is_method(), "must be"); |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3770 |
return m; |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3771 |
} |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3772 |
|
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3773 |
// Used by redefinition to change Method* to new Method* with same hash (name, signature) |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3774 |
void java_lang_invoke_ResolvedMethodName::set_vmtarget(oop resolved_method, Method* m) { |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3775 |
assert(is_instance(resolved_method), "wrong type"); |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3776 |
resolved_method->address_field_put(_vmtarget_offset, (address)m); |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3777 |
} |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3778 |
|
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3779 |
oop java_lang_invoke_ResolvedMethodName::find_resolved_method(const methodHandle& m, TRAPS) { |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3780 |
// lookup ResolvedMethod oop in the table, or create a new one and intern it |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3781 |
oop resolved_method = ResolvedMethodTable::find_method(m()); |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3782 |
if (resolved_method == NULL) { |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3783 |
InstanceKlass* k = SystemDictionary::ResolvedMethodName_klass(); |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3784 |
if (!k->is_initialized()) { |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3785 |
k->initialize(CHECK_NULL); |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3786 |
} |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3787 |
oop new_resolved_method = k->allocate_instance(CHECK_NULL); |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3788 |
new_resolved_method->address_field_put(_vmtarget_offset, (address)m()); |
51444
3e5d28e6de32
8209301: JVM rename is_anonymous, host_klass to unsafe specific terminology ahead of Unsafe.defineAnonymousClass deprecation
lfoltan
parents:
51429
diff
changeset
|
3789 |
// Add a reference to the loader (actually mirror because unsafe anonymous classes will not have |
46505
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3790 |
// distinct loaders) to ensure the metadata is kept alive. |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3791 |
// This mirror may be different than the one in clazz field. |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3792 |
new_resolved_method->obj_field_put(_vmholder_offset, m->method_holder()->java_mirror()); |
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3793 |
resolved_method = ResolvedMethodTable::add_method(Handle(THREAD, new_resolved_method)); |
43929
9a572e758c9b
8162795: [REDO] MemberNameTable doesn't purge stale entries
kevinw
parents:
43677
diff
changeset
|
3794 |
} |
46505
fd4bc78630b1
8174749: Use hash table/oops for MemberName table
coleenp
parents:
46388
diff
changeset
|
3795 |
return resolved_method; |
43929
9a572e758c9b
8162795: [REDO] MemberNameTable doesn't purge stale entries
kevinw
parents:
43677
diff
changeset
|
3796 |
} |
9a572e758c9b
8162795: [REDO] MemberNameTable doesn't purge stale entries
kevinw
parents:
43677
diff
changeset
|
3797 |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
3798 |
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
|
3799 |
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
|
3800 |
return lform->obj_field(_vmentry_offset); |
2534 | 3801 |
} |
3802 |
||
3803 |
||
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3804 |
// Support for java_lang_invoke_MethodType |
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3805 |
|
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3806 |
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
|
3807 |
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
|
3808 |
|
49329 | 3809 |
#define METHODTYPE_FIELDS_DO(macro) \ |
3810 |
macro(_rtype_offset, k, "rtype", class_signature, false); \ |
|
3811 |
macro(_ptypes_offset, k, "ptypes", class_array_signature, false) |
|
3812 |
||
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3813 |
void java_lang_invoke_MethodType::compute_offsets() { |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3814 |
InstanceKlass* k = SystemDictionary::MethodType_klass(); |
49329 | 3815 |
METHODTYPE_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
3816 |
} |
|
3817 |
||
3818 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
3819 |
void java_lang_invoke_MethodType::serialize_offsets(SerializeClosure* f) { |
49329 | 3820 |
METHODTYPE_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
3821 |
} |
|
3822 |
#endif |
|
2534 | 3823 |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3824 |
void java_lang_invoke_MethodType::print_signature(oop mt, outputStream* st) { |
2534 | 3825 |
st->print("("); |
3826 |
objArrayOop pts = ptypes(mt); |
|
3827 |
for (int i = 0, limit = pts->length(); i < limit; i++) { |
|
3828 |
java_lang_Class::print_signature(pts->obj_at(i), st); |
|
3829 |
} |
|
3830 |
st->print(")"); |
|
3831 |
java_lang_Class::print_signature(rtype(mt), st); |
|
3832 |
} |
|
3833 |
||
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3834 |
Symbol* java_lang_invoke_MethodType::as_signature(oop mt, bool intern_if_not_found, TRAPS) { |
2534 | 3835 |
ResourceMark rm; |
3836 |
stringStream buffer(128); |
|
3837 |
print_signature(mt, &buffer); |
|
3838 |
const char* sigstr = buffer.base(); |
|
3839 |
int siglen = (int) buffer.size(); |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
3840 |
Symbol *name; |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
3841 |
if (!intern_if_not_found) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
3842 |
name = SymbolTable::probe(sigstr, siglen); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
3843 |
} else { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
3844 |
name = SymbolTable::new_symbol(sigstr, siglen, THREAD); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
3845 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
3846 |
return name; |
2534 | 3847 |
} |
3848 |
||
10008
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9630
diff
changeset
|
3849 |
bool java_lang_invoke_MethodType::equals(oop mt1, oop mt2) { |
49658 | 3850 |
if (oopDesc::equals(mt1, mt2)) |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
3851 |
return true; |
49658 | 3852 |
if (!oopDesc::equals(rtype(mt1), rtype(mt2))) |
10008
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9630
diff
changeset
|
3853 |
return false; |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9630
diff
changeset
|
3854 |
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
|
3855 |
return false; |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9630
diff
changeset
|
3856 |
for (int i = ptype_count(mt1) - 1; i >= 0; i--) { |
49658 | 3857 |
if (!oopDesc::equals(ptype(mt1, i), ptype(mt2, i))) |
10008
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9630
diff
changeset
|
3858 |
return false; |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9630
diff
changeset
|
3859 |
} |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9630
diff
changeset
|
3860 |
return true; |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9630
diff
changeset
|
3861 |
} |
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
9630
diff
changeset
|
3862 |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3863 |
oop java_lang_invoke_MethodType::rtype(oop mt) { |
2534 | 3864 |
assert(is_instance(mt), "must be a MethodType"); |
3865 |
return mt->obj_field(_rtype_offset); |
|
3866 |
} |
|
3867 |
||
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3868 |
objArrayOop java_lang_invoke_MethodType::ptypes(oop mt) { |
2534 | 3869 |
assert(is_instance(mt), "must be a MethodType"); |
3870 |
return (objArrayOop) mt->obj_field(_ptypes_offset); |
|
3871 |
} |
|
3872 |
||
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3873 |
oop java_lang_invoke_MethodType::ptype(oop mt, int idx) { |
2534 | 3874 |
return ptypes(mt)->obj_at(idx); |
3875 |
} |
|
3876 |
||
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3877 |
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
|
3878 |
return ptypes(mt)->length(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
4466
diff
changeset
|
3879 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
4466
diff
changeset
|
3880 |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
3881 |
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
|
3882 |
objArrayOop pts = ptypes(mt); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
3883 |
int count = pts->length(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
3884 |
int slots = 0; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
3885 |
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
|
3886 |
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
|
3887 |
slots += type2size[bt]; |
2534 | 3888 |
} |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
3889 |
return slots; |
2534 | 3890 |
} |
3891 |
||
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
3892 |
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
|
3893 |
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
|
3894 |
return type2size[bt]; |
6463
f4362c8da849
6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions
jrose
parents:
5547
diff
changeset
|
3895 |
} |
f4362c8da849
6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions
jrose
parents:
5547
diff
changeset
|
3896 |
|
2534 | 3897 |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3898 |
// Support for java_lang_invoke_CallSite |
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3899 |
|
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3900 |
int java_lang_invoke_CallSite::_target_offset; |
30296
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
29081
diff
changeset
|
3901 |
int java_lang_invoke_CallSite::_context_offset; |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3902 |
|
49329 | 3903 |
#define CALLSITE_FIELDS_DO(macro) \ |
3904 |
macro(_target_offset, k, "target", java_lang_invoke_MethodHandle_signature, false); \ |
|
3905 |
macro(_context_offset, k, "context", java_lang_invoke_MethodHandleNatives_CallSiteContext_signature, false) |
|
3906 |
||
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
3907 |
void java_lang_invoke_CallSite::compute_offsets() { |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3908 |
InstanceKlass* k = SystemDictionary::CallSite_klass(); |
49329 | 3909 |
CALLSITE_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
3910 |
} |
|
3911 |
||
3912 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
3913 |
void java_lang_invoke_CallSite::serialize_offsets(SerializeClosure* f) { |
49329 | 3914 |
CALLSITE_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
3915 |
} |
|
3916 |
#endif |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2534
diff
changeset
|
3917 |
|
31037
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30310
diff
changeset
|
3918 |
oop java_lang_invoke_CallSite::context(oop call_site) { |
30296
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
29081
diff
changeset
|
3919 |
assert(java_lang_invoke_CallSite::is_instance(call_site), ""); |
31037
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30310
diff
changeset
|
3920 |
|
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30310
diff
changeset
|
3921 |
oop dep_oop = call_site->obj_field(_context_offset); |
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30310
diff
changeset
|
3922 |
return dep_oop; |
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30310
diff
changeset
|
3923 |
} |
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30310
diff
changeset
|
3924 |
|
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30310
diff
changeset
|
3925 |
// Support for java_lang_invoke_MethodHandleNatives_CallSiteContext |
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30310
diff
changeset
|
3926 |
|
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30310
diff
changeset
|
3927 |
int java_lang_invoke_MethodHandleNatives_CallSiteContext::_vmdependencies_offset; |
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30310
diff
changeset
|
3928 |
|
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30310
diff
changeset
|
3929 |
void java_lang_invoke_MethodHandleNatives_CallSiteContext::compute_offsets() { |
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3930 |
InstanceKlass* k = SystemDictionary::Context_klass(); |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3931 |
CALLSITECONTEXT_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET); |
31037
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30310
diff
changeset
|
3932 |
} |
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30310
diff
changeset
|
3933 |
|
49329 | 3934 |
#if INCLUDE_CDS |
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
3935 |
void java_lang_invoke_MethodHandleNatives_CallSiteContext::serialize_offsets(SerializeClosure* f) { |
49329 | 3936 |
CALLSITECONTEXT_INJECTED_FIELDS(INJECTED_FIELD_SERIALIZE_OFFSET); |
3937 |
} |
|
3938 |
#endif |
|
3939 |
||
34195
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33638
diff
changeset
|
3940 |
DependencyContext java_lang_invoke_MethodHandleNatives_CallSiteContext::vmdependencies(oop call_site) { |
31037
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30310
diff
changeset
|
3941 |
assert(java_lang_invoke_MethodHandleNatives_CallSiteContext::is_instance(call_site), ""); |
49041
44122f767467
8198286: Direct memory accessors in typeArrayOop.hpp should use Access API
eosterlund
parents:
49036
diff
changeset
|
3942 |
intptr_t* vmdeps_addr = (intptr_t*)call_site->field_addr(_vmdependencies_offset); |
34195
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33638
diff
changeset
|
3943 |
DependencyContext dep_ctx(vmdeps_addr); |
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33638
diff
changeset
|
3944 |
return dep_ctx; |
30296
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
29081
diff
changeset
|
3945 |
} |
2534 | 3946 |
|
1 | 3947 |
// Support for java_security_AccessControlContext |
3948 |
||
3949 |
int java_security_AccessControlContext::_context_offset = 0; |
|
3950 |
int java_security_AccessControlContext::_privilegedContext_offset = 0; |
|
3951 |
int java_security_AccessControlContext::_isPrivileged_offset = 0; |
|
18056 | 3952 |
int java_security_AccessControlContext::_isAuthorized_offset = -1; |
1 | 3953 |
|
49329 | 3954 |
#define ACCESSCONTROLCONTEXT_FIELDS_DO(macro) \ |
3955 |
macro(_context_offset, k, "context", protectiondomain_signature, false); \ |
|
3956 |
macro(_privilegedContext_offset, k, "privilegedContext", accesscontrolcontext_signature, false); \ |
|
3957 |
macro(_isPrivileged_offset, k, "isPrivileged", bool_signature, false); \ |
|
3958 |
macro(_isAuthorized_offset, k, "isAuthorized", bool_signature, false) |
|
3959 |
||
1 | 3960 |
void java_security_AccessControlContext::compute_offsets() { |
3961 |
assert(_isPrivileged_offset == 0, "offsets should be initialized only once"); |
|
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
3962 |
InstanceKlass* k = SystemDictionary::AccessControlContext_klass(); |
49329 | 3963 |
ACCESSCONTROLCONTEXT_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
3964 |
} |
|
3965 |
||
3966 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
3967 |
void java_security_AccessControlContext::serialize_offsets(SerializeClosure* f) { |
49329 | 3968 |
ACCESSCONTROLCONTEXT_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
3969 |
} |
|
3970 |
#endif |
|
1 | 3971 |
|
18056 | 3972 |
bool java_security_AccessControlContext::is_authorized(Handle context) { |
3973 |
assert(context.not_null() && context->klass() == SystemDictionary::AccessControlContext_klass(), "Invalid type"); |
|
3974 |
assert(_isAuthorized_offset != -1, "should be set"); |
|
3975 |
return context->bool_field(_isAuthorized_offset) != 0; |
|
3976 |
} |
|
1 | 3977 |
|
3978 |
oop java_security_AccessControlContext::create(objArrayHandle context, bool isPrivileged, Handle privileged_context, TRAPS) { |
|
3979 |
assert(_isPrivileged_offset != 0, "offsets should have been initialized"); |
|
3980 |
// Ensure klass is initialized |
|
33602 | 3981 |
SystemDictionary::AccessControlContext_klass()->initialize(CHECK_0); |
1 | 3982 |
// Allocate result |
33602 | 3983 |
oop result = SystemDictionary::AccessControlContext_klass()->allocate_instance(CHECK_0); |
1 | 3984 |
// Fill in values |
3985 |
result->obj_field_put(_context_offset, context()); |
|
3986 |
result->obj_field_put(_privilegedContext_offset, privileged_context()); |
|
3987 |
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
|
3988 |
// 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
|
3989 |
if (_isAuthorized_offset != -1) { |
3c2ec1be67c7
8011896: Add check for invalid offset for new AccessControlContext isAuthorized field
mullan
parents:
18056
diff
changeset
|
3990 |
result->bool_field_put(_isAuthorized_offset, true); |
3c2ec1be67c7
8011896: Add check for invalid offset for new AccessControlContext isAuthorized field
mullan
parents:
18056
diff
changeset
|
3991 |
} |
1 | 3992 |
return result; |
3993 |
} |
|
3994 |
||
3995 |
||
3996 |
// Support for java_lang_ClassLoader |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
3997 |
|
10546 | 3998 |
bool java_lang_ClassLoader::offsets_computed = false; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
3999 |
int java_lang_ClassLoader::_loader_data_offset = -1; |
10546 | 4000 |
int java_lang_ClassLoader::parallelCapable_offset = -1; |
41877 | 4001 |
int java_lang_ClassLoader::name_offset = -1; |
50634
c349d409262a
8202605: Standardize on ClassLoaderData::loader_name() throughout the VM to obtain a class loader's name
lfoltan
parents:
50532
diff
changeset
|
4002 |
int java_lang_ClassLoader::nameAndId_offset = -1; |
36508 | 4003 |
int java_lang_ClassLoader::unnamedModule_offset = -1; |
10546 | 4004 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
4005 |
ClassLoaderData* java_lang_ClassLoader::loader_data(oop loader) { |
49041
44122f767467
8198286: Direct memory accessors in typeArrayOop.hpp should use Access API
eosterlund
parents:
49036
diff
changeset
|
4006 |
assert(loader != NULL && oopDesc::is_oop(loader), "loader must be oop"); |
44122f767467
8198286: Direct memory accessors in typeArrayOop.hpp should use Access API
eosterlund
parents:
49036
diff
changeset
|
4007 |
return HeapAccess<>::load_at(loader, _loader_data_offset); |
44122f767467
8198286: Direct memory accessors in typeArrayOop.hpp should use Access API
eosterlund
parents:
49036
diff
changeset
|
4008 |
} |
44122f767467
8198286: Direct memory accessors in typeArrayOop.hpp should use Access API
eosterlund
parents:
49036
diff
changeset
|
4009 |
|
44122f767467
8198286: Direct memory accessors in typeArrayOop.hpp should use Access API
eosterlund
parents:
49036
diff
changeset
|
4010 |
ClassLoaderData* java_lang_ClassLoader::cmpxchg_loader_data(ClassLoaderData* new_data, oop loader, ClassLoaderData* expected_data) { |
44122f767467
8198286: Direct memory accessors in typeArrayOop.hpp should use Access API
eosterlund
parents:
49036
diff
changeset
|
4011 |
assert(loader != NULL && oopDesc::is_oop(loader), "loader must be oop"); |
44122f767467
8198286: Direct memory accessors in typeArrayOop.hpp should use Access API
eosterlund
parents:
49036
diff
changeset
|
4012 |
return HeapAccess<>::atomic_cmpxchg_at(new_data, loader, _loader_data_offset, expected_data); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
4013 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
4014 |
|
49329 | 4015 |
#define CLASSLOADER_FIELDS_DO(macro) \ |
4016 |
macro(parallelCapable_offset, k1, "parallelLockMap", concurrenthashmap_signature, false); \ |
|
4017 |
macro(name_offset, k1, vmSymbols::name_name(), string_signature, false); \ |
|
50634
c349d409262a
8202605: Standardize on ClassLoaderData::loader_name() throughout the VM to obtain a class loader's name
lfoltan
parents:
50532
diff
changeset
|
4018 |
macro(nameAndId_offset, k1, "nameAndId", string_signature, false); \ |
49329 | 4019 |
macro(unnamedModule_offset, k1, "unnamedModule", module_signature, false); \ |
4020 |
macro(parent_offset, k1, "parent", classloader_signature, false) |
|
4021 |
||
10546 | 4022 |
void java_lang_ClassLoader::compute_offsets() { |
4023 |
assert(!offsets_computed, "offsets should be initialized only once"); |
|
4024 |
offsets_computed = true; |
|
4025 |
||
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4026 |
InstanceKlass* k1 = SystemDictionary::ClassLoader_klass(); |
49329 | 4027 |
CLASSLOADER_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
36508 | 4028 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
4029 |
CLASSLOADER_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET); |
10546 | 4030 |
} |
1 | 4031 |
|
49329 | 4032 |
#if INCLUDE_CDS |
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
4033 |
void java_lang_ClassLoader::serialize_offsets(SerializeClosure* f) { |
49329 | 4034 |
CLASSLOADER_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
4035 |
CLASSLOADER_INJECTED_FIELDS(INJECTED_FIELD_SERIALIZE_OFFSET); |
|
4036 |
} |
|
4037 |
#endif |
|
4038 |
||
1 | 4039 |
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
|
4040 |
assert(is_instance(loader), "loader must be oop"); |
1 | 4041 |
return loader->obj_field(parent_offset); |
4042 |
} |
|
4043 |
||
50634
c349d409262a
8202605: Standardize on ClassLoaderData::loader_name() throughout the VM to obtain a class loader's name
lfoltan
parents:
50532
diff
changeset
|
4044 |
// Returns the name field of this class loader. If the name field has not |
c349d409262a
8202605: Standardize on ClassLoaderData::loader_name() throughout the VM to obtain a class loader's name
lfoltan
parents:
50532
diff
changeset
|
4045 |
// been set, null will be returned. |
41877 | 4046 |
oop java_lang_ClassLoader::name(oop loader) { |
4047 |
assert(is_instance(loader), "loader must be oop"); |
|
4048 |
return loader->obj_field(name_offset); |
|
4049 |
} |
|
4050 |
||
50634
c349d409262a
8202605: Standardize on ClassLoaderData::loader_name() throughout the VM to obtain a class loader's name
lfoltan
parents:
50532
diff
changeset
|
4051 |
// Returns the nameAndId field of this class loader. The format is |
c349d409262a
8202605: Standardize on ClassLoaderData::loader_name() throughout the VM to obtain a class loader's name
lfoltan
parents:
50532
diff
changeset
|
4052 |
// as follows: |
c349d409262a
8202605: Standardize on ClassLoaderData::loader_name() throughout the VM to obtain a class loader's name
lfoltan
parents:
50532
diff
changeset
|
4053 |
// If the defining loader has a name explicitly set then '<loader-name>' @<id> |
c349d409262a
8202605: Standardize on ClassLoaderData::loader_name() throughout the VM to obtain a class loader's name
lfoltan
parents:
50532
diff
changeset
|
4054 |
// If the defining loader has no name then <qualified-class-name> @<id> |
c349d409262a
8202605: Standardize on ClassLoaderData::loader_name() throughout the VM to obtain a class loader's name
lfoltan
parents:
50532
diff
changeset
|
4055 |
// If built-in loader, then omit '@<id>' as there is only one instance. |
c349d409262a
8202605: Standardize on ClassLoaderData::loader_name() throughout the VM to obtain a class loader's name
lfoltan
parents:
50532
diff
changeset
|
4056 |
// Use ClassLoader::loader_name_id() to obtain this String as a char*. |
c349d409262a
8202605: Standardize on ClassLoaderData::loader_name() throughout the VM to obtain a class loader's name
lfoltan
parents:
50532
diff
changeset
|
4057 |
oop java_lang_ClassLoader::nameAndId(oop loader) { |
c349d409262a
8202605: Standardize on ClassLoaderData::loader_name() throughout the VM to obtain a class loader's name
lfoltan
parents:
50532
diff
changeset
|
4058 |
assert(is_instance(loader), "loader must be oop"); |
c349d409262a
8202605: Standardize on ClassLoaderData::loader_name() throughout the VM to obtain a class loader's name
lfoltan
parents:
50532
diff
changeset
|
4059 |
return loader->obj_field(nameAndId_offset); |
c349d409262a
8202605: Standardize on ClassLoaderData::loader_name() throughout the VM to obtain a class loader's name
lfoltan
parents:
50532
diff
changeset
|
4060 |
} |
c349d409262a
8202605: Standardize on ClassLoaderData::loader_name() throughout the VM to obtain a class loader's name
lfoltan
parents:
50532
diff
changeset
|
4061 |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
4062 |
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
|
4063 |
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
|
4064 |
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
|
4065 |
oop acl = loader; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
4066 |
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
|
4067 |
// 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
|
4068 |
do { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
4069 |
acl = parent(acl); |
49658 | 4070 |
if (oopDesc::equals(cl, acl)) { |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
4071 |
return true; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
4072 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
4073 |
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
|
4074 |
} while (acl != NULL); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
4075 |
return false; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
4076 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
4077 |
|
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
27694
diff
changeset
|
4078 |
bool java_lang_ClassLoader::is_instance(oop obj) { |
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
27694
diff
changeset
|
4079 |
return obj != NULL && is_subclass(obj->klass()); |
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
27694
diff
changeset
|
4080 |
} |
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
27694
diff
changeset
|
4081 |
|
1 | 4082 |
|
10546 | 4083 |
// For class loader classes, parallelCapable defined |
4084 |
// based on non-null field |
|
4085 |
// Written to by java.lang.ClassLoader, vm only reads this field, doesn't set it |
|
4086 |
bool java_lang_ClassLoader::parallelCapable(oop class_loader) { |
|
25057 | 4087 |
if (parallelCapable_offset == -1) { |
10546 | 4088 |
// Default for backward compatibility is false |
4089 |
return false; |
|
4090 |
} |
|
4091 |
return (class_loader->obj_field(parallelCapable_offset) != NULL); |
|
4092 |
} |
|
4093 |
||
1 | 4094 |
bool java_lang_ClassLoader::is_trusted_loader(oop loader) { |
4095 |
// Fix for 4474172; see evaluation for more details |
|
4096 |
loader = non_reflection_class_loader(loader); |
|
4097 |
||
4098 |
oop cl = SystemDictionary::java_system_loader(); |
|
4099 |
while(cl != NULL) { |
|
49658 | 4100 |
if (oopDesc::equals(cl, loader)) return true; |
1 | 4101 |
cl = parent(cl); |
4102 |
} |
|
4103 |
return false; |
|
4104 |
} |
|
4105 |
||
42574
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41877
diff
changeset
|
4106 |
// Return true if this is one of the class loaders associated with |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41877
diff
changeset
|
4107 |
// the generated bytecodes for reflection. |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41877
diff
changeset
|
4108 |
bool java_lang_ClassLoader::is_reflection_class_loader(oop loader) { |
1 | 4109 |
if (loader != NULL) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
4110 |
Klass* delegating_cl_class = SystemDictionary::reflect_DelegatingClassLoader_klass(); |
1 | 4111 |
// This might be null in non-1.4 JDKs |
42574
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41877
diff
changeset
|
4112 |
return (delegating_cl_class != NULL && loader->is_a(delegating_cl_class)); |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41877
diff
changeset
|
4113 |
} |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41877
diff
changeset
|
4114 |
return false; |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41877
diff
changeset
|
4115 |
} |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41877
diff
changeset
|
4116 |
|
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41877
diff
changeset
|
4117 |
oop java_lang_ClassLoader::non_reflection_class_loader(oop loader) { |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41877
diff
changeset
|
4118 |
// See whether this is one of the class loaders associated with |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41877
diff
changeset
|
4119 |
// the generated bytecodes for reflection, and if so, "magically" |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41877
diff
changeset
|
4120 |
// delegate to its parent to prevent class loading from occurring |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41877
diff
changeset
|
4121 |
// in places where applications using reflection didn't expect it. |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41877
diff
changeset
|
4122 |
if (is_reflection_class_loader(loader)) { |
25ff9171b28b
8166304: Skipping access check for classes generated by core reflection
hseigel
parents:
41877
diff
changeset
|
4123 |
return parent(loader); |
1 | 4124 |
} |
4125 |
return loader; |
|
4126 |
} |
|
4127 |
||
36508 | 4128 |
oop java_lang_ClassLoader::unnamedModule(oop loader) { |
4129 |
assert(is_instance(loader), "loader must be oop"); |
|
4130 |
return loader->obj_field(unnamedModule_offset); |
|
4131 |
} |
|
1 | 4132 |
|
4133 |
// Support for java_lang_System |
|
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4134 |
// |
49329 | 4135 |
#define SYSTEM_FIELDS_DO(macro) \ |
4136 |
macro(static_in_offset, k, "in", input_stream_signature, true); \ |
|
4137 |
macro(static_out_offset, k, "out", print_stream_signature, true); \ |
|
4138 |
macro(static_err_offset, k, "err", print_stream_signature, true); \ |
|
4139 |
macro(static_security_offset, k, "security", security_manager_signature, true) |
|
4140 |
||
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4141 |
void java_lang_System::compute_offsets() { |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4142 |
InstanceKlass* k = SystemDictionary::System_klass(); |
49329 | 4143 |
SYSTEM_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
4144 |
} |
|
4145 |
||
4146 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
4147 |
void java_lang_System::serialize_offsets(SerializeClosure* f) { |
49329 | 4148 |
SYSTEM_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
4149 |
} |
|
4150 |
#endif |
|
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4151 |
|
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4152 |
int java_lang_System::in_offset_in_bytes() { return static_in_offset; } |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4153 |
int java_lang_System::out_offset_in_bytes() { return static_out_offset; } |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4154 |
int java_lang_System::err_offset_in_bytes() { return static_err_offset; } |
1 | 4155 |
|
4156 |
||
18056 | 4157 |
bool java_lang_System::has_security_manager() { |
33602 | 4158 |
InstanceKlass* ik = SystemDictionary::System_klass(); |
49473
26958d06b585
8199739: Use HeapAccess when loading oops from static fields in javaClasses.cpp
rkennke
parents:
49449
diff
changeset
|
4159 |
oop base = ik->static_field_base_raw(); |
49592
77fb0be7d19f
8199946: Move load/store and encode/decode out of oopDesc
stefank
parents:
49480
diff
changeset
|
4160 |
return base->obj_field(static_security_offset) != NULL; |
18056 | 4161 |
} |
1 | 4162 |
|
10546 | 4163 |
int java_lang_Class::_klass_offset; |
4164 |
int java_lang_Class::_array_klass_offset; |
|
4165 |
int java_lang_Class::_oop_size_offset; |
|
4166 |
int java_lang_Class::_static_oop_field_count_offset; |
|
25326
85b2f2e63e3e
6642881: Improve performance of Class.getClassLoader()
coleenp
parents:
25057
diff
changeset
|
4167 |
int java_lang_Class::_class_loader_offset; |
36508 | 4168 |
int java_lang_Class::_module_offset; |
17826
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
4169 |
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
|
4170 |
int java_lang_Class::_component_mirror_offset; |
17826
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
4171 |
int java_lang_Class::_init_lock_offset; |
9ad5cd464a75
8003421: NPG: Move oops out of InstanceKlass into mirror
coleenp
parents:
17081
diff
changeset
|
4172 |
int java_lang_Class::_signers_offset; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13392
diff
changeset
|
4173 |
GrowableArray<Klass*>* java_lang_Class::_fixup_mirror_list = NULL; |
36508 | 4174 |
GrowableArray<Klass*>* java_lang_Class::_fixup_module_field_list = NULL; |
1 | 4175 |
int java_lang_Throwable::backtrace_offset; |
4176 |
int java_lang_Throwable::detailMessage_offset; |
|
4177 |
int java_lang_Throwable::stackTrace_offset; |
|
37064
5c82fa70d313
8150778: Reduce Throwable.getStackTrace() calls to the JVM
coleenp
parents:
35918
diff
changeset
|
4178 |
int java_lang_Throwable::depth_offset; |
10233
b40fd2bd2fac
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
10018
diff
changeset
|
4179 |
int java_lang_Throwable::static_unassigned_stacktrace_offset; |
1 | 4180 |
int java_lang_reflect_AccessibleObject::override_offset; |
4181 |
int java_lang_reflect_Method::clazz_offset; |
|
4182 |
int java_lang_reflect_Method::name_offset; |
|
4183 |
int java_lang_reflect_Method::returnType_offset; |
|
4184 |
int java_lang_reflect_Method::parameterTypes_offset; |
|
4185 |
int java_lang_reflect_Method::exceptionTypes_offset; |
|
4186 |
int java_lang_reflect_Method::slot_offset; |
|
4187 |
int java_lang_reflect_Method::modifiers_offset; |
|
4188 |
int java_lang_reflect_Method::signature_offset; |
|
4189 |
int java_lang_reflect_Method::annotations_offset; |
|
4190 |
int java_lang_reflect_Method::parameter_annotations_offset; |
|
4191 |
int java_lang_reflect_Method::annotation_default_offset; |
|
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
4192 |
int java_lang_reflect_Method::type_annotations_offset; |
1 | 4193 |
int java_lang_reflect_Constructor::clazz_offset; |
4194 |
int java_lang_reflect_Constructor::parameterTypes_offset; |
|
4195 |
int java_lang_reflect_Constructor::exceptionTypes_offset; |
|
4196 |
int java_lang_reflect_Constructor::slot_offset; |
|
4197 |
int java_lang_reflect_Constructor::modifiers_offset; |
|
4198 |
int java_lang_reflect_Constructor::signature_offset; |
|
4199 |
int java_lang_reflect_Constructor::annotations_offset; |
|
4200 |
int java_lang_reflect_Constructor::parameter_annotations_offset; |
|
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
4201 |
int java_lang_reflect_Constructor::type_annotations_offset; |
1 | 4202 |
int java_lang_reflect_Field::clazz_offset; |
4203 |
int java_lang_reflect_Field::name_offset; |
|
4204 |
int java_lang_reflect_Field::type_offset; |
|
4205 |
int java_lang_reflect_Field::slot_offset; |
|
4206 |
int java_lang_reflect_Field::modifiers_offset; |
|
4207 |
int java_lang_reflect_Field::signature_offset; |
|
4208 |
int java_lang_reflect_Field::annotations_offset; |
|
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14588
diff
changeset
|
4209 |
int java_lang_reflect_Field::type_annotations_offset; |
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
4210 |
int java_lang_reflect_Parameter::name_offset; |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
4211 |
int java_lang_reflect_Parameter::modifiers_offset; |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
4212 |
int java_lang_reflect_Parameter::index_offset; |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15098
diff
changeset
|
4213 |
int java_lang_reflect_Parameter::executable_offset; |
1 | 4214 |
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
|
4215 |
int java_lang_boxing_object::long_value_offset; |
1 | 4216 |
int java_lang_ref_Reference::referent_offset; |
4217 |
int java_lang_ref_Reference::queue_offset; |
|
4218 |
int java_lang_ref_Reference::next_offset; |
|
4219 |
int java_lang_ref_Reference::discovered_offset; |
|
4220 |
int java_lang_ref_SoftReference::timestamp_offset; |
|
4221 |
int java_lang_ref_SoftReference::static_clock_offset; |
|
4222 |
int java_lang_ClassLoader::parent_offset; |
|
4223 |
int java_lang_System::static_in_offset; |
|
4224 |
int java_lang_System::static_out_offset; |
|
4225 |
int java_lang_System::static_err_offset; |
|
18056 | 4226 |
int java_lang_System::static_security_offset; |
1 | 4227 |
int java_lang_StackTraceElement::methodName_offset; |
4228 |
int java_lang_StackTraceElement::fileName_offset; |
|
4229 |
int java_lang_StackTraceElement::lineNumber_offset; |
|
36508 | 4230 |
int java_lang_StackTraceElement::moduleName_offset; |
4231 |
int java_lang_StackTraceElement::moduleVersion_offset; |
|
41877 | 4232 |
int java_lang_StackTraceElement::classLoaderName_offset; |
4233 |
int java_lang_StackTraceElement::declaringClass_offset; |
|
42541
308a256d545e
8169389: Use a bitmap to control StackTraceElement::toString format and save footprint
bchristi
parents:
41877
diff
changeset
|
4234 |
int java_lang_StackTraceElement::declaringClassObject_offset; |
34280 | 4235 |
int java_lang_StackFrameInfo::_memberName_offset; |
4236 |
int java_lang_StackFrameInfo::_bci_offset; |
|
4237 |
int java_lang_StackFrameInfo::_version_offset; |
|
4238 |
int java_lang_LiveStackFrameInfo::_monitors_offset; |
|
4239 |
int java_lang_LiveStackFrameInfo::_locals_offset; |
|
4240 |
int java_lang_LiveStackFrameInfo::_operands_offset; |
|
43677
5228814c1da2
8156073: 2-slot LiveStackFrame locals (long and double) are incorrect
bchristi
parents:
43422
diff
changeset
|
4241 |
int java_lang_LiveStackFrameInfo::_mode_offset; |
1 | 4242 |
int java_lang_AssertionStatusDirectives::classes_offset; |
4243 |
int java_lang_AssertionStatusDirectives::classEnabled_offset; |
|
4244 |
int java_lang_AssertionStatusDirectives::packages_offset; |
|
4245 |
int java_lang_AssertionStatusDirectives::packageEnabled_offset; |
|
4246 |
int java_lang_AssertionStatusDirectives::deflt_offset; |
|
4247 |
int java_nio_Buffer::_limit_offset; |
|
50419
146c60525d4a
8199882: compiler/uncommontrap/TestDeoptOOM.java failed w/ fatal error: ExceptionMark constructor expects no pending exceptions
dholmes
parents:
50389
diff
changeset
|
4248 |
int java_util_concurrent_locks_AbstractOwnableSynchronizer::_owner_offset; |
37301
a936b4e01afb
8137058: Clear out all non-Critical APIs from sun.reflect
chegar
parents:
37179
diff
changeset
|
4249 |
int reflect_ConstantPool::_oop_offset; |
a936b4e01afb
8137058: Clear out all non-Critical APIs from sun.reflect
chegar
parents:
37179
diff
changeset
|
4250 |
int reflect_UnsafeStaticFieldAccessorImpl::_base_offset; |
51429
d9f6e3ee7fcb
8209545: Simplify HeapShared::archive_module_graph_objects
iklam
parents:
51425
diff
changeset
|
4251 |
|
1 | 4252 |
|
49329 | 4253 |
#define STACKTRACEELEMENT_FIELDS_DO(macro) \ |
4254 |
macro(declaringClassObject_offset, k, "declaringClassObject", class_signature, false); \ |
|
4255 |
macro(classLoaderName_offset, k, "classLoaderName", string_signature, false); \ |
|
4256 |
macro(moduleName_offset, k, "moduleName", string_signature, false); \ |
|
4257 |
macro(moduleVersion_offset, k, "moduleVersion", string_signature, false); \ |
|
4258 |
macro(declaringClass_offset, k, "declaringClass", string_signature, false); \ |
|
4259 |
macro(methodName_offset, k, "methodName", string_signature, false); \ |
|
4260 |
macro(fileName_offset, k, "fileName", string_signature, false); \ |
|
4261 |
macro(lineNumber_offset, k, "lineNumber", int_signature, false) |
|
1 | 4262 |
|
4263 |
// Support for java_lang_StackTraceElement |
|
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4264 |
void java_lang_StackTraceElement::compute_offsets() { |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4265 |
InstanceKlass* k = SystemDictionary::StackTraceElement_klass(); |
49329 | 4266 |
STACKTRACEELEMENT_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
4267 |
} |
|
4268 |
||
4269 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
4270 |
void java_lang_StackTraceElement::serialize_offsets(SerializeClosure* f) { |
49329 | 4271 |
STACKTRACEELEMENT_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
4272 |
} |
|
4273 |
#endif |
|
1 | 4274 |
|
4275 |
void java_lang_StackTraceElement::set_fileName(oop element, oop value) { |
|
4276 |
element->obj_field_put(fileName_offset, value); |
|
4277 |
} |
|
4278 |
||
4279 |
void java_lang_StackTraceElement::set_declaringClass(oop element, oop value) { |
|
4280 |
element->obj_field_put(declaringClass_offset, value); |
|
4281 |
} |
|
4282 |
||
4283 |
void java_lang_StackTraceElement::set_methodName(oop element, oop value) { |
|
4284 |
element->obj_field_put(methodName_offset, value); |
|
4285 |
} |
|
4286 |
||
4287 |
void java_lang_StackTraceElement::set_lineNumber(oop element, int value) { |
|
4288 |
element->int_field_put(lineNumber_offset, value); |
|
4289 |
} |
|
4290 |
||
36508 | 4291 |
void java_lang_StackTraceElement::set_moduleName(oop element, oop value) { |
4292 |
element->obj_field_put(moduleName_offset, value); |
|
4293 |
} |
|
4294 |
||
4295 |
void java_lang_StackTraceElement::set_moduleVersion(oop element, oop value) { |
|
4296 |
element->obj_field_put(moduleVersion_offset, value); |
|
4297 |
} |
|
4298 |
||
41877 | 4299 |
void java_lang_StackTraceElement::set_classLoaderName(oop element, oop value) { |
4300 |
element->obj_field_put(classLoaderName_offset, value); |
|
4301 |
} |
|
4302 |
||
4303 |
void java_lang_StackTraceElement::set_declaringClassObject(oop element, oop value) { |
|
42541
308a256d545e
8169389: Use a bitmap to control StackTraceElement::toString format and save footprint
bchristi
parents:
41877
diff
changeset
|
4304 |
element->obj_field_put(declaringClassObject_offset, value); |
41877 | 4305 |
} |
4306 |
||
34280 | 4307 |
void java_lang_StackFrameInfo::set_version(oop element, short value) { |
4308 |
element->short_field_put(_version_offset, value); |
|
4309 |
} |
|
4310 |
||
4311 |
void java_lang_StackFrameInfo::set_bci(oop element, int value) { |
|
4312 |
element->int_field_put(_bci_offset, value); |
|
4313 |
} |
|
4314 |
||
4315 |
void java_lang_LiveStackFrameInfo::set_monitors(oop element, oop value) { |
|
4316 |
element->obj_field_put(_monitors_offset, value); |
|
4317 |
} |
|
4318 |
||
4319 |
void java_lang_LiveStackFrameInfo::set_locals(oop element, oop value) { |
|
4320 |
element->obj_field_put(_locals_offset, value); |
|
4321 |
} |
|
4322 |
||
4323 |
void java_lang_LiveStackFrameInfo::set_operands(oop element, oop value) { |
|
4324 |
element->obj_field_put(_operands_offset, value); |
|
4325 |
} |
|
1 | 4326 |
|
43677
5228814c1da2
8156073: 2-slot LiveStackFrame locals (long and double) are incorrect
bchristi
parents:
43422
diff
changeset
|
4327 |
void java_lang_LiveStackFrameInfo::set_mode(oop element, int value) { |
5228814c1da2
8156073: 2-slot LiveStackFrame locals (long and double) are incorrect
bchristi
parents:
43422
diff
changeset
|
4328 |
element->int_field_put(_mode_offset, value); |
5228814c1da2
8156073: 2-slot LiveStackFrame locals (long and double) are incorrect
bchristi
parents:
43422
diff
changeset
|
4329 |
} |
5228814c1da2
8156073: 2-slot LiveStackFrame locals (long and double) are incorrect
bchristi
parents:
43422
diff
changeset
|
4330 |
|
1 | 4331 |
// Support for java Assertions - java_lang_AssertionStatusDirectives. |
49329 | 4332 |
#define ASSERTIONSTATUSDIRECTIVES_FIELDS_DO(macro) \ |
4333 |
macro(classes_offset, k, "classes", string_array_signature, false); \ |
|
4334 |
macro(classEnabled_offset, k, "classEnabled", bool_array_signature, false); \ |
|
4335 |
macro(packages_offset, k, "packages", string_array_signature, false); \ |
|
4336 |
macro(packageEnabled_offset, k, "packageEnabled", bool_array_signature, false); \ |
|
4337 |
macro(deflt_offset, k, "deflt", bool_signature, false) |
|
1 | 4338 |
|
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4339 |
void java_lang_AssertionStatusDirectives::compute_offsets() { |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4340 |
InstanceKlass* k = SystemDictionary::AssertionStatusDirectives_klass(); |
49329 | 4341 |
ASSERTIONSTATUSDIRECTIVES_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
4342 |
} |
|
4343 |
||
4344 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
4345 |
void java_lang_AssertionStatusDirectives::serialize_offsets(SerializeClosure* f) { |
49329 | 4346 |
ASSERTIONSTATUSDIRECTIVES_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
4347 |
} |
|
4348 |
#endif |
|
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4349 |
|
1 | 4350 |
void java_lang_AssertionStatusDirectives::set_classes(oop o, oop val) { |
4351 |
o->obj_field_put(classes_offset, val); |
|
4352 |
} |
|
4353 |
||
4354 |
void java_lang_AssertionStatusDirectives::set_classEnabled(oop o, oop val) { |
|
4355 |
o->obj_field_put(classEnabled_offset, val); |
|
4356 |
} |
|
4357 |
||
4358 |
void java_lang_AssertionStatusDirectives::set_packages(oop o, oop val) { |
|
4359 |
o->obj_field_put(packages_offset, val); |
|
4360 |
} |
|
4361 |
||
4362 |
void java_lang_AssertionStatusDirectives::set_packageEnabled(oop o, oop val) { |
|
4363 |
o->obj_field_put(packageEnabled_offset, val); |
|
4364 |
} |
|
4365 |
||
4366 |
void java_lang_AssertionStatusDirectives::set_deflt(oop o, bool val) { |
|
4367 |
o->bool_field_put(deflt_offset, val); |
|
4368 |
} |
|
4369 |
||
4370 |
||
4371 |
// Support for intrinsification of java.nio.Buffer.checkIndex |
|
4372 |
int java_nio_Buffer::limit_offset() { |
|
4373 |
return _limit_offset; |
|
4374 |
} |
|
4375 |
||
49329 | 4376 |
#define BUFFER_FIELDS_DO(macro) \ |
4377 |
macro(_limit_offset, k, "limit", int_signature, false) |
|
1 | 4378 |
|
4379 |
void java_nio_Buffer::compute_offsets() { |
|
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4380 |
InstanceKlass* k = SystemDictionary::nio_Buffer_klass(); |
379
10767ca40189
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
360
diff
changeset
|
4381 |
assert(k != NULL, "must be loaded in 1.4+"); |
49329 | 4382 |
BUFFER_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
4383 |
} |
|
4384 |
||
4385 |
#if INCLUDE_CDS |
|
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
4386 |
void java_nio_Buffer::serialize_offsets(SerializeClosure* f) { |
49329 | 4387 |
BUFFER_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
4388 |
} |
|
4389 |
#endif |
|
1 | 4390 |
|
50419
146c60525d4a
8199882: compiler/uncommontrap/TestDeoptOOM.java failed w/ fatal error: ExceptionMark constructor expects no pending exceptions
dholmes
parents:
50389
diff
changeset
|
4391 |
#define AOS_FIELDS_DO(macro) \ |
146c60525d4a
8199882: compiler/uncommontrap/TestDeoptOOM.java failed w/ fatal error: ExceptionMark constructor expects no pending exceptions
dholmes
parents:
50389
diff
changeset
|
4392 |
macro(_owner_offset, k, "exclusiveOwnerThread", thread_signature, false) |
146c60525d4a
8199882: compiler/uncommontrap/TestDeoptOOM.java failed w/ fatal error: ExceptionMark constructor expects no pending exceptions
dholmes
parents:
50389
diff
changeset
|
4393 |
|
146c60525d4a
8199882: compiler/uncommontrap/TestDeoptOOM.java failed w/ fatal error: ExceptionMark constructor expects no pending exceptions
dholmes
parents:
50389
diff
changeset
|
4394 |
void java_util_concurrent_locks_AbstractOwnableSynchronizer::compute_offsets() { |
146c60525d4a
8199882: compiler/uncommontrap/TestDeoptOOM.java failed w/ fatal error: ExceptionMark constructor expects no pending exceptions
dholmes
parents:
50389
diff
changeset
|
4395 |
InstanceKlass* k = SystemDictionary::java_util_concurrent_locks_AbstractOwnableSynchronizer_klass(); |
146c60525d4a
8199882: compiler/uncommontrap/TestDeoptOOM.java failed w/ fatal error: ExceptionMark constructor expects no pending exceptions
dholmes
parents:
50389
diff
changeset
|
4396 |
AOS_FIELDS_DO(FIELD_COMPUTE_OFFSET); |
1 | 4397 |
} |
4398 |
||
4399 |
oop java_util_concurrent_locks_AbstractOwnableSynchronizer::get_owner_threadObj(oop obj) { |
|
4400 |
assert(_owner_offset != 0, "Must be initialized"); |
|
4401 |
return obj->obj_field(_owner_offset); |
|
4402 |
} |
|
4403 |
||
50819
cf09f0b56efd
8205699: assert(_owner_offset != 0) failed in javaClasses.cpp
jiangli
parents:
50634
diff
changeset
|
4404 |
#if INCLUDE_CDS |
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
4405 |
void java_util_concurrent_locks_AbstractOwnableSynchronizer::serialize_offsets(SerializeClosure* f) { |
50819
cf09f0b56efd
8205699: assert(_owner_offset != 0) failed in javaClasses.cpp
jiangli
parents:
50634
diff
changeset
|
4406 |
AOS_FIELDS_DO(FIELD_SERIALIZE_OFFSET); |
cf09f0b56efd
8205699: assert(_owner_offset != 0) failed in javaClasses.cpp
jiangli
parents:
50634
diff
changeset
|
4407 |
} |
cf09f0b56efd
8205699: assert(_owner_offset != 0) failed in javaClasses.cpp
jiangli
parents:
50634
diff
changeset
|
4408 |
#endif |
cf09f0b56efd
8205699: assert(_owner_offset != 0) failed in javaClasses.cpp
jiangli
parents:
50634
diff
changeset
|
4409 |
|
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4410 |
static int member_offset(int hardcoded_offset) { |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4411 |
return (hardcoded_offset * heapOopSize) + instanceOopDesc::base_offset_in_bytes(); |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4412 |
} |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4413 |
|
1 | 4414 |
// Compute hard-coded offsets |
4415 |
// Invoked before SystemDictionary::initialize, so pre-loaded classes |
|
4416 |
// are not available to determine the offset_of_static_fields. |
|
4417 |
void JavaClasses::compute_hard_coded_offsets() { |
|
4418 |
||
4419 |
// java_lang_boxing_object |
|
48619
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4420 |
java_lang_boxing_object::value_offset = member_offset(java_lang_boxing_object::hc_value_offset); |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4421 |
java_lang_boxing_object::long_value_offset = align_up(member_offset(java_lang_boxing_object::hc_value_offset), BytesPerLong); |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4422 |
|
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4423 |
// java_lang_ref_Reference |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4424 |
java_lang_ref_Reference::referent_offset = member_offset(java_lang_ref_Reference::hc_referent_offset); |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4425 |
java_lang_ref_Reference::queue_offset = member_offset(java_lang_ref_Reference::hc_queue_offset); |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4426 |
java_lang_ref_Reference::next_offset = member_offset(java_lang_ref_Reference::hc_next_offset); |
1703d83b3ffe
8058259: compute_offset() is confusing for static fields
coleenp
parents:
47998
diff
changeset
|
4427 |
java_lang_ref_Reference::discovered_offset = member_offset(java_lang_ref_Reference::hc_discovered_offset); |
1 | 4428 |
} |
4429 |
||
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
4430 |
#define DO_COMPUTE_OFFSETS(k) k::compute_offsets(); |
1 | 4431 |
|
4432 |
// Compute non-hard-coded field offsets of all the classes in this file |
|
4433 |
void JavaClasses::compute_offsets() { |
|
49329 | 4434 |
if (UseSharedSpaces) { |
4435 |
return; // field offsets are loaded from archive |
|
4436 |
} |
|
4437 |
||
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
4438 |
// We have already called the compute_offsets() of the |
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
4439 |
// BASIC_JAVA_CLASSES_DO_PART1 classes (java_lang_String and java_lang_Class) |
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
4440 |
// earlier inside SystemDictionary::resolve_preloaded_classes() |
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
4441 |
BASIC_JAVA_CLASSES_DO_PART2(DO_COMPUTE_OFFSETS); |
50951
b96466cdfc45
8202035: Archive the set of ModuleDescriptor and ModuleReference objects for observable system modules with unnamed initial module.
jiangli
parents:
50882
diff
changeset
|
4442 |
|
2534 | 4443 |
// generated interpreter code wants to know about the offsets we just computed: |
4444 |
AbstractAssembler::update_delayed_values(); |
|
1 | 4445 |
} |
4446 |
||
51417
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
4447 |
#if INCLUDE_CDS |
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
4448 |
#define DO_SERIALIZE_OFFSETS(k) k::serialize_offsets(soc); |
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
4449 |
|
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
4450 |
void JavaClasses::serialize_offsets(SerializeClosure* soc) { |
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
4451 |
BASIC_JAVA_CLASSES_DO(DO_SERIALIZE_OFFSETS); |
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
4452 |
} |
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
4453 |
#endif |
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
4454 |
|
b08c2a94cce1
8206115: Use shared macros for JavaClasses::compute_offsets and MetaspaceShared::serialize_well_known_classes
iklam
parents:
51388
diff
changeset
|
4455 |
|
1 | 4456 |
#ifndef PRODUCT |
4457 |
||
4458 |
// These functions exist to assert the validity of hard-coded field offsets to guard |
|
4459 |
// against changes in the class files |
|
4460 |
||
4461 |
bool JavaClasses::check_offset(const char *klass_name, int hardcoded_offset, const char *field_name, const char* field_sig) { |
|
4462 |
EXCEPTION_MARK; |
|
4463 |
fieldDescriptor fd; |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
4464 |
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
|
4465 |
Klass* k = SystemDictionary::resolve_or_fail(klass_sym, true, CATCH); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
4466 |
InstanceKlass* ik = InstanceKlass::cast(k); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7414
diff
changeset
|
4467 |
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
|
4468 |
TempNewSymbol f_sig = SymbolTable::new_symbol(field_sig, CATCH); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
4469 |
if (!ik->find_local_field(f_name, f_sig, &fd)) { |
1 | 4470 |
tty->print_cr("Nonstatic field %s.%s not found", klass_name, field_name); |
4471 |
return false; |
|
4472 |
} |
|
4473 |
if (fd.is_static()) { |
|
4474 |
tty->print_cr("Nonstatic field %s.%s appears to be static", klass_name, field_name); |
|
4475 |
return false; |
|
4476 |
} |
|
4477 |
if (fd.offset() == hardcoded_offset ) { |
|
4478 |
return true; |
|
4479 |
} else { |
|
4480 |
tty->print_cr("Offset of nonstatic field %s.%s is hardcoded as %d but should really be %d.", |
|
4481 |
klass_name, field_name, hardcoded_offset, fd.offset()); |
|
4482 |
return false; |
|
4483 |
} |
|
4484 |
} |
|
4485 |
||
4486 |
// Check the hard-coded field offsets of all the classes in this file |
|
4487 |
||
4488 |
void JavaClasses::check_offsets() { |
|
4489 |
bool valid = true; |
|
4490 |
||
4491 |
#define CHECK_OFFSET(klass_name, cpp_klass_name, field_name, field_sig) \ |
|
4492 |
valid &= check_offset(klass_name, cpp_klass_name :: field_name ## _offset, #field_name, field_sig) |
|
4493 |
||
591
04d2e26e6d69
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
379
diff
changeset
|
4494 |
#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
|
4495 |
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
|
4496 |
|
1 | 4497 |
// Boxed primitive objects (java_lang_boxing_object) |
4498 |
||
4499 |
CHECK_OFFSET("java/lang/Boolean", java_lang_boxing_object, value, "Z"); |
|
4500 |
CHECK_OFFSET("java/lang/Character", java_lang_boxing_object, value, "C"); |
|
4501 |
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
|
4502 |
CHECK_LONG_OFFSET("java/lang/Double", java_lang_boxing_object, value, "D"); |
1 | 4503 |
CHECK_OFFSET("java/lang/Byte", java_lang_boxing_object, value, "B"); |
4504 |
CHECK_OFFSET("java/lang/Short", java_lang_boxing_object, value, "S"); |
|
4505 |
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
|
4506 |
CHECK_LONG_OFFSET("java/lang/Long", java_lang_boxing_object, value, "J"); |
1 | 4507 |
|
4508 |
// java.lang.ref.Reference |
|
4509 |
||
4510 |
CHECK_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, referent, "Ljava/lang/Object;"); |
|
4511 |
CHECK_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, queue, "Ljava/lang/ref/ReferenceQueue;"); |
|
4512 |
CHECK_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, next, "Ljava/lang/ref/Reference;"); |
|
4513 |
// Fake field |
|
4514 |
//CHECK_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, discovered, "Ljava/lang/ref/Reference;"); |
|
4515 |
||
4516 |
if (!valid) vm_exit_during_initialization("Hard-coded field offset verification failed"); |
|
4517 |
} |
|
4518 |
||
4519 |
#endif // PRODUCT |
|
4520 |
||
10546 | 4521 |
int InjectedField::compute_offset() { |
33602 | 4522 |
InstanceKlass* ik = InstanceKlass::cast(klass()); |
4523 |
for (AllFieldStream fs(ik); !fs.done(); fs.next()) { |
|
10546 | 4524 |
if (!may_be_java && !fs.access_flags().is_internal()) { |
4525 |
// Only look at injected fields |
|
4526 |
continue; |
|
4527 |
} |
|
4528 |
if (fs.name() == name() && fs.signature() == signature()) { |
|
4529 |
return fs.offset(); |
|
4530 |
} |
|
4531 |
} |
|
4532 |
ResourceMark rm; |
|
33602 | 4533 |
tty->print_cr("Invalid layout of %s at %s/%s%s", ik->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
|
4534 |
#ifndef PRODUCT |
33602 | 4535 |
ik->print(); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
4536 |
tty->print_cr("all fields:"); |
33602 | 4537 |
for (AllFieldStream fs(ik); !fs.done(); fs.next()) { |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
4538 |
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
|
4539 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
4540 |
#endif //PRODUCT |
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38144
diff
changeset
|
4541 |
vm_exit_during_initialization("Invalid layout of preloaded class: use -Xlog:class+load=info to see the origin of the problem class"); |
10546 | 4542 |
return -1; |
4543 |
} |
|
4544 |
||
1 | 4545 |
void javaClasses_init() { |
4546 |
JavaClasses::compute_offsets(); |
|
4547 |
JavaClasses::check_offsets(); |
|
4548 |
FilteredFieldsMap::initialize(); // must be done after computing offsets. |
|
4549 |
} |