# HG changeset patch
# User cgo
# Date 1574079747 -3600
# Node ID ac11b83e0f3893aca163aba90f826b9359695ed9
# Parent  5ac4a49f539939f0dc659a25cbc256eb6d801392
8234324: ARM32 build broken after 8231610
Reviewed-by: iklam, aph

diff -r 5ac4a49f5399 -r ac11b83e0f38 src/hotspot/share/memory/filemap.cpp
--- a/src/hotspot/share/memory/filemap.cpp	Mon Nov 18 18:21:18 2019 +0100
+++ b/src/hotspot/share/memory/filemap.cpp	Mon Nov 18 13:22:27 2019 +0100
@@ -1133,7 +1133,7 @@
     assert((base - (char*)CompressedKlassPointers::base()) % HeapWordSize == 0, "Sanity");
     if (base != NULL) {
       _mapping_offset = (size_t)CompressedOops::encode_not_null((oop)base);
-      assert(_mapping_offset >> 32 == 0, "must be 32-bit only");
+      assert(_mapping_offset == (size_t)(uint32_t)_mapping_offset, "must be 32-bit only");
     }
   } else {
     if (base != NULL) {
@@ -1566,7 +1566,7 @@
 
 address FileMapInfo::decode_start_address(FileMapRegion* spc, bool with_current_oop_encoding_mode) {
   size_t offset = spc->mapping_offset();
-  assert((offset >> 32) == 0, "must be 32-bit only");
+  assert(offset == (size_t)(uint32_t)offset, "must be 32-bit only");
   uint n = (uint)offset;
   if (with_current_oop_encoding_mode) {
     return (address)CompressedOops::decode_not_null(n);