Mercurial > hg > icedtea8-forest > hotspot

changeset 10886:e3d3b9611239

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8221408: Windows 32bit build build errors/warnings in hotspot Reviewed-by: kbarrett, dholmes
author stuefe
date Fri, 29 Mar 2019 08:36:33 +0100
parents d84cbe66ce9f
children ccaca70e893c
files src/share/vm/oops/markOop.hpp
diffstat 1 files changed, 3 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/oops/markOop.hpp	Tue Dec 01 06:35:05 2020 +0000
+++ b/src/share/vm/oops/markOop.hpp	Fri Mar 29 08:36:33 2019 +0100
@@ -138,23 +138,15 @@
          epoch_mask_in_place      = epoch_mask << epoch_shift,
          cms_mask                 = right_n_bits(cms_bits),
          cms_mask_in_place        = cms_mask << cms_shift
-#ifndef _WIN64
-         ,hash_mask               = right_n_bits(hash_bits),
-         hash_mask_in_place       = (address_word)hash_mask << hash_shift
-#endif
   };
 
+  const static uintptr_t hash_mask = right_n_bits(hash_bits);
+  const static uintptr_t hash_mask_in_place = hash_mask << hash_shift;
+
   // Alignment of JavaThread pointers encoded in object header required by biased locking
   enum { biased_lock_alignment    = 2 << (epoch_shift + epoch_bits)
   };
 
-#ifdef _WIN64
-    // These values are too big for Win64
-    const static uintptr_t hash_mask = right_n_bits(hash_bits);
-    const static uintptr_t hash_mask_in_place  =
-                            (address_word)hash_mask << hash_shift;
-#endif
-
   enum { locked_value             = 0,
          unlocked_value           = 1,
          monitor_value            = 2,