From beec734fdd39b39cfc6aec18866b6a7b18c70aa9 Mon Sep 17 00:00:00 2001 From: Coleen Phillimore Date: Fri, 9 Jun 2023 20:03:48 +0000 Subject: [PATCH] 8309692: Fix -Wconversion warnings in javaClasses Reviewed-by: fparain, matsaave --- src/hotspot/share/classfile/javaClasses.cpp | 8 ++++---- src/hotspot/share/classfile/javaClasses.inline.hpp | 10 +++++----- src/hotspot/share/runtime/globals.hpp | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp index a7582e535e6..20a69e13b9e 100644 --- a/src/hotspot/share/classfile/javaClasses.cpp +++ b/src/hotspot/share/classfile/javaClasses.cpp @@ -817,16 +817,16 @@ static void initialize_static_primitive_field(fieldDescriptor* fd, Handle mirror BasicType t = fd->field_type(); switch (t) { case T_BYTE: - mirror()->byte_field_put(fd->offset(), fd->int_initial_value()); + mirror()->byte_field_put(fd->offset(), checked_cast(fd->int_initial_value())); break; case T_BOOLEAN: - mirror()->bool_field_put(fd->offset(), fd->int_initial_value()); + mirror()->bool_field_put(fd->offset(), checked_cast(fd->int_initial_value())); break; case T_CHAR: - mirror()->char_field_put(fd->offset(), fd->int_initial_value()); + mirror()->char_field_put(fd->offset(), checked_cast(fd->int_initial_value())); break; case T_SHORT: - mirror()->short_field_put(fd->offset(), fd->int_initial_value()); + mirror()->short_field_put(fd->offset(), checked_cast(fd->int_initial_value())); break; case T_INT: mirror()->int_field_put(fd->offset(), fd->int_initial_value()); diff --git a/src/hotspot/share/classfile/javaClasses.inline.hpp b/src/hotspot/share/classfile/javaClasses.inline.hpp index 960d5d224c5..4d47399d949 100644 --- a/src/hotspot/share/classfile/javaClasses.inline.hpp +++ b/src/hotspot/share/classfile/javaClasses.inline.hpp @@ -325,15 +325,15 @@ inline bool java_lang_Module::is_instance(oop obj) { inline int Backtrace::merge_bci_and_version(int bci, int version) { // only store u2 for version, checking for overflow. if (version > USHRT_MAX || version < 0) version = USHRT_MAX; - assert((jushort)bci == bci, "bci should be short"); - return build_int_from_shorts(version, bci); + assert((u2)bci == bci, "bci should be short"); + return build_int_from_shorts((u2)version, (u2)bci); } inline int Backtrace::merge_mid_and_cpref(int mid, int cpref) { // only store u2 for mid and cpref, checking for overflow. - assert((jushort)mid == mid, "mid should be short"); - assert((jushort)cpref == cpref, "cpref should be short"); - return build_int_from_shorts(cpref, mid); + assert((u2)mid == mid, "mid should be short"); + assert((u2)cpref == cpref, "cpref should be short"); + return build_int_from_shorts((u2)cpref, (u2)mid); } inline int Backtrace::bci_at(unsigned int merged) { diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp index 5d48e41d1a6..f03036cc0d8 100644 --- a/src/hotspot/share/runtime/globals.hpp +++ b/src/hotspot/share/runtime/globals.hpp @@ -1274,7 +1274,7 @@ const int ObjectAlignmentInBytes = 8; "(0.0 means off)") \ range(0.0, (double)max_intx) \ \ - product(intx, MaxJavaStackTraceDepth, 1024, \ + product(int, MaxJavaStackTraceDepth, 1024, \ "The maximum number of lines in the stack trace for Java " \ "exceptions (0 means all)") \ range(0, max_jint/2) \