archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8264711: More runtime TRAPS cleanups

Browse source 
Reviewed-by: lfoltan, pchilanomate, dholmes, dcubed
This commit is contained in:
Harold Seigel 2021-04-08 12:13:19 +00:00
parent 3aec2d9647
commit af13c64f68
26 changed files with 84 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/hotspot/share/runtime/reflection.cpp
View file

@ -951,7 +951,7 @@ static methodHandle resolve_interface_call(InstanceKlass* klass,
}
// Conversion
static BasicType basic_type_mirror_to_basic_type(oop basic_type_mirror, TRAPS) {
static BasicType basic_type_mirror_to_basic_type(oop basic_type_mirror) {
assert(java_lang_Class::is_primitive(basic_type_mirror),
"just checking");
return java_lang_Class::primitive_type(basic_type_mirror);
@ -1103,7 +1103,7 @@ static oop invoke(InstanceKlass* klass,
oop arg = args->obj_at(i);
if (java_lang_Class::is_primitive(type_mirror)) {
jvalue value;
BasicType ptype = basic_type_mirror_to_basic_type(type_mirror, CHECK_NULL);
BasicType ptype = basic_type_mirror_to_basic_type(type_mirror);
BasicType atype = Reflection::unbox_for_primitive(arg, &value, CHECK_NULL);
if (ptype != atype) {
Reflection::widen(&value, atype, ptype, CHECK_NULL);
@ -1175,7 +1175,7 @@ oop Reflection::invoke_method(oop method_mirror, Handle receiver, objArrayHandle
oop return_type_mirror = java_lang_reflect_Method::return_type(method_mirror);
BasicType rtype;
if (java_lang_Class::is_primitive(return_type_mirror)) {
rtype = basic_type_mirror_to_basic_type(return_type_mirror, CHECK_NULL);
rtype = basic_type_mirror_to_basic_type(return_type_mirror);
} else {
rtype = T_OBJECT;
}