--- a/src/hotspot/share/runtime/deoptimization.cpp	Fri Jun 15 11:58:34 2018 +0530
+++ b/src/hotspot/share/runtime/deoptimization.cpp	Mon Jun 11 15:28:24 2018 +0200
@@ -2071,7 +2071,7 @@
 
 // Local derived constants.
 // Further breakdown of DataLayout::trap_state, as promised by DataLayout.
-const int DS_REASON_MASK   = DataLayout::trap_mask >> 1;
+const int DS_REASON_MASK   = ((uint)DataLayout::trap_mask) >> 1;
 const int DS_RECOMPILE_BIT = DataLayout::trap_mask - DS_REASON_MASK;
 
 //---------------------------trap_state_reason---------------------------------