author | coleenp |
Wed, 15 Mar 2017 10:25:37 -0400 | |
changeset 46329 | 53ccc37bda19 |
parent 46289 | 1904e7ec236e |
child 46388 | d7a164ad6b7f |
permissions | -rw-r--r-- |
1 | 1 |
/* |
46262
83280d968b96
8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents:
40923
diff
changeset
|
2 |
* Copyright (c) 1997, 2017, 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:
4581
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
4581
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:
4581
diff
changeset
|
21 |
* questions. |
1 | 22 |
* |
23 |
*/ |
|
24 |
||
7397 | 25 |
#include "precompiled.hpp" |
26 |
#include "classfile/javaClasses.hpp" |
|
36508 | 27 |
#include "classfile/moduleEntry.hpp" |
28 |
#include "classfile/packageEntry.hpp" |
|
24426
0a69c8cdfca9
8038654: Separate SymbolTable and StringTable code
gziemski
parents:
22897
diff
changeset
|
29 |
#include "classfile/stringTable.hpp" |
7397 | 30 |
#include "classfile/systemDictionary.hpp" |
31 |
#include "classfile/verifier.hpp" |
|
32 |
#include "classfile/vmSymbols.hpp" |
|
33 |
#include "interpreter/linkResolver.hpp" |
|
34 |
#include "memory/oopFactory.hpp" |
|
35 |
#include "memory/resourceArea.hpp" |
|
36 |
#include "memory/universe.inline.hpp" |
|
37 |
#include "oops/instanceKlass.hpp" |
|
38 |
#include "oops/objArrayKlass.hpp" |
|
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
27685
diff
changeset
|
39 |
#include "oops/objArrayOop.inline.hpp" |
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
27685
diff
changeset
|
40 |
#include "oops/oop.inline.hpp" |
7397 | 41 |
#include "prims/jvm.h" |
22897
77e1024a4a14
4505697: nsk/jdi/ExceptionEvent/_itself_/exevent006 and exevent008 tests fail with InvocationTargetException
jbachorik
parents:
22551
diff
changeset
|
42 |
#include "prims/jvmtiExport.hpp" |
7397 | 43 |
#include "runtime/arguments.hpp" |
44 |
#include "runtime/handles.inline.hpp" |
|
45 |
#include "runtime/javaCalls.hpp" |
|
46 |
#include "runtime/reflection.hpp" |
|
47 |
#include "runtime/reflectionUtils.hpp" |
|
48 |
#include "runtime/signature.hpp" |
|
49 |
#include "runtime/vframe.hpp" |
|
1 | 50 |
|
34666 | 51 |
static void trace_class_resolution(const Klass* to_class) { |
1 | 52 |
ResourceMark rm; |
53 |
int line_number = -1; |
|
54 |
const char * source_file = NULL; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
55 |
Klass* caller = NULL; |
1 | 56 |
JavaThread* jthread = JavaThread::current(); |
57 |
if (jthread->has_last_Java_frame()) { |
|
58 |
vframeStream vfst(jthread); |
|
59 |
// skip over any frames belonging to java.lang.Class |
|
60 |
while (!vfst.at_end() && |
|
14391
df0a1573d5bd
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
14385
diff
changeset
|
61 |
vfst.method()->method_holder()->name() == vmSymbols::java_lang_Class()) { |
1 | 62 |
vfst.next(); |
63 |
} |
|
64 |
if (!vfst.at_end()) { |
|
65 |
// this frame is a likely suspect |
|
66 |
caller = vfst.method()->method_holder(); |
|
67 |
line_number = vfst.method()->line_number_from_bci(vfst.bci()); |
|
14391
df0a1573d5bd
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
14385
diff
changeset
|
68 |
Symbol* s = vfst.method()->method_holder()->source_file_name(); |
1 | 69 |
if (s != NULL) { |
70 |
source_file = s->as_C_string(); |
|
71 |
} |
|
72 |
} |
|
73 |
} |
|
74 |
if (caller != NULL) { |
|
14488 | 75 |
const char * from = caller->external_name(); |
76 |
const char * to = to_class->external_name(); |
|
1 | 77 |
// print in a single call to reduce interleaving between threads |
78 |
if (source_file != NULL) { |
|
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38094
diff
changeset
|
79 |
log_debug(class, resolve)("%s %s %s:%d (reflection)", from, to, source_file, line_number); |
1 | 80 |
} else { |
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38094
diff
changeset
|
81 |
log_debug(class, resolve)("%s %s (reflection)", from, to); |
1 | 82 |
} |
83 |
} |
|
84 |
} |
|
85 |
||
86 |
||
87 |
oop Reflection::box(jvalue* value, BasicType type, TRAPS) { |
|
88 |
if (type == T_VOID) { |
|
89 |
return NULL; |
|
90 |
} |
|
91 |
if (type == T_OBJECT || type == T_ARRAY) { |
|
92 |
// regular objects are not boxed |
|
93 |
return (oop) value->l; |
|
94 |
} |
|
95 |
oop result = java_lang_boxing_object::create(type, value, CHECK_NULL); |
|
96 |
if (result == NULL) { |
|
97 |
THROW_(vmSymbols::java_lang_IllegalArgumentException(), result); |
|
98 |
} |
|
99 |
return result; |
|
100 |
} |
|
101 |
||
102 |
||
103 |
BasicType Reflection::unbox_for_primitive(oop box, jvalue* value, TRAPS) { |
|
104 |
if (box == NULL) { |
|
105 |
THROW_(vmSymbols::java_lang_IllegalArgumentException(), T_ILLEGAL); |
|
106 |
} |
|
107 |
return java_lang_boxing_object::get_value(box, value); |
|
108 |
} |
|
109 |
||
110 |
BasicType Reflection::unbox_for_regular_object(oop box, jvalue* value) { |
|
111 |
// Note: box is really the unboxed oop. It might even be a Short, etc.! |
|
112 |
value->l = (jobject) box; |
|
113 |
return T_OBJECT; |
|
114 |
} |
|
115 |
||
116 |
||
117 |
void Reflection::widen(jvalue* value, BasicType current_type, BasicType wide_type, TRAPS) { |
|
118 |
assert(wide_type != current_type, "widen should not be called with identical types"); |
|
119 |
switch (wide_type) { |
|
120 |
case T_BOOLEAN: |
|
121 |
case T_BYTE: |
|
122 |
case T_CHAR: |
|
123 |
break; // fail |
|
124 |
case T_SHORT: |
|
125 |
switch (current_type) { |
|
126 |
case T_BYTE: |
|
127 |
value->s = (jshort) value->b; |
|
128 |
return; |
|
129 |
} |
|
130 |
break; // fail |
|
131 |
case T_INT: |
|
132 |
switch (current_type) { |
|
133 |
case T_BYTE: |
|
134 |
value->i = (jint) value->b; |
|
135 |
return; |
|
136 |
case T_CHAR: |
|
137 |
value->i = (jint) value->c; |
|
138 |
return; |
|
139 |
case T_SHORT: |
|
140 |
value->i = (jint) value->s; |
|
141 |
return; |
|
142 |
} |
|
143 |
break; // fail |
|
144 |
case T_LONG: |
|
145 |
switch (current_type) { |
|
146 |
case T_BYTE: |
|
147 |
value->j = (jlong) value->b; |
|
148 |
return; |
|
149 |
case T_CHAR: |
|
150 |
value->j = (jlong) value->c; |
|
151 |
return; |
|
152 |
case T_SHORT: |
|
153 |
value->j = (jlong) value->s; |
|
154 |
return; |
|
155 |
case T_INT: |
|
156 |
value->j = (jlong) value->i; |
|
157 |
return; |
|
158 |
} |
|
159 |
break; // fail |
|
160 |
case T_FLOAT: |
|
161 |
switch (current_type) { |
|
162 |
case T_BYTE: |
|
163 |
value->f = (jfloat) value->b; |
|
164 |
return; |
|
165 |
case T_CHAR: |
|
166 |
value->f = (jfloat) value->c; |
|
167 |
return; |
|
168 |
case T_SHORT: |
|
169 |
value->f = (jfloat) value->s; |
|
170 |
return; |
|
171 |
case T_INT: |
|
172 |
value->f = (jfloat) value->i; |
|
173 |
return; |
|
174 |
case T_LONG: |
|
175 |
value->f = (jfloat) value->j; |
|
176 |
return; |
|
177 |
} |
|
178 |
break; // fail |
|
179 |
case T_DOUBLE: |
|
180 |
switch (current_type) { |
|
181 |
case T_BYTE: |
|
182 |
value->d = (jdouble) value->b; |
|
183 |
return; |
|
184 |
case T_CHAR: |
|
185 |
value->d = (jdouble) value->c; |
|
186 |
return; |
|
187 |
case T_SHORT: |
|
188 |
value->d = (jdouble) value->s; |
|
189 |
return; |
|
190 |
case T_INT: |
|
191 |
value->d = (jdouble) value->i; |
|
192 |
return; |
|
193 |
case T_FLOAT: |
|
194 |
value->d = (jdouble) value->f; |
|
195 |
return; |
|
196 |
case T_LONG: |
|
197 |
value->d = (jdouble) value->j; |
|
198 |
return; |
|
199 |
} |
|
200 |
break; // fail |
|
201 |
default: |
|
202 |
break; // fail |
|
203 |
} |
|
204 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "argument type mismatch"); |
|
205 |
} |
|
206 |
||
207 |
||
208 |
BasicType Reflection::array_get(jvalue* value, arrayOop a, int index, TRAPS) { |
|
209 |
if (!a->is_within_bounds(index)) { |
|
210 |
THROW_(vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), T_ILLEGAL); |
|
211 |
} |
|
212 |
if (a->is_objArray()) { |
|
213 |
value->l = (jobject) objArrayOop(a)->obj_at(index); |
|
214 |
return T_OBJECT; |
|
215 |
} else { |
|
216 |
assert(a->is_typeArray(), "just checking"); |
|
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13728
diff
changeset
|
217 |
BasicType type = TypeArrayKlass::cast(a->klass())->element_type(); |
1 | 218 |
switch (type) { |
219 |
case T_BOOLEAN: |
|
220 |
value->z = typeArrayOop(a)->bool_at(index); |
|
221 |
break; |
|
222 |
case T_CHAR: |
|
223 |
value->c = typeArrayOop(a)->char_at(index); |
|
224 |
break; |
|
225 |
case T_FLOAT: |
|
226 |
value->f = typeArrayOop(a)->float_at(index); |
|
227 |
break; |
|
228 |
case T_DOUBLE: |
|
229 |
value->d = typeArrayOop(a)->double_at(index); |
|
230 |
break; |
|
231 |
case T_BYTE: |
|
232 |
value->b = typeArrayOop(a)->byte_at(index); |
|
233 |
break; |
|
234 |
case T_SHORT: |
|
235 |
value->s = typeArrayOop(a)->short_at(index); |
|
236 |
break; |
|
237 |
case T_INT: |
|
238 |
value->i = typeArrayOop(a)->int_at(index); |
|
239 |
break; |
|
240 |
case T_LONG: |
|
241 |
value->j = typeArrayOop(a)->long_at(index); |
|
242 |
break; |
|
243 |
default: |
|
244 |
return T_ILLEGAL; |
|
245 |
} |
|
246 |
return type; |
|
247 |
} |
|
248 |
} |
|
249 |
||
250 |
||
251 |
void Reflection::array_set(jvalue* value, arrayOop a, int index, BasicType value_type, TRAPS) { |
|
252 |
if (!a->is_within_bounds(index)) { |
|
253 |
THROW(vmSymbols::java_lang_ArrayIndexOutOfBoundsException()); |
|
254 |
} |
|
255 |
if (a->is_objArray()) { |
|
256 |
if (value_type == T_OBJECT) { |
|
257 |
oop obj = (oop) value->l; |
|
258 |
if (obj != NULL) { |
|
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13728
diff
changeset
|
259 |
Klass* element_klass = ObjArrayKlass::cast(a->klass())->element_klass(); |
1 | 260 |
if (!obj->is_a(element_klass)) { |
261 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "array element type mismatch"); |
|
262 |
} |
|
263 |
} |
|
264 |
objArrayOop(a)->obj_at_put(index, obj); |
|
265 |
} |
|
266 |
} else { |
|
267 |
assert(a->is_typeArray(), "just checking"); |
|
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13728
diff
changeset
|
268 |
BasicType array_type = TypeArrayKlass::cast(a->klass())->element_type(); |
1 | 269 |
if (array_type != value_type) { |
270 |
// The widen operation can potentially throw an exception, but cannot block, |
|
271 |
// so typeArrayOop a is safe if the call succeeds. |
|
272 |
widen(value, value_type, array_type, CHECK); |
|
273 |
} |
|
274 |
switch (array_type) { |
|
275 |
case T_BOOLEAN: |
|
276 |
typeArrayOop(a)->bool_at_put(index, value->z); |
|
277 |
break; |
|
278 |
case T_CHAR: |
|
279 |
typeArrayOop(a)->char_at_put(index, value->c); |
|
280 |
break; |
|
281 |
case T_FLOAT: |
|
282 |
typeArrayOop(a)->float_at_put(index, value->f); |
|
283 |
break; |
|
284 |
case T_DOUBLE: |
|
285 |
typeArrayOop(a)->double_at_put(index, value->d); |
|
286 |
break; |
|
287 |
case T_BYTE: |
|
288 |
typeArrayOop(a)->byte_at_put(index, value->b); |
|
289 |
break; |
|
290 |
case T_SHORT: |
|
291 |
typeArrayOop(a)->short_at_put(index, value->s); |
|
292 |
break; |
|
293 |
case T_INT: |
|
294 |
typeArrayOop(a)->int_at_put(index, value->i); |
|
295 |
break; |
|
296 |
case T_LONG: |
|
297 |
typeArrayOop(a)->long_at_put(index, value->j); |
|
298 |
break; |
|
299 |
default: |
|
300 |
THROW(vmSymbols::java_lang_IllegalArgumentException()); |
|
301 |
} |
|
302 |
} |
|
303 |
} |
|
304 |
||
34666 | 305 |
static Klass* basic_type_mirror_to_arrayklass(oop basic_type_mirror, TRAPS) { |
1 | 306 |
assert(java_lang_Class::is_primitive(basic_type_mirror), "just checking"); |
307 |
BasicType type = java_lang_Class::primitive_type(basic_type_mirror); |
|
308 |
if (type == T_VOID) { |
|
309 |
THROW_0(vmSymbols::java_lang_IllegalArgumentException()); |
|
34666 | 310 |
} |
311 |
else { |
|
1 | 312 |
return Universe::typeArrayKlassObj(type); |
313 |
} |
|
314 |
} |
|
315 |
||
34666 | 316 |
#ifdef ASSERT |
317 |
static oop basic_type_arrayklass_to_mirror(Klass* basic_type_arrayklass, TRAPS) { |
|
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13728
diff
changeset
|
318 |
BasicType type = TypeArrayKlass::cast(basic_type_arrayklass)->element_type(); |
1 | 319 |
return Universe::java_mirror(type); |
320 |
} |
|
34666 | 321 |
#endif |
1 | 322 |
|
323 |
arrayOop Reflection::reflect_new_array(oop element_mirror, jint length, TRAPS) { |
|
324 |
if (element_mirror == NULL) { |
|
325 |
THROW_0(vmSymbols::java_lang_NullPointerException()); |
|
326 |
} |
|
327 |
if (length < 0) { |
|
328 |
THROW_0(vmSymbols::java_lang_NegativeArraySizeException()); |
|
329 |
} |
|
330 |
if (java_lang_Class::is_primitive(element_mirror)) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
331 |
Klass* tak = basic_type_mirror_to_arrayklass(element_mirror, CHECK_NULL); |
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13728
diff
changeset
|
332 |
return TypeArrayKlass::cast(tak)->allocate(length, THREAD); |
1 | 333 |
} else { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
334 |
Klass* k = java_lang_Class::as_Klass(element_mirror); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
335 |
if (k->is_array_klass() && ArrayKlass::cast(k)->dimension() >= MAX_DIM) { |
1 | 336 |
THROW_0(vmSymbols::java_lang_IllegalArgumentException()); |
337 |
} |
|
338 |
return oopFactory::new_objArray(k, length, THREAD); |
|
339 |
} |
|
340 |
} |
|
341 |
||
342 |
||
343 |
arrayOop Reflection::reflect_new_multi_array(oop element_mirror, typeArrayOop dim_array, TRAPS) { |
|
344 |
assert(dim_array->is_typeArray(), "just checking"); |
|
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13728
diff
changeset
|
345 |
assert(TypeArrayKlass::cast(dim_array->klass())->element_type() == T_INT, "just checking"); |
1 | 346 |
|
347 |
if (element_mirror == NULL) { |
|
348 |
THROW_0(vmSymbols::java_lang_NullPointerException()); |
|
349 |
} |
|
350 |
||
351 |
int len = dim_array->length(); |
|
352 |
if (len <= 0 || len > MAX_DIM) { |
|
353 |
THROW_0(vmSymbols::java_lang_IllegalArgumentException()); |
|
354 |
} |
|
355 |
||
356 |
jint dimensions[MAX_DIM]; // C array copy of intArrayOop |
|
357 |
for (int i = 0; i < len; i++) { |
|
358 |
int d = dim_array->int_at(i); |
|
359 |
if (d < 0) { |
|
360 |
THROW_0(vmSymbols::java_lang_NegativeArraySizeException()); |
|
361 |
} |
|
362 |
dimensions[i] = d; |
|
363 |
} |
|
364 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
365 |
Klass* klass; |
1 | 366 |
int dim = len; |
367 |
if (java_lang_Class::is_primitive(element_mirror)) { |
|
368 |
klass = basic_type_mirror_to_arrayklass(element_mirror, CHECK_NULL); |
|
369 |
} else { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
370 |
klass = java_lang_Class::as_Klass(element_mirror); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
371 |
if (klass->is_array_klass()) { |
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13728
diff
changeset
|
372 |
int k_dim = ArrayKlass::cast(klass)->dimension(); |
1 | 373 |
if (k_dim + len > MAX_DIM) { |
374 |
THROW_0(vmSymbols::java_lang_IllegalArgumentException()); |
|
375 |
} |
|
376 |
dim += k_dim; |
|
377 |
} |
|
378 |
} |
|
14488 | 379 |
klass = klass->array_klass(dim, CHECK_NULL); |
17861
8f14da01157d
6726963: multi_allocate() call does not CHECK_NULL and causes crash in fastdebug bits
ctornqvi
parents:
17860
diff
changeset
|
380 |
oop obj = ArrayKlass::cast(klass)->multi_allocate(len, dimensions, CHECK_NULL); |
1 | 381 |
assert(obj->is_array(), "just checking"); |
382 |
return arrayOop(obj); |
|
383 |
} |
|
384 |
||
385 |
||
386 |
oop Reflection::array_component_type(oop mirror, TRAPS) { |
|
387 |
if (java_lang_Class::is_primitive(mirror)) { |
|
388 |
return NULL; |
|
389 |
} |
|
390 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
391 |
Klass* klass = java_lang_Class::as_Klass(mirror); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
392 |
if (!klass->is_array_klass()) { |
1 | 393 |
return NULL; |
394 |
} |
|
395 |
||
26412
80741eb33ba2
8049105: Move array component mirror to instance of java/lang/Class (hotspot part 2)
coleenp
parents:
25057
diff
changeset
|
396 |
oop result = java_lang_Class::component_mirror(mirror); |
1 | 397 |
#ifdef ASSERT |
398 |
oop result2 = NULL; |
|
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13728
diff
changeset
|
399 |
if (ArrayKlass::cast(klass)->dimension() == 1) { |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
400 |
if (klass->is_typeArray_klass()) { |
1 | 401 |
result2 = basic_type_arrayklass_to_mirror(klass, CHECK_NULL); |
402 |
} else { |
|
14488 | 403 |
result2 = ObjArrayKlass::cast(klass)->element_klass()->java_mirror(); |
1 | 404 |
} |
405 |
} else { |
|
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13728
diff
changeset
|
406 |
Klass* lower_dim = ArrayKlass::cast(klass)->lower_dimension(); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33602
diff
changeset
|
407 |
assert(lower_dim->is_array_klass(), "just checking"); |
14488 | 408 |
result2 = lower_dim->java_mirror(); |
1 | 409 |
} |
410 |
assert(result == result2, "results must be consistent"); |
|
411 |
#endif //ASSERT |
|
412 |
return result; |
|
413 |
} |
|
414 |
||
40923
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40856
diff
changeset
|
415 |
static bool under_host_klass(const InstanceKlass* ik, const InstanceKlass* host_klass) { |
34666 | 416 |
DEBUG_ONLY(int inf_loop_check = 1000 * 1000 * 1000); |
417 |
for (;;) { |
|
40923
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40856
diff
changeset
|
418 |
const InstanceKlass* hc = ik->host_klass(); |
34666 | 419 |
if (hc == NULL) return false; |
420 |
if (hc == host_klass) return true; |
|
40923
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40856
diff
changeset
|
421 |
ik = hc; |
1 | 422 |
|
34666 | 423 |
// There's no way to make a host class loop short of patching memory. |
424 |
// Therefore there cannot be a loop here unless there's another bug. |
|
425 |
// Still, let's check for it. |
|
426 |
assert(--inf_loop_check > 0, "no host_klass loop"); |
|
427 |
} |
|
428 |
} |
|
429 |
||
430 |
static bool can_relax_access_check_for(const Klass* accessor, |
|
431 |
const Klass* accessee, |
|
432 |
bool classloader_only) { |
|
433 |
||
434 |
const InstanceKlass* accessor_ik = InstanceKlass::cast(accessor); |
|
435 |
const InstanceKlass* accessee_ik = InstanceKlass::cast(accessee); |
|
436 |
||
437 |
// If either is on the other's host_klass chain, access is OK, |
|
438 |
// because one is inside the other. |
|
40923
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40856
diff
changeset
|
439 |
if (under_host_klass(accessor_ik, accessee_ik) || |
10fe1c28b9f6
8058575: IllegalAccessError trying to access package-private class from VM anonymous class
hseigel
parents:
40856
diff
changeset
|
440 |
under_host_klass(accessee_ik, accessor_ik)) |
34666 | 441 |
return true; |
442 |
||
443 |
if ((RelaxAccessControlCheck && |
|
444 |
accessor_ik->major_version() < Verifier::NO_RELAX_ACCESS_CTRL_CHECK_VERSION && |
|
445 |
accessee_ik->major_version() < Verifier::NO_RELAX_ACCESS_CTRL_CHECK_VERSION) || |
|
446 |
(accessor_ik->major_version() < Verifier::STRICTER_ACCESS_CTRL_CHECK_VERSION && |
|
447 |
accessee_ik->major_version() < Verifier::STRICTER_ACCESS_CTRL_CHECK_VERSION)) { |
|
448 |
return classloader_only && |
|
40856
3378947a95e6
8148854: Class names "SomeClass" and "LSomeClass;" treated by JVM as an equivalent
rprotacio
parents:
40385
diff
changeset
|
449 |
Verifier::relax_access_for(accessor_ik->class_loader()) && |
34666 | 450 |
accessor_ik->protection_domain() == accessee_ik->protection_domain() && |
451 |
accessor_ik->class_loader() == accessee_ik->class_loader(); |
|
452 |
} |
|
453 |
||
454 |
return false; |
|
455 |
} |
|
456 |
||
36508 | 457 |
/* |
458 |
Type Accessibility check for public types: Callee Type T is accessible to Caller Type S if: |
|
459 |
||
460 |
Callee T in Callee T in package PT, |
|
461 |
unnamed module runtime module MT |
|
462 |
------------------------------------------------------------------------------------------------ |
|
463 |
||
464 |
Caller S in package If MS is loose: YES If same classloader/package (PS == PT): YES |
|
465 |
PS, runtime module MS If MS can read T's If same runtime module: (MS == MT): YES |
|
466 |
unnamed module: YES |
|
467 |
Else if (MS can read MT (Establish readability) && |
|
468 |
MT exports PT to MS or to all modules): YES |
|
469 |
||
470 |
------------------------------------------------------------------------------------------------ |
|
471 |
Caller S in unnamed YES Readability exists because unnamed module |
|
472 |
module UM "reads" all modules |
|
473 |
if (MT exports PT to UM or to all modules): YES |
|
474 |
||
475 |
------------------------------------------------------------------------------------------------ |
|
476 |
||
477 |
Note: a loose module is a module that can read all current and future unnamed modules. |
|
478 |
*/ |
|
479 |
Reflection::VerifyClassAccessResults Reflection::verify_class_access( |
|
46262
83280d968b96
8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents:
40923
diff
changeset
|
480 |
const Klass* current_class, const InstanceKlass* new_class, bool classloader_only) { |
36508 | 481 |
|
1 | 482 |
// Verify that current_class can access new_class. If the classloader_only |
483 |
// flag is set, we automatically allow any accesses in which current_class |
|
484 |
// doesn't have a classloader. |
|
485 |
if ((current_class == NULL) || |
|
486 |
(current_class == new_class) || |
|
487 |
is_same_class_package(current_class, new_class)) { |
|
36508 | 488 |
return ACCESS_OK; |
1 | 489 |
} |
37301
a936b4e01afb
8137058: Clear out all non-Critical APIs from sun.reflect
chegar
parents:
37179
diff
changeset
|
490 |
// Allow all accesses from jdk/internal/reflect/MagicAccessorImpl subclasses to |
25057 | 491 |
// succeed trivially. |
492 |
if (current_class->is_subclass_of(SystemDictionary::reflect_MagicAccessorImpl_klass())) { |
|
36508 | 493 |
return ACCESS_OK; |
494 |
} |
|
495 |
||
496 |
// module boundaries |
|
497 |
if (new_class->is_public()) { |
|
498 |
// Ignore modules for DumpSharedSpaces because we do not have any package |
|
499 |
// or module information for modules other than java.base. |
|
500 |
if (DumpSharedSpaces) { |
|
501 |
return ACCESS_OK; |
|
502 |
} |
|
503 |
||
504 |
// Find the module entry for current_class, the accessor |
|
38094
46977cd73d86
8152844: JVM InstanceKlass Methods For Obtaining Package/Module Should Be Moved to Klass
rprotacio
parents:
37480
diff
changeset
|
505 |
ModuleEntry* module_from = current_class->module(); |
36508 | 506 |
// Find the module entry for new_class, the accessee |
38094
46977cd73d86
8152844: JVM InstanceKlass Methods For Obtaining Package/Module Should Be Moved to Klass
rprotacio
parents:
37480
diff
changeset
|
507 |
ModuleEntry* module_to = new_class->module(); |
36508 | 508 |
|
509 |
// both in same (possibly unnamed) module |
|
510 |
if (module_from == module_to) { |
|
511 |
return ACCESS_OK; |
|
512 |
} |
|
513 |
||
514 |
// Acceptable access to a type in an unamed module. Note that since |
|
515 |
// unnamed modules can read all unnamed modules, this also handles the |
|
516 |
// case where module_from is also unnamed but in a different class loader. |
|
517 |
if (!module_to->is_named() && |
|
518 |
(module_from->can_read_all_unnamed() || module_from->can_read(module_to))) { |
|
519 |
return ACCESS_OK; |
|
520 |
} |
|
521 |
||
522 |
// Establish readability, check if module_from is allowed to read module_to. |
|
523 |
if (!module_from->can_read(module_to)) { |
|
524 |
return MODULE_NOT_READABLE; |
|
525 |
} |
|
526 |
||
38094
46977cd73d86
8152844: JVM InstanceKlass Methods For Obtaining Package/Module Should Be Moved to Klass
rprotacio
parents:
37480
diff
changeset
|
527 |
PackageEntry* package_to = new_class->package(); |
36508 | 528 |
assert(package_to != NULL, "can not obtain new_class' package"); |
529 |
||
43471
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
40923
diff
changeset
|
530 |
{ |
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
40923
diff
changeset
|
531 |
MutexLocker m1(Module_lock); |
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
40923
diff
changeset
|
532 |
|
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
40923
diff
changeset
|
533 |
// Once readability is established, if module_to exports T unqualifiedly, |
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
40923
diff
changeset
|
534 |
// (to all modules), than whether module_from is in the unnamed module |
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
40923
diff
changeset
|
535 |
// or not does not matter, access is allowed. |
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
40923
diff
changeset
|
536 |
if (package_to->is_unqual_exported()) { |
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
40923
diff
changeset
|
537 |
return ACCESS_OK; |
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
40923
diff
changeset
|
538 |
} |
36508 | 539 |
|
43471
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
40923
diff
changeset
|
540 |
// Access is allowed if both 1 & 2 hold: |
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
40923
diff
changeset
|
541 |
// 1. Readability, module_from can read module_to (established above). |
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
40923
diff
changeset
|
542 |
// 2. Either module_to exports T to module_from qualifiedly. |
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
40923
diff
changeset
|
543 |
// or |
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
40923
diff
changeset
|
544 |
// module_to exports T to all unnamed modules and module_from is unnamed. |
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
40923
diff
changeset
|
545 |
// or |
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
40923
diff
changeset
|
546 |
// module_to exports T unqualifiedly to all modules (checked above). |
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
40923
diff
changeset
|
547 |
if (!package_to->is_qexported_to(module_from)) { |
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
40923
diff
changeset
|
548 |
return TYPE_NOT_EXPORTED; |
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
40923
diff
changeset
|
549 |
} |
36508 | 550 |
} |
551 |
return ACCESS_OK; |
|
1 | 552 |
} |
553 |
||
36508 | 554 |
if (can_relax_access_check_for(current_class, new_class, classloader_only)) { |
555 |
return ACCESS_OK; |
|
556 |
} |
|
557 |
return OTHER_PROBLEM; |
|
558 |
} |
|
559 |
||
560 |
// Return an error message specific to the specified Klass*'s and result. |
|
561 |
// This function must be called from within a block containing a ResourceMark. |
|
562 |
char* Reflection::verify_class_access_msg(const Klass* current_class, |
|
46262
83280d968b96
8174092: Remove array-related access checks from Reflection::verify_class_access()
hseigel
parents:
40923
diff
changeset
|
563 |
const InstanceKlass* new_class, |
36508 | 564 |
VerifyClassAccessResults result) { |
565 |
assert(result != ACCESS_OK, "must be failure result"); |
|
566 |
char * msg = NULL; |
|
567 |
if (result != OTHER_PROBLEM && new_class != NULL && current_class != NULL) { |
|
568 |
// Find the module entry for current_class, the accessor |
|
38094
46977cd73d86
8152844: JVM InstanceKlass Methods For Obtaining Package/Module Should Be Moved to Klass
rprotacio
parents:
37480
diff
changeset
|
569 |
ModuleEntry* module_from = current_class->module(); |
36508 | 570 |
const char * module_from_name = module_from->is_named() ? module_from->name()->as_C_string() : UNNAMED_MODULE; |
571 |
const char * current_class_name = current_class->external_name(); |
|
572 |
||
573 |
// Find the module entry for new_class, the accessee |
|
574 |
ModuleEntry* module_to = NULL; |
|
38094
46977cd73d86
8152844: JVM InstanceKlass Methods For Obtaining Package/Module Should Be Moved to Klass
rprotacio
parents:
37480
diff
changeset
|
575 |
module_to = new_class->module(); |
36508 | 576 |
const char * module_to_name = module_to->is_named() ? module_to->name()->as_C_string() : UNNAMED_MODULE; |
577 |
const char * new_class_name = new_class->external_name(); |
|
578 |
||
579 |
if (result == MODULE_NOT_READABLE) { |
|
580 |
assert(module_from->is_named(), "Unnamed modules can read all modules"); |
|
581 |
if (module_to->is_named()) { |
|
582 |
size_t len = 100 + strlen(current_class_name) + 2*strlen(module_from_name) + |
|
583 |
strlen(new_class_name) + 2*strlen(module_to_name); |
|
584 |
msg = NEW_RESOURCE_ARRAY(char, len); |
|
585 |
jio_snprintf(msg, len - 1, |
|
586 |
"class %s (in module %s) cannot access class %s (in module %s) because module %s does not read module %s", |
|
587 |
current_class_name, module_from_name, new_class_name, |
|
588 |
module_to_name, module_from_name, module_to_name); |
|
589 |
} else { |
|
590 |
jobject jlrm = module_to->module(); |
|
591 |
assert(jlrm != NULL, "Null jlrm in module_to ModuleEntry"); |
|
592 |
intptr_t identity_hash = JNIHandles::resolve(jlrm)->identity_hash(); |
|
593 |
size_t len = 160 + strlen(current_class_name) + 2*strlen(module_from_name) + |
|
594 |
strlen(new_class_name) + 2*sizeof(uintx); |
|
595 |
msg = NEW_RESOURCE_ARRAY(char, len); |
|
596 |
jio_snprintf(msg, len - 1, |
|
597 |
"class %s (in module %s) cannot access class %s (in unnamed module @" SIZE_FORMAT_HEX ") because module %s does not read unnamed module @" SIZE_FORMAT_HEX, |
|
598 |
current_class_name, module_from_name, new_class_name, uintx(identity_hash), |
|
599 |
module_from_name, uintx(identity_hash)); |
|
600 |
} |
|
601 |
||
602 |
} else if (result == TYPE_NOT_EXPORTED) { |
|
38094
46977cd73d86
8152844: JVM InstanceKlass Methods For Obtaining Package/Module Should Be Moved to Klass
rprotacio
parents:
37480
diff
changeset
|
603 |
assert(new_class->package() != NULL, |
36508 | 604 |
"Unnamed packages are always exported"); |
605 |
const char * package_name = |
|
38094
46977cd73d86
8152844: JVM InstanceKlass Methods For Obtaining Package/Module Should Be Moved to Klass
rprotacio
parents:
37480
diff
changeset
|
606 |
new_class->package()->name()->as_klass_external_name(); |
36508 | 607 |
assert(module_to->is_named(), "Unnamed modules export all packages"); |
608 |
if (module_from->is_named()) { |
|
609 |
size_t len = 118 + strlen(current_class_name) + 2*strlen(module_from_name) + |
|
610 |
strlen(new_class_name) + 2*strlen(module_to_name) + strlen(package_name); |
|
611 |
msg = NEW_RESOURCE_ARRAY(char, len); |
|
612 |
jio_snprintf(msg, len - 1, |
|
613 |
"class %s (in module %s) cannot access class %s (in module %s) because module %s does not export %s to module %s", |
|
614 |
current_class_name, module_from_name, new_class_name, |
|
615 |
module_to_name, module_to_name, package_name, module_from_name); |
|
616 |
} else { |
|
617 |
jobject jlrm = module_from->module(); |
|
618 |
assert(jlrm != NULL, "Null jlrm in module_from ModuleEntry"); |
|
619 |
intptr_t identity_hash = JNIHandles::resolve(jlrm)->identity_hash(); |
|
620 |
size_t len = 170 + strlen(current_class_name) + strlen(new_class_name) + |
|
621 |
2*strlen(module_to_name) + strlen(package_name) + 2*sizeof(uintx); |
|
622 |
msg = NEW_RESOURCE_ARRAY(char, len); |
|
623 |
jio_snprintf(msg, len - 1, |
|
624 |
"class %s (in unnamed module @" SIZE_FORMAT_HEX ") cannot access class %s (in module %s) because module %s does not export %s to unnamed module @" SIZE_FORMAT_HEX, |
|
625 |
current_class_name, uintx(identity_hash), new_class_name, module_to_name, |
|
626 |
module_to_name, package_name, uintx(identity_hash)); |
|
627 |
} |
|
628 |
} else { |
|
629 |
ShouldNotReachHere(); |
|
630 |
} |
|
631 |
} // result != OTHER_PROBLEM... |
|
632 |
return msg; |
|
1 | 633 |
} |
634 |
||
34666 | 635 |
bool Reflection::verify_field_access(const Klass* current_class, |
636 |
const Klass* resolved_class, |
|
637 |
const Klass* field_class, |
|
1 | 638 |
AccessFlags access, |
639 |
bool classloader_only, |
|
640 |
bool protected_restriction) { |
|
641 |
// Verify that current_class can access a field of field_class, where that |
|
642 |
// field's access bits are "access". We assume that we've already verified |
|
643 |
// that current_class can access field_class. |
|
644 |
// |
|
645 |
// If the classloader_only flag is set, we automatically allow any accesses |
|
646 |
// in which current_class doesn't have a classloader. |
|
647 |
// |
|
648 |
// "resolved_class" is the runtime type of "field_class". Sometimes we don't |
|
649 |
// need this distinction (e.g. if all we have is the runtime type, or during |
|
650 |
// class file parsing when we only care about the static type); in that case |
|
651 |
// callers should ensure that resolved_class == field_class. |
|
652 |
// |
|
653 |
if ((current_class == NULL) || |
|
654 |
(current_class == field_class) || |
|
655 |
access.is_public()) { |
|
656 |
return true; |
|
657 |
} |
|
658 |
||
34666 | 659 |
const Klass* host_class = current_class; |
40385
a7011a835634
8030221: Checking for anonymous class should check for NULL as well as potential nesting
hseigel
parents:
38719
diff
changeset
|
660 |
if (host_class->is_instance_klass() && |
a7011a835634
8030221: Checking for anonymous class should check for NULL as well as potential nesting
hseigel
parents:
38719
diff
changeset
|
661 |
InstanceKlass::cast(host_class)->is_anonymous()) { |
a7011a835634
8030221: Checking for anonymous class should check for NULL as well as potential nesting
hseigel
parents:
38719
diff
changeset
|
662 |
host_class = InstanceKlass::cast(host_class)->host_klass(); |
a7011a835634
8030221: Checking for anonymous class should check for NULL as well as potential nesting
hseigel
parents:
38719
diff
changeset
|
663 |
assert(host_class != NULL, "Anonymous class has null host class"); |
a7011a835634
8030221: Checking for anonymous class should check for NULL as well as potential nesting
hseigel
parents:
38719
diff
changeset
|
664 |
assert(!(host_class->is_instance_klass() && |
a7011a835634
8030221: Checking for anonymous class should check for NULL as well as potential nesting
hseigel
parents:
38719
diff
changeset
|
665 |
InstanceKlass::cast(host_class)->is_anonymous()), |
a7011a835634
8030221: Checking for anonymous class should check for NULL as well as potential nesting
hseigel
parents:
38719
diff
changeset
|
666 |
"host_class should not be anonymous"); |
22215
579f4a1a4aa6
8027458: VM anonymous classes: wrong context for protected access checks
hseigel
parents:
21729
diff
changeset
|
667 |
} |
579f4a1a4aa6
8027458: VM anonymous classes: wrong context for protected access checks
hseigel
parents:
21729
diff
changeset
|
668 |
if (host_class == field_class) { |
579f4a1a4aa6
8027458: VM anonymous classes: wrong context for protected access checks
hseigel
parents:
21729
diff
changeset
|
669 |
return true; |
579f4a1a4aa6
8027458: VM anonymous classes: wrong context for protected access checks
hseigel
parents:
21729
diff
changeset
|
670 |
} |
579f4a1a4aa6
8027458: VM anonymous classes: wrong context for protected access checks
hseigel
parents:
21729
diff
changeset
|
671 |
|
1 | 672 |
if (access.is_protected()) { |
673 |
if (!protected_restriction) { |
|
22215
579f4a1a4aa6
8027458: VM anonymous classes: wrong context for protected access checks
hseigel
parents:
21729
diff
changeset
|
674 |
// See if current_class (or outermost host class) is a subclass of field_class |
27022 | 675 |
// An interface may not access protected members of j.l.Object |
676 |
if (!host_class->is_interface() && host_class->is_subclass_of(field_class)) { |
|
362 | 677 |
if (access.is_static() || // static fields are ok, see 6622385 |
678 |
current_class == resolved_class || |
|
1 | 679 |
field_class == resolved_class || |
22215
579f4a1a4aa6
8027458: VM anonymous classes: wrong context for protected access checks
hseigel
parents:
21729
diff
changeset
|
680 |
host_class->is_subclass_of(resolved_class) || |
579f4a1a4aa6
8027458: VM anonymous classes: wrong context for protected access checks
hseigel
parents:
21729
diff
changeset
|
681 |
resolved_class->is_subclass_of(host_class)) { |
1 | 682 |
return true; |
683 |
} |
|
684 |
} |
|
685 |
} |
|
686 |
} |
|
687 |
||
688 |
if (!access.is_private() && is_same_class_package(current_class, field_class)) { |
|
689 |
return true; |
|
690 |
} |
|
691 |
||
37301
a936b4e01afb
8137058: Clear out all non-Critical APIs from sun.reflect
chegar
parents:
37179
diff
changeset
|
692 |
// Allow all accesses from jdk/internal/reflect/MagicAccessorImpl subclasses to |
25057 | 693 |
// succeed trivially. |
694 |
if (current_class->is_subclass_of(SystemDictionary::reflect_MagicAccessorImpl_klass())) { |
|
1 | 695 |
return true; |
696 |
} |
|
697 |
||
698 |
return can_relax_access_check_for( |
|
699 |
current_class, field_class, classloader_only); |
|
700 |
} |
|
701 |
||
34666 | 702 |
bool Reflection::is_same_class_package(const Klass* class1, const Klass* class2) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
703 |
return InstanceKlass::cast(class1)->is_same_class_package(class2); |
1 | 704 |
} |
705 |
||
706 |
// Checks that the 'outer' klass has declared 'inner' as being an inner klass. If not, |
|
707 |
// throw an incompatible class change exception |
|
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
1550
diff
changeset
|
708 |
// If inner_is_member, require the inner to be a member of the outer. |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
1550
diff
changeset
|
709 |
// If !inner_is_member, require the inner to be anonymous (a non-member). |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
1550
diff
changeset
|
710 |
// Caller is responsible for figuring out in advance which case must be true. |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
711 |
void Reflection::check_for_inner_class(const InstanceKlass* outer, const InstanceKlass* inner, |
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
1550
diff
changeset
|
712 |
bool inner_is_member, TRAPS) { |
12231
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
10504
diff
changeset
|
713 |
InnerClassesIterator iter(outer); |
1 | 714 |
constantPoolHandle cp (THREAD, outer->constants()); |
12231
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
10504
diff
changeset
|
715 |
for (; !iter.done(); iter.next()) { |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
10504
diff
changeset
|
716 |
int ioff = iter.inner_class_info_index(); |
6a9cfc59a18a
7109878: The instanceKlass EnclosingMethhod attribute fields can be folded into the _inner_class field.
jiangli
parents:
10504
diff
changeset
|
717 |
int ooff = iter.outer_class_info_index(); |
1 | 718 |
|
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
1550
diff
changeset
|
719 |
if (inner_is_member && ioff != 0 && ooff != 0) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
720 |
Klass* o = cp->klass_at(ooff, CHECK); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
721 |
if (o == outer) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
722 |
Klass* i = cp->klass_at(ioff, CHECK); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
723 |
if (i == inner) { |
1 | 724 |
return; |
725 |
} |
|
726 |
} |
|
727 |
} |
|
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
1550
diff
changeset
|
728 |
if (!inner_is_member && ioff != 0 && ooff == 0 && |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
1550
diff
changeset
|
729 |
cp->klass_name_at_matches(inner, ioff)) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
730 |
Klass* i = cp->klass_at(ioff, CHECK); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
731 |
if (i == inner) { |
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
1550
diff
changeset
|
732 |
return; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
1550
diff
changeset
|
733 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
1550
diff
changeset
|
734 |
} |
1 | 735 |
} |
736 |
||
737 |
// 'inner' not declared as an inner klass in outer |
|
738 |
ResourceMark rm(THREAD); |
|
739 |
Exceptions::fthrow( |
|
740 |
THREAD_AND_LOCATION, |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
741 |
vmSymbols::java_lang_IncompatibleClassChangeError(), |
1 | 742 |
"%s and %s disagree on InnerClasses attribute", |
743 |
outer->external_name(), |
|
744 |
inner->external_name() |
|
745 |
); |
|
746 |
} |
|
747 |
||
748 |
// Utility method converting a single SignatureStream element into java.lang.Class instance |
|
34666 | 749 |
static oop get_mirror_from_signature(methodHandle method, |
750 |
SignatureStream* ss, |
|
751 |
TRAPS) { |
|
1 | 752 |
|
34666 | 753 |
|
754 |
if (T_OBJECT == ss->type() || T_ARRAY == ss->type()) { |
|
755 |
Symbol* name = ss->as_symbol(CHECK_NULL); |
|
756 |
oop loader = method->method_holder()->class_loader(); |
|
757 |
oop protection_domain = method->method_holder()->protection_domain(); |
|
758 |
const Klass* k = SystemDictionary::resolve_or_fail(name, |
|
759 |
Handle(THREAD, loader), |
|
760 |
Handle(THREAD, protection_domain), |
|
761 |
true, |
|
762 |
CHECK_NULL); |
|
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38094
diff
changeset
|
763 |
if (log_is_enabled(Debug, class, resolve)) { |
34666 | 764 |
trace_class_resolution(k); |
765 |
} |
|
766 |
return k->java_mirror(); |
|
767 |
} |
|
768 |
||
769 |
assert(ss->type() != T_VOID || ss->at_return_type(), |
|
770 |
"T_VOID should only appear as return type"); |
|
771 |
||
772 |
return java_lang_Class::primitive_mirror(ss->type()); |
|
1 | 773 |
} |
774 |
||
34666 | 775 |
static objArrayHandle get_parameter_types(methodHandle method, |
776 |
int parameter_count, |
|
777 |
oop* return_type, |
|
778 |
TRAPS) { |
|
1 | 779 |
// Allocate array holding parameter types (java.lang.Class instances) |
4571 | 780 |
objArrayOop m = oopFactory::new_objArray(SystemDictionary::Class_klass(), parameter_count, CHECK_(objArrayHandle())); |
34666 | 781 |
objArrayHandle mirrors(THREAD, m); |
1 | 782 |
int index = 0; |
783 |
// Collect parameter types |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
784 |
ResourceMark rm(THREAD); |
34666 | 785 |
Symbol* signature = method->signature(); |
1 | 786 |
SignatureStream ss(signature); |
787 |
while (!ss.at_return_type()) { |
|
788 |
oop mirror = get_mirror_from_signature(method, &ss, CHECK_(objArrayHandle())); |
|
789 |
mirrors->obj_at_put(index++, mirror); |
|
790 |
ss.next(); |
|
791 |
} |
|
792 |
assert(index == parameter_count, "invalid parameter count"); |
|
793 |
if (return_type != NULL) { |
|
794 |
// Collect return type as well |
|
795 |
assert(ss.at_return_type(), "return type should be present"); |
|
796 |
*return_type = get_mirror_from_signature(method, &ss, CHECK_(objArrayHandle())); |
|
797 |
} |
|
798 |
return mirrors; |
|
799 |
} |
|
800 |
||
34666 | 801 |
static objArrayHandle get_exception_types(methodHandle method, TRAPS) { |
27680
8ecc0871c18e
8064811: Use THREAD instead of CHECK_NULL in return statements
stefank
parents:
27677
diff
changeset
|
802 |
return method->resolved_checked_exceptions(THREAD); |
1 | 803 |
} |
804 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
805 |
static Handle new_type(Symbol* signature, Klass* k, TRAPS) { |
1 | 806 |
// Basic types |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
807 |
BasicType type = vmSymbols::signature_type(signature); |
1 | 808 |
if (type != T_OBJECT) { |
809 |
return Handle(THREAD, Universe::java_mirror(type)); |
|
810 |
} |
|
811 |
||
34666 | 812 |
Klass* result = |
813 |
SystemDictionary::resolve_or_fail(signature, |
|
814 |
Handle(THREAD, k->class_loader()), |
|
815 |
Handle(THREAD, k->protection_domain()), |
|
816 |
true, CHECK_(Handle())); |
|
1 | 817 |
|
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38094
diff
changeset
|
818 |
if (log_is_enabled(Debug, class, resolve)) { |
1 | 819 |
trace_class_resolution(result); |
820 |
} |
|
821 |
||
14488 | 822 |
oop nt = result->java_mirror(); |
1 | 823 |
return Handle(THREAD, nt); |
824 |
} |
|
825 |
||
826 |
||
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
31615
diff
changeset
|
827 |
oop Reflection::new_method(const methodHandle& method, bool for_constant_pool_access, TRAPS) { |
25057 | 828 |
// Allow sun.reflect.ConstantPool to refer to <clinit> methods as java.lang.reflect.Methods. |
1 | 829 |
assert(!method()->is_initializer() || |
25057 | 830 |
(for_constant_pool_access && method()->is_static()), |
831 |
"should call new_constructor instead"); |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
832 |
InstanceKlass* holder = method->method_holder(); |
1 | 833 |
int slot = method->method_idnum(); |
834 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
835 |
Symbol* signature = method->signature(); |
1 | 836 |
int parameter_count = ArgumentCount(signature).size(); |
837 |
oop return_type_oop = NULL; |
|
838 |
objArrayHandle parameter_types = get_parameter_types(method, parameter_count, &return_type_oop, CHECK_NULL); |
|
839 |
if (parameter_types.is_null() || return_type_oop == NULL) return NULL; |
|
840 |
||
841 |
Handle return_type(THREAD, return_type_oop); |
|
842 |
||
843 |
objArrayHandle exception_types = get_exception_types(method, CHECK_NULL); |
|
844 |
||
845 |
if (exception_types.is_null()) return NULL; |
|
846 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
847 |
Symbol* method_name = method->name(); |
24456
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
848 |
oop name_oop = StringTable::intern(method_name, CHECK_NULL); |
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
849 |
Handle name = Handle(THREAD, name_oop); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
850 |
if (name == NULL) return NULL; |
1 | 851 |
|
34666 | 852 |
const int modifiers = method->access_flags().as_int() & JVM_RECOGNIZED_METHOD_MODIFIERS; |
1 | 853 |
|
854 |
Handle mh = java_lang_reflect_Method::create(CHECK_NULL); |
|
855 |
||
856 |
java_lang_reflect_Method::set_clazz(mh(), holder->java_mirror()); |
|
857 |
java_lang_reflect_Method::set_slot(mh(), slot); |
|
858 |
java_lang_reflect_Method::set_name(mh(), name()); |
|
859 |
java_lang_reflect_Method::set_return_type(mh(), return_type()); |
|
860 |
java_lang_reflect_Method::set_parameter_types(mh(), parameter_types()); |
|
861 |
java_lang_reflect_Method::set_exception_types(mh(), exception_types()); |
|
862 |
java_lang_reflect_Method::set_modifiers(mh(), modifiers); |
|
863 |
java_lang_reflect_Method::set_override(mh(), false); |
|
864 |
if (java_lang_reflect_Method::has_signature_field() && |
|
865 |
method->generic_signature() != NULL) { |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
866 |
Symbol* gs = method->generic_signature(); |
1 | 867 |
Handle sig = java_lang_String::create_from_symbol(gs, CHECK_NULL); |
868 |
java_lang_reflect_Method::set_signature(mh(), sig()); |
|
869 |
} |
|
870 |
if (java_lang_reflect_Method::has_annotations_field()) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
871 |
typeArrayOop an_oop = Annotations::make_java_array(method->annotations(), CHECK_NULL); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
872 |
java_lang_reflect_Method::set_annotations(mh(), an_oop); |
1 | 873 |
} |
874 |
if (java_lang_reflect_Method::has_parameter_annotations_field()) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
875 |
typeArrayOop an_oop = Annotations::make_java_array(method->parameter_annotations(), CHECK_NULL); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
876 |
java_lang_reflect_Method::set_parameter_annotations(mh(), an_oop); |
1 | 877 |
} |
878 |
if (java_lang_reflect_Method::has_annotation_default_field()) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
879 |
typeArrayOop an_oop = Annotations::make_java_array(method->annotation_default(), CHECK_NULL); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
880 |
java_lang_reflect_Method::set_annotation_default(mh(), an_oop); |
1 | 881 |
} |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14488
diff
changeset
|
882 |
if (java_lang_reflect_Method::has_type_annotations_field()) { |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14488
diff
changeset
|
883 |
typeArrayOop an_oop = Annotations::make_java_array(method->type_annotations(), CHECK_NULL); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14488
diff
changeset
|
884 |
java_lang_reflect_Method::set_type_annotations(mh(), an_oop); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14488
diff
changeset
|
885 |
} |
1 | 886 |
return mh(); |
887 |
} |
|
888 |
||
889 |
||
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
31615
diff
changeset
|
890 |
oop Reflection::new_constructor(const methodHandle& method, TRAPS) { |
1 | 891 |
assert(method()->is_initializer(), "should call new_method instead"); |
892 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
893 |
InstanceKlass* holder = method->method_holder(); |
1 | 894 |
int slot = method->method_idnum(); |
895 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
896 |
Symbol* signature = method->signature(); |
1 | 897 |
int parameter_count = ArgumentCount(signature).size(); |
898 |
objArrayHandle parameter_types = get_parameter_types(method, parameter_count, NULL, CHECK_NULL); |
|
899 |
if (parameter_types.is_null()) return NULL; |
|
900 |
||
901 |
objArrayHandle exception_types = get_exception_types(method, CHECK_NULL); |
|
902 |
if (exception_types.is_null()) return NULL; |
|
903 |
||
34666 | 904 |
const int modifiers = method->access_flags().as_int() & JVM_RECOGNIZED_METHOD_MODIFIERS; |
1 | 905 |
|
906 |
Handle ch = java_lang_reflect_Constructor::create(CHECK_NULL); |
|
907 |
||
908 |
java_lang_reflect_Constructor::set_clazz(ch(), holder->java_mirror()); |
|
909 |
java_lang_reflect_Constructor::set_slot(ch(), slot); |
|
910 |
java_lang_reflect_Constructor::set_parameter_types(ch(), parameter_types()); |
|
911 |
java_lang_reflect_Constructor::set_exception_types(ch(), exception_types()); |
|
912 |
java_lang_reflect_Constructor::set_modifiers(ch(), modifiers); |
|
913 |
java_lang_reflect_Constructor::set_override(ch(), false); |
|
914 |
if (java_lang_reflect_Constructor::has_signature_field() && |
|
915 |
method->generic_signature() != NULL) { |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
916 |
Symbol* gs = method->generic_signature(); |
1 | 917 |
Handle sig = java_lang_String::create_from_symbol(gs, CHECK_NULL); |
918 |
java_lang_reflect_Constructor::set_signature(ch(), sig()); |
|
919 |
} |
|
920 |
if (java_lang_reflect_Constructor::has_annotations_field()) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
921 |
typeArrayOop an_oop = Annotations::make_java_array(method->annotations(), CHECK_NULL); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
922 |
java_lang_reflect_Constructor::set_annotations(ch(), an_oop); |
1 | 923 |
} |
924 |
if (java_lang_reflect_Constructor::has_parameter_annotations_field()) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
925 |
typeArrayOop an_oop = Annotations::make_java_array(method->parameter_annotations(), CHECK_NULL); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
926 |
java_lang_reflect_Constructor::set_parameter_annotations(ch(), an_oop); |
1 | 927 |
} |
17860
1ad3f2d9b4eb
8014709: Constructor.getAnnotatedReturnType() returns empty AnnotatedType
rbackman
parents:
15194
diff
changeset
|
928 |
if (java_lang_reflect_Constructor::has_type_annotations_field()) { |
1ad3f2d9b4eb
8014709: Constructor.getAnnotatedReturnType() returns empty AnnotatedType
rbackman
parents:
15194
diff
changeset
|
929 |
typeArrayOop an_oop = Annotations::make_java_array(method->type_annotations(), CHECK_NULL); |
1ad3f2d9b4eb
8014709: Constructor.getAnnotatedReturnType() returns empty AnnotatedType
rbackman
parents:
15194
diff
changeset
|
930 |
java_lang_reflect_Constructor::set_type_annotations(ch(), an_oop); |
1ad3f2d9b4eb
8014709: Constructor.getAnnotatedReturnType() returns empty AnnotatedType
rbackman
parents:
15194
diff
changeset
|
931 |
} |
1 | 932 |
return ch(); |
933 |
} |
|
934 |
||
935 |
||
24456
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
936 |
oop Reflection::new_field(fieldDescriptor* fd, TRAPS) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
937 |
Symbol* field_name = fd->name(); |
24456
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
938 |
oop name_oop = StringTable::intern(field_name, CHECK_NULL); |
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
939 |
Handle name = Handle(THREAD, name_oop); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
940 |
Symbol* signature = fd->signature(); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
941 |
InstanceKlass* holder = fd->field_holder(); |
1 | 942 |
Handle type = new_type(signature, holder, CHECK_NULL); |
943 |
Handle rh = java_lang_reflect_Field::create(CHECK_NULL); |
|
944 |
||
14391
df0a1573d5bd
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
14385
diff
changeset
|
945 |
java_lang_reflect_Field::set_clazz(rh(), fd->field_holder()->java_mirror()); |
1 | 946 |
java_lang_reflect_Field::set_slot(rh(), fd->index()); |
947 |
java_lang_reflect_Field::set_name(rh(), name()); |
|
948 |
java_lang_reflect_Field::set_type(rh(), type()); |
|
949 |
// Note the ACC_ANNOTATION bit, which is a per-class access flag, is never set here. |
|
950 |
java_lang_reflect_Field::set_modifiers(rh(), fd->access_flags().as_int() & JVM_RECOGNIZED_FIELD_MODIFIERS); |
|
951 |
java_lang_reflect_Field::set_override(rh(), false); |
|
952 |
if (java_lang_reflect_Field::has_signature_field() && |
|
13101
67539edd246d
7177409: Perf regression in JVM_GetClassDeclaredFields after generic signature changes.
jiangli
parents:
12231
diff
changeset
|
953 |
fd->has_generic_signature()) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
954 |
Symbol* gs = fd->generic_signature(); |
1 | 955 |
Handle sig = java_lang_String::create_from_symbol(gs, CHECK_NULL); |
956 |
java_lang_reflect_Field::set_signature(rh(), sig()); |
|
957 |
} |
|
958 |
if (java_lang_reflect_Field::has_annotations_field()) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
959 |
typeArrayOop an_oop = Annotations::make_java_array(fd->annotations(), CHECK_NULL); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
960 |
java_lang_reflect_Field::set_annotations(rh(), an_oop); |
1 | 961 |
} |
15097
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14488
diff
changeset
|
962 |
if (java_lang_reflect_Field::has_type_annotations_field()) { |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14488
diff
changeset
|
963 |
typeArrayOop an_oop = Annotations::make_java_array(fd->type_annotations(), CHECK_NULL); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14488
diff
changeset
|
964 |
java_lang_reflect_Field::set_type_annotations(rh(), an_oop); |
9db149412e0e
8004823: Add VM support for type annotation reflection
stefank
parents:
14488
diff
changeset
|
965 |
} |
1 | 966 |
return rh(); |
967 |
} |
|
968 |
||
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
969 |
oop Reflection::new_parameter(Handle method, int index, Symbol* sym, |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
970 |
int flags, TRAPS) { |
15194
a35093d73168
8006005: Fix constant pool index validation and alignment trap for method parameter reflection
coleenp
parents:
15102
diff
changeset
|
971 |
|
27613
f4773c0d8717
8058322: Zero name_index item of MethodParameters attribute cause MalformedParameterException
emc
parents:
27022
diff
changeset
|
972 |
Handle rh = java_lang_reflect_Parameter::create(CHECK_NULL); |
f4773c0d8717
8058322: Zero name_index item of MethodParameters attribute cause MalformedParameterException
emc
parents:
27022
diff
changeset
|
973 |
|
15194
a35093d73168
8006005: Fix constant pool index validation and alignment trap for method parameter reflection
coleenp
parents:
15102
diff
changeset
|
974 |
if(NULL != sym) { |
27613
f4773c0d8717
8058322: Zero name_index item of MethodParameters attribute cause MalformedParameterException
emc
parents:
27022
diff
changeset
|
975 |
Handle name = java_lang_String::create_from_symbol(sym, CHECK_NULL); |
f4773c0d8717
8058322: Zero name_index item of MethodParameters attribute cause MalformedParameterException
emc
parents:
27022
diff
changeset
|
976 |
java_lang_reflect_Parameter::set_name(rh(), name()); |
15194
a35093d73168
8006005: Fix constant pool index validation and alignment trap for method parameter reflection
coleenp
parents:
15102
diff
changeset
|
977 |
} else { |
27613
f4773c0d8717
8058322: Zero name_index item of MethodParameters attribute cause MalformedParameterException
emc
parents:
27022
diff
changeset
|
978 |
java_lang_reflect_Parameter::set_name(rh(), NULL); |
15194
a35093d73168
8006005: Fix constant pool index validation and alignment trap for method parameter reflection
coleenp
parents:
15102
diff
changeset
|
979 |
} |
a35093d73168
8006005: Fix constant pool index validation and alignment trap for method parameter reflection
coleenp
parents:
15102
diff
changeset
|
980 |
|
15102
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
981 |
java_lang_reflect_Parameter::set_modifiers(rh(), flags); |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
982 |
java_lang_reflect_Parameter::set_executable(rh(), method()); |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
983 |
java_lang_reflect_Parameter::set_index(rh(), index); |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
984 |
return rh(); |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
985 |
} |
0a86564e5f61
8004728: Add hotspot support for parameter reflection
coleenp
parents:
15097
diff
changeset
|
986 |
|
1 | 987 |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
988 |
static methodHandle resolve_interface_call(InstanceKlass* klass, |
34666 | 989 |
const methodHandle& method, |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
990 |
Klass* recv_klass, |
34666 | 991 |
Handle receiver, |
992 |
TRAPS) { |
|
993 |
||
1 | 994 |
assert(!method.is_null() , "method should not be null"); |
995 |
||
996 |
CallInfo info; |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
997 |
Symbol* signature = method->signature(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
998 |
Symbol* name = method->name(); |
31019 | 999 |
LinkResolver::resolve_interface_call(info, receiver, recv_klass, |
38719
133bf85c3f36
8145148: InterfaceMethod CP entry pointing to a class should cause ICCE
coleenp
parents:
38151
diff
changeset
|
1000 |
LinkInfo(klass, name, signature), |
31019 | 1001 |
true, |
1 | 1002 |
CHECK_(methodHandle())); |
1003 |
return info.selected_method(); |
|
1004 |
} |
|
1005 |
||
34666 | 1006 |
// Conversion |
1007 |
static BasicType basic_type_mirror_to_basic_type(oop basic_type_mirror, TRAPS) { |
|
1008 |
assert(java_lang_Class::is_primitive(basic_type_mirror), |
|
1009 |
"just checking"); |
|
1010 |
return java_lang_Class::primitive_type(basic_type_mirror); |
|
1011 |
} |
|
1 | 1012 |
|
34666 | 1013 |
// Narrowing of basic types. Used to create correct jvalues for |
1014 |
// boolean, byte, char and short return return values from interpreter |
|
1015 |
// which are returned as ints. Throws IllegalArgumentException. |
|
1016 |
static void narrow(jvalue* value, BasicType narrow_type, TRAPS) { |
|
1017 |
switch (narrow_type) { |
|
1018 |
case T_BOOLEAN: |
|
37480 | 1019 |
value->z = (jboolean) (value->i & 1); |
34666 | 1020 |
return; |
1021 |
case T_BYTE: |
|
1022 |
value->b = (jbyte)value->i; |
|
1023 |
return; |
|
1024 |
case T_CHAR: |
|
1025 |
value->c = (jchar)value->i; |
|
1026 |
return; |
|
1027 |
case T_SHORT: |
|
1028 |
value->s = (jshort)value->i; |
|
1029 |
return; |
|
1030 |
default: |
|
1031 |
break; // fail |
|
1032 |
} |
|
1033 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "argument type mismatch"); |
|
1034 |
} |
|
1035 |
||
1036 |
||
1037 |
// Method call (shared by invoke_method and invoke_constructor) |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1038 |
static oop invoke(InstanceKlass* klass, |
34666 | 1039 |
methodHandle reflected_method, |
1040 |
Handle receiver, |
|
1041 |
bool override, |
|
1042 |
objArrayHandle ptypes, |
|
1043 |
BasicType rtype, |
|
1044 |
objArrayHandle args, |
|
1045 |
bool is_method_invoke, |
|
1046 |
TRAPS) { |
|
1047 |
||
1 | 1048 |
ResourceMark rm(THREAD); |
1049 |
||
1050 |
methodHandle method; // actual method to invoke |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1051 |
Klass* target_klass; // target klass, receiver's klass for non-static |
1 | 1052 |
|
1053 |
// Ensure klass is initialized |
|
1054 |
klass->initialize(CHECK_NULL); |
|
1055 |
||
1056 |
bool is_static = reflected_method->is_static(); |
|
1057 |
if (is_static) { |
|
1058 |
// ignore receiver argument |
|
1059 |
method = reflected_method; |
|
1060 |
target_klass = klass; |
|
1061 |
} else { |
|
1062 |
// check for null receiver |
|
1063 |
if (receiver.is_null()) { |
|
1064 |
THROW_0(vmSymbols::java_lang_NullPointerException()); |
|
1065 |
} |
|
1066 |
// Check class of receiver against class declaring method |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1067 |
if (!receiver->is_a(klass)) { |
1 | 1068 |
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "object is not an instance of declaring class"); |
1069 |
} |
|
1070 |
// target klass is receiver's klass |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1071 |
target_klass = receiver->klass(); |
1 | 1072 |
// no need to resolve if method is private or <init> |
1073 |
if (reflected_method->is_private() || reflected_method->name() == vmSymbols::object_initializer_name()) { |
|
1074 |
method = reflected_method; |
|
1075 |
} else { |
|
1076 |
// resolve based on the receiver |
|
14391
df0a1573d5bd
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
14385
diff
changeset
|
1077 |
if (reflected_method->method_holder()->is_interface()) { |
1 | 1078 |
// resolve interface call |
24456
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
1079 |
// |
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
1080 |
// Match resolution errors with those thrown due to reflection inlining |
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
1081 |
// Linktime resolution & IllegalAccessCheck already done by Class.getMethod() |
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
1082 |
method = resolve_interface_call(klass, reflected_method, target_klass, receiver, THREAD); |
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
1083 |
if (HAS_PENDING_EXCEPTION) { |
34666 | 1084 |
// Method resolution threw an exception; wrap it in an InvocationTargetException |
24456
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
1085 |
oop resolution_exception = PENDING_EXCEPTION; |
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
1086 |
CLEAR_PENDING_EXCEPTION; |
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
1087 |
// JVMTI has already reported the pending exception |
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
1088 |
// JVMTI internal flag reset is needed in order to report InvocationTargetException |
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
1089 |
if (THREAD->is_Java_thread()) { |
34666 | 1090 |
JvmtiExport::clear_detected_exception((JavaThread*)THREAD); |
1 | 1091 |
} |
24456
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
1092 |
JavaCallArguments args(Handle(THREAD, resolution_exception)); |
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
1093 |
THROW_ARG_0(vmSymbols::java_lang_reflect_InvocationTargetException(), |
34666 | 1094 |
vmSymbols::throwable_void_signature(), |
1095 |
&args); |
|
1 | 1096 |
} |
1097 |
} else { |
|
1098 |
// if the method can be overridden, we resolve using the vtable index. |
|
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
1099 |
assert(!reflected_method->has_itable_index(), ""); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
1100 |
int index = reflected_method->vtable_index(); |
1 | 1101 |
method = reflected_method; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1102 |
if (index != Method::nonvirtual_vtable_index) { |
35900 | 1103 |
method = methodHandle(THREAD, target_klass->method_at_vtable(index)); |
1 | 1104 |
} |
1105 |
if (!method.is_null()) { |
|
1106 |
// Check for abstract methods as well |
|
1107 |
if (method->is_abstract()) { |
|
1108 |
// new default: 6531596 |
|
24456
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
1109 |
ResourceMark rm(THREAD); |
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
1110 |
Handle h_origexception = Exceptions::new_exception(THREAD, |
34666 | 1111 |
vmSymbols::java_lang_AbstractMethodError(), |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1112 |
Method::name_and_sig_as_C_string(target_klass, |
34666 | 1113 |
method->name(), |
1114 |
method->signature())); |
|
24456
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
1115 |
JavaCallArguments args(h_origexception); |
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
1116 |
THROW_ARG_0(vmSymbols::java_lang_reflect_InvocationTargetException(), |
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
1117 |
vmSymbols::throwable_void_signature(), |
8c7933fa5a1f
8025580: Temporary flags: UseNewReflection and ReflectionWrapResolutionErrors
coleenp
parents:
24426
diff
changeset
|
1118 |
&args); |
1 | 1119 |
} |
1120 |
} |
|
1121 |
} |
|
1122 |
} |
|
1123 |
} |
|
1124 |
||
1125 |
// I believe this is a ShouldNotGetHere case which requires |
|
1126 |
// an internal vtable bug. If you ever get this please let Karen know. |
|
1127 |
if (method.is_null()) { |
|
1128 |
ResourceMark rm(THREAD); |
|
1129 |
THROW_MSG_0(vmSymbols::java_lang_NoSuchMethodError(), |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1130 |
Method::name_and_sig_as_C_string(klass, |
34666 | 1131 |
reflected_method->name(), |
1132 |
reflected_method->signature())); |
|
1 | 1133 |
} |
1134 |
||
1135 |
assert(ptypes->is_objArray(), "just checking"); |
|
1136 |
int args_len = args.is_null() ? 0 : args->length(); |
|
1137 |
// Check number of arguments |
|
1138 |
if (ptypes->length() != args_len) { |
|
34666 | 1139 |
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), |
1140 |
"wrong number of arguments"); |
|
1 | 1141 |
} |
1142 |
||
1143 |
// Create object to contain parameters for the JavaCall |
|
1144 |
JavaCallArguments java_args(method->size_of_parameters()); |
|
1145 |
||
1146 |
if (!is_static) { |
|
1147 |
java_args.push_oop(receiver); |
|
1148 |
} |
|
1149 |
||
1150 |
for (int i = 0; i < args_len; i++) { |
|
1151 |
oop type_mirror = ptypes->obj_at(i); |
|
1152 |
oop arg = args->obj_at(i); |
|
1153 |
if (java_lang_Class::is_primitive(type_mirror)) { |
|
1154 |
jvalue value; |
|
1155 |
BasicType ptype = basic_type_mirror_to_basic_type(type_mirror, CHECK_NULL); |
|
34666 | 1156 |
BasicType atype = Reflection::unbox_for_primitive(arg, &value, CHECK_NULL); |
1 | 1157 |
if (ptype != atype) { |
34666 | 1158 |
Reflection::widen(&value, atype, ptype, CHECK_NULL); |
1 | 1159 |
} |
1160 |
switch (ptype) { |
|
1161 |
case T_BOOLEAN: java_args.push_int(value.z); break; |
|
1162 |
case T_CHAR: java_args.push_int(value.c); break; |
|
1163 |
case T_BYTE: java_args.push_int(value.b); break; |
|
1164 |
case T_SHORT: java_args.push_int(value.s); break; |
|
1165 |
case T_INT: java_args.push_int(value.i); break; |
|
1166 |
case T_LONG: java_args.push_long(value.j); break; |
|
1167 |
case T_FLOAT: java_args.push_float(value.f); break; |
|
1168 |
case T_DOUBLE: java_args.push_double(value.d); break; |
|
1169 |
default: |
|
1170 |
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "argument type mismatch"); |
|
1171 |
} |
|
1172 |
} else { |
|
1173 |
if (arg != NULL) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1174 |
Klass* k = java_lang_Class::as_Klass(type_mirror); |
1 | 1175 |
if (!arg->is_a(k)) { |
34666 | 1176 |
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), |
1177 |
"argument type mismatch"); |
|
1 | 1178 |
} |
1179 |
} |
|
1180 |
Handle arg_handle(THREAD, arg); // Create handle for argument |
|
1181 |
java_args.push_oop(arg_handle); // Push handle |
|
1182 |
} |
|
1183 |
} |
|
1184 |
||
34666 | 1185 |
assert(java_args.size_of_parameters() == method->size_of_parameters(), |
1186 |
"just checking"); |
|
1 | 1187 |
|
1188 |
// All oops (including receiver) is passed in as Handles. An potential oop is returned as an |
|
1189 |
// oop (i.e., NOT as an handle) |
|
1190 |
JavaValue result(rtype); |
|
1191 |
JavaCalls::call(&result, method, &java_args, THREAD); |
|
1192 |
||
1193 |
if (HAS_PENDING_EXCEPTION) { |
|
1194 |
// Method threw an exception; wrap it in an InvocationTargetException |
|
1195 |
oop target_exception = PENDING_EXCEPTION; |
|
1196 |
CLEAR_PENDING_EXCEPTION; |
|
22897
77e1024a4a14
4505697: nsk/jdi/ExceptionEvent/_itself_/exevent006 and exevent008 tests fail with InvocationTargetException
jbachorik
parents:
22551
diff
changeset
|
1197 |
// JVMTI has already reported the pending exception |
77e1024a4a14
4505697: nsk/jdi/ExceptionEvent/_itself_/exevent006 and exevent008 tests fail with InvocationTargetException
jbachorik
parents:
22551
diff
changeset
|
1198 |
// JVMTI internal flag reset is needed in order to report InvocationTargetException |
77e1024a4a14
4505697: nsk/jdi/ExceptionEvent/_itself_/exevent006 and exevent008 tests fail with InvocationTargetException
jbachorik
parents:
22551
diff
changeset
|
1199 |
if (THREAD->is_Java_thread()) { |
34666 | 1200 |
JvmtiExport::clear_detected_exception((JavaThread*)THREAD); |
22897
77e1024a4a14
4505697: nsk/jdi/ExceptionEvent/_itself_/exevent006 and exevent008 tests fail with InvocationTargetException
jbachorik
parents:
22551
diff
changeset
|
1201 |
} |
77e1024a4a14
4505697: nsk/jdi/ExceptionEvent/_itself_/exevent006 and exevent008 tests fail with InvocationTargetException
jbachorik
parents:
22551
diff
changeset
|
1202 |
|
1 | 1203 |
JavaCallArguments args(Handle(THREAD, target_exception)); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
1204 |
THROW_ARG_0(vmSymbols::java_lang_reflect_InvocationTargetException(), |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
1205 |
vmSymbols::throwable_void_signature(), |
1 | 1206 |
&args); |
1207 |
} else { |
|
31615 | 1208 |
if (rtype == T_BOOLEAN || rtype == T_BYTE || rtype == T_CHAR || rtype == T_SHORT) { |
34666 | 1209 |
narrow((jvalue*)result.get_value_addr(), rtype, CHECK_NULL); |
31615 | 1210 |
} |
34666 | 1211 |
return Reflection::box((jvalue*)result.get_value_addr(), rtype, THREAD); |
1 | 1212 |
} |
1213 |
} |
|
1214 |
||
1215 |
// This would be nicer if, say, java.lang.reflect.Method was a subclass |
|
1216 |
// of java.lang.reflect.Constructor |
|
1217 |
||
1218 |
oop Reflection::invoke_method(oop method_mirror, Handle receiver, objArrayHandle args, TRAPS) { |
|
1219 |
oop mirror = java_lang_reflect_Method::clazz(method_mirror); |
|
1220 |
int slot = java_lang_reflect_Method::slot(method_mirror); |
|
1221 |
bool override = java_lang_reflect_Method::override(method_mirror) != 0; |
|
1222 |
objArrayHandle ptypes(THREAD, objArrayOop(java_lang_reflect_Method::parameter_types(method_mirror))); |
|
1223 |
||
1224 |
oop return_type_mirror = java_lang_reflect_Method::return_type(method_mirror); |
|
1225 |
BasicType rtype; |
|
1226 |
if (java_lang_Class::is_primitive(return_type_mirror)) { |
|
1227 |
rtype = basic_type_mirror_to_basic_type(return_type_mirror, CHECK_NULL); |
|
1228 |
} else { |
|
1229 |
rtype = T_OBJECT; |
|
1230 |
} |
|
1231 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1232 |
InstanceKlass* klass = InstanceKlass::cast(java_lang_Class::as_Klass(mirror)); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1233 |
Method* m = klass->method_with_idnum(slot); |
224
6a257cd604e7
6667089: 3/3 multiple redefinitions of a class break reflection
dcubed
parents:
1
diff
changeset
|
1234 |
if (m == NULL) { |
1 | 1235 |
THROW_MSG_0(vmSymbols::java_lang_InternalError(), "invoke"); |
1236 |
} |
|
224
6a257cd604e7
6667089: 3/3 multiple redefinitions of a class break reflection
dcubed
parents:
1
diff
changeset
|
1237 |
methodHandle method(THREAD, m); |
1 | 1238 |
|
1239 |
return invoke(klass, method, receiver, override, ptypes, rtype, args, true, THREAD); |
|
1240 |
} |
|
1241 |
||
1242 |
||
1243 |
oop Reflection::invoke_constructor(oop constructor_mirror, objArrayHandle args, TRAPS) { |
|
1244 |
oop mirror = java_lang_reflect_Constructor::clazz(constructor_mirror); |
|
1245 |
int slot = java_lang_reflect_Constructor::slot(constructor_mirror); |
|
1246 |
bool override = java_lang_reflect_Constructor::override(constructor_mirror) != 0; |
|
1247 |
objArrayHandle ptypes(THREAD, objArrayOop(java_lang_reflect_Constructor::parameter_types(constructor_mirror))); |
|
1248 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1249 |
InstanceKlass* klass = InstanceKlass::cast(java_lang_Class::as_Klass(mirror)); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
1250 |
Method* m = klass->method_with_idnum(slot); |
224
6a257cd604e7
6667089: 3/3 multiple redefinitions of a class break reflection
dcubed
parents:
1
diff
changeset
|
1251 |
if (m == NULL) { |
1 | 1252 |
THROW_MSG_0(vmSymbols::java_lang_InternalError(), "invoke"); |
1253 |
} |
|
224
6a257cd604e7
6667089: 3/3 multiple redefinitions of a class break reflection
dcubed
parents:
1
diff
changeset
|
1254 |
methodHandle method(THREAD, m); |
1 | 1255 |
assert(method->name() == vmSymbols::object_initializer_name(), "invalid constructor"); |
1256 |
||
1257 |
// Make sure klass gets initialize |
|
1258 |
klass->initialize(CHECK_NULL); |
|
1259 |
||
1260 |
// Create new instance (the receiver) |
|
1261 |
klass->check_valid_for_instantiation(false, CHECK_NULL); |
|
1262 |
Handle receiver = klass->allocate_instance_handle(CHECK_NULL); |
|
1263 |
||
1264 |
// Ignore result from call and return receiver |
|
1265 |
invoke(klass, method, receiver, override, ptypes, T_VOID, args, false, CHECK_NULL); |
|
1266 |
return receiver(); |
|
1267 |
} |