JDK-8345569

src/hotspot/share/cds/filemap.cpp

@@ -2245,7 +2245,7 @@ address FileMapInfo::heap_region_requested_address() {
     // Runtime base = 0x4000 and shift is also 0. If we map this region at 0x5000, then
     // the value P can remain 0x1200. The decoded address = (0x4000 + (0x1200 << 0)) = 0x5200,
     // which is the runtime location of the referenced object.
-    return /*runtime*/ CompressedOops::base() + r->mapping_offset();
+    return /*runtime*/ (address)((uintptr_t)CompressedOops::base() + r->mapping_offset());
   } else {
     // This was the hard-coded requested base address used at dump time. With uncompressed oops,
     // the heap range is assigned by the OS so we will most likely have to relocate anyway, no matter

src/hotspot/share/memory/virtualspace.cpp

@@ -34,6 +34,7 @@
 #include "runtime/globals_extension.hpp"
 #include "runtime/java.hpp"
 #include "runtime/os.hpp"
+#include "sanitizers/ub.hpp"
 #include "utilities/align.hpp"
 #include "utilities/formatBuffer.hpp"
 #include "utilities/powerOfTwo.hpp"
@@ -435,6 +436,7 @@ void ReservedHeapSpace::try_reserve_heap(size_t size,
   }
 }
 
+ATTRIBUTE_NO_UBSAN
 void ReservedHeapSpace::try_reserve_range(char *highest_start,
                                           char *lowest_start,
                                           size_t attach_point_alignment,