Skip to content

Commit 000f75d

Browse files
authored
Merge pull request #9 from JornVernee/Windows_Warnings
Fix warnings on MSVC
2 parents 739c792 + 7407874 commit 000f75d

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/hotspot/share/code/nmethod.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
#include "utilities/copy.hpp"
6969
#include "utilities/dtrace.hpp"
7070
#include "utilities/events.hpp"
71+
#include "utilities/globalDefinitions.hpp"
7172
#include "utilities/resourceHash.hpp"
7273
#include "utilities/xmlstream.hpp"
7374
#if INCLUDE_JVMCI
@@ -520,7 +521,7 @@ nmethod* nmethod::new_nmethod(const methodHandle& method,
520521
CodeBlob::allocation_size(code_buffer, sizeof(nmethod))
521522
+ adjust_pcs_size(debug_info->pcs_size())
522523
+ align_up((int)dependencies->size_in_bytes(), oopSize)
523-
+ align_up(native_invokers.data_size_in_bytes() , oopSize)
524+
+ align_up(checked_cast<int>(native_invokers.data_size_in_bytes()), oopSize)
524525
+ align_up(handler_table->size_in_bytes() , oopSize)
525526
+ align_up(nul_chk_table->size_in_bytes() , oopSize)
526527
#if INCLUDE_JVMCI
@@ -801,7 +802,7 @@ nmethod::nmethod(
801802
_scopes_pcs_offset = scopes_data_offset + align_up(debug_info->data_size (), oopSize);
802803
_dependencies_offset = _scopes_pcs_offset + adjust_pcs_size(debug_info->pcs_size());
803804
_native_invokers_offset = _dependencies_offset + align_up((int)dependencies->size_in_bytes(), oopSize);
804-
_handler_table_offset = _native_invokers_offset + align_up(native_invokers.data_size_in_bytes(), oopSize);
805+
_handler_table_offset = _native_invokers_offset + align_up(checked_cast<int>(native_invokers.data_size_in_bytes()), oopSize);
805806
_nul_chk_table_offset = _handler_table_offset + align_up(handler_table->size_in_bytes(), oopSize);
806807
#if INCLUDE_JVMCI
807808
_speculations_offset = _nul_chk_table_offset + align_up(nul_chk_table->size_in_bytes(), oopSize);

0 commit comments

Comments
 (0)