8314694: Separate checked_cast from globalDefinitions.hpp

Reviewed-by: stuefe, coleenp, sspitsyn

src/hotspot/cpu/aarch64/assembler_aarch64.hpp

@@ -28,6 +28,7 @@
 
 #include "asm/register.hpp"
 #include "metaprogramming/enableIf.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"

src/hotspot/cpu/aarch64/register_aarch64.hpp

@@ -27,6 +27,7 @@
 #define CPU_AARCH64_REGISTER_AARCH64_HPP
 
 #include "asm/register.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/powerOfTwo.hpp"
 
 class VMRegImpl;

src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp

@@ -51,6 +51,7 @@
 #include "runtime/stubCodeGenerator.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "utilities/align.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/powerOfTwo.hpp"
 #ifdef COMPILER2

src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp

@@ -53,6 +53,7 @@
 #include "runtime/synchronizer.hpp"
 #include "runtime/timer.hpp"
 #include "runtime/vframeArray.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/powerOfTwo.hpp"
 #include <sys/types.h>

src/hotspot/cpu/ppc/vmstorage_ppc.hpp

@@ -28,6 +28,7 @@
 #include <cstdint>
 
 #include "asm/register.hpp"
+#include "utilities/checkedCast.hpp"
 
 // keep in sync with jdk/internal/foreign/abi/ppc64/PPC64Architecture
 enum class StorageType : int8_t {

src/hotspot/cpu/riscv/register_riscv.hpp

@@ -27,6 +27,7 @@
 #define CPU_RISCV_REGISTER_RISCV_HPP
 
 #include "asm/register.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/powerOfTwo.hpp"
 
 #define CSR_FFLAGS   0x001        // Floating-Point Accrued Exceptions.

src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp

@@ -53,6 +53,7 @@
 #include "runtime/synchronizer.hpp"
 #include "runtime/timer.hpp"
 #include "runtime/vframeArray.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/powerOfTwo.hpp"
 #include <sys/types.h>

src/hotspot/cpu/s390/vmstorage_s390.hpp

@@ -27,6 +27,7 @@
 #include <cstdint>
 
 #include "asm/register.hpp"
+#include "utilities/checkedCast.hpp"
 
 enum class StorageType : int8_t {
   INTEGER = 0,

src/hotspot/cpu/x86/assembler_x86.cpp

@@ -35,6 +35,7 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/vm_version.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/macros.hpp"
 
 #ifdef PRODUCT

src/hotspot/cpu/x86/assembler_x86.hpp

@@ -26,6 +26,7 @@
 #define CPU_X86_ASSEMBLER_X86_HPP
 
 #include "asm/register.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/powerOfTwo.hpp"
 
 // Contains all the definitions needed for x86 assembly code generation.

src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp

@@ -37,6 +37,7 @@
 #include "runtime/os.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
+#include "utilities/checkedCast.hpp"
 
 int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr, Register tmp, Label& slow_case) {
   const int aligned_mask = BytesPerWord -1;

src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp

@@ -35,6 +35,7 @@
 #include "opto/subnode.hpp"
 #include "runtime/objectMonitor.hpp"
 #include "runtime/stubRoutines.hpp"
+#include "utilities/checkedCast.hpp"
 
 #ifdef PRODUCT
 #define BLOCK_COMMENT(str) /* nothing */

src/hotspot/cpu/x86/macroAssembler_x86.cpp

@@ -52,6 +52,7 @@
 #include "runtime/safepointMechanism.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/macros.hpp"
 
 #ifdef PRODUCT

src/hotspot/cpu/x86/macroAssembler_x86.hpp

@@ -32,6 +32,7 @@
 #include "utilities/macros.hpp"
 #include "runtime/rtmLocking.hpp"
 #include "runtime/vm_version.hpp"
+#include "utilities/checkedCast.hpp"
 
 // MacroAssembler extends Assembler by frequently used macros.
 //

src/hotspot/cpu/x86/register_x86.hpp

@@ -27,6 +27,7 @@
 
 #include "asm/register.hpp"
 #include "runtime/globals.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/count_leading_zeros.hpp"
 #include "utilities/powerOfTwo.hpp"
 

src/hotspot/cpu/x86/relocInfo_x86.cpp

@@ -33,6 +33,7 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/safepointMechanism.hpp"
+#include "utilities/checkedCast.hpp"
 
 
 void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {

src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp

@@ -57,6 +57,7 @@
 #include "runtime/vframeArray.hpp"
 #include "runtime/vm_version.hpp"
 #include "utilities/align.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/formatBuffer.hpp"
 #include "vmreg_x86.inline.hpp"
 #ifdef COMPILER1

src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp

@@ -51,6 +51,7 @@
 #include "runtime/synchronizer.hpp"
 #include "runtime/timer.hpp"
 #include "runtime/vframeArray.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/macros.hpp"
 

src/hotspot/cpu/x86/vm_version_x86.cpp

@@ -38,6 +38,7 @@
 #include "runtime/os.inline.hpp"
 #include "runtime/stubCodeGenerator.hpp"
 #include "runtime/vm_version.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/powerOfTwo.hpp"
 #include "utilities/virtualizationSupport.hpp"
 

src/hotspot/os/aix/attachListener_aix.cpp

@@ -29,6 +29,7 @@
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/os.inline.hpp"
 #include "services/attachListener.hpp"
+#include "utilities/checkedCast.hpp"
 
 #include <signal.h>
 #include <sys/socket.h>

src/hotspot/os/aix/os_aix.cpp

@@ -74,6 +74,7 @@
 #include "services/runtimeService.hpp"
 #include "signals_posix.hpp"
 #include "utilities/align.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/decoder.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/events.hpp"

src/hotspot/os/bsd/attachListener_bsd.cpp

@@ -28,6 +28,7 @@
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/os.inline.hpp"
 #include "services/attachListener.hpp"
+#include "utilities/checkedCast.hpp"
 
 #include <unistd.h>
 #include <signal.h>

src/hotspot/os/linux/attachListener_linux.cpp

@@ -29,6 +29,7 @@
 #include "runtime/os.inline.hpp"
 #include "os_posix.hpp"
 #include "services/attachListener.hpp"
+#include "utilities/checkedCast.hpp"
 
 #include <unistd.h>
 #include <signal.h>

src/hotspot/os/linux/os_linux.cpp

@@ -69,6 +69,7 @@
 #include "services/memTracker.hpp"
 #include "services/runtimeService.hpp"
 #include "utilities/align.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/decoder.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/events.hpp"

src/hotspot/os/posix/os_posix.cpp

@@ -42,6 +42,7 @@
 #include "runtime/park.hpp"
 #include "runtime/perfMemory.hpp"
 #include "utilities/align.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/events.hpp"

src/hotspot/os/posix/signals_posix.cpp

@@ -42,6 +42,7 @@
 #include "runtime/threadCrashProtection.hpp"
 #include "signals_posix.hpp"
 #include "suspendResume_posix.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/events.hpp"
 #include "utilities/ostream.hpp"
 #include "utilities/parseInteger.hpp"

src/hotspot/share/asm/assembler.cpp

@@ -32,6 +32,7 @@
 #include "runtime/icache.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/os.hpp"
+#include "utilities/checkedCast.hpp"
 
 // Implementation of AbstractAssembler
 //

src/hotspot/share/asm/assembler.hpp

@@ -30,6 +30,7 @@
 #include "code/oopRecorder.hpp"
 #include "code/relocInfo.hpp"
 #include "memory/allocation.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/growableArray.hpp"
 #include "utilities/macros.hpp"

src/hotspot/share/c1/c1_GraphBuilder.cpp

@@ -45,6 +45,7 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/vm_version.hpp"
 #include "utilities/bitMap.inline.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/powerOfTwo.hpp"
 #include "utilities/macros.hpp"
 #if INCLUDE_JFR

src/hotspot/share/classfile/bytecodeAssembler.cpp

@@ -31,6 +31,7 @@
 #include "oops/constantPool.hpp"
 #include "runtime/handles.inline.hpp"
 #include "utilities/bytes.hpp"
+#include "utilities/checkedCast.hpp"
 
 u2 BytecodeConstantPool::find_or_add(BytecodeCPEntry const& bcpe, TRAPS) {
 

src/hotspot/share/classfile/classFileParser.cpp

@@ -75,6 +75,7 @@
 #include "services/threadService.hpp"
 #include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/formatBuffer.hpp"
 #include "utilities/exceptions.hpp"

src/hotspot/share/classfile/classLoader.cpp

@@ -73,6 +73,7 @@
 #include "runtime/vm_version.hpp"
 #include "services/management.hpp"
 #include "services/threadService.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/classpathStream.hpp"
 #include "utilities/events.hpp"
 #include "utilities/macros.hpp"

src/hotspot/share/classfile/classLoaderExt.cpp

@@ -48,6 +48,7 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/java.hpp"
 #include "runtime/os.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/stringUtils.hpp"
 
 jshort ClassLoaderExt::_app_class_paths_start_index = ClassLoaderExt::max_classpath_index;

src/hotspot/share/classfile/stackMapTableFormat.hpp

@@ -26,6 +26,7 @@
 #define SHARE_CLASSFILE_STACKMAPTABLEFORMAT_HPP
 
 #include "classfile/verificationType.hpp"
+#include "utilities/checkedCast.hpp"
 
 // These classes represent the stack-map substructures described in the JVMS
 // (hence the non-conforming naming scheme).

src/hotspot/share/classfile/vmIntrinsics.cpp

@@ -29,6 +29,7 @@
 #include "jvm_constants.h"
 #include "jvm_io.h"
 #include "runtime/vm_version.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/tribool.hpp"
 #include "utilities/xmlstream.hpp"
 

src/hotspot/share/code/relocInfo.cpp

@@ -34,6 +34,7 @@
 #include "runtime/flags/flagSetting.hpp"
 #include "runtime/stubCodeGenerator.hpp"
 #include "utilities/align.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/copy.hpp"
 
 #include <new>

src/hotspot/share/code/relocInfo.hpp

@@ -28,6 +28,7 @@
 #include "memory/allocation.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "runtime/osInfo.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 

src/hotspot/share/code/stubs.cpp

@@ -30,6 +30,7 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "utilities/align.hpp"
+#include "utilities/checkedCast.hpp"
 
 
 // Implementation of StubQueue

src/hotspot/share/code/vmreg.hpp

@@ -28,6 +28,7 @@
 #include "asm/register.hpp"
 #include "code/vmregTypes.hpp"
 #include "runtime/globals.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"

src/hotspot/share/code/vtableStubs.hpp

@@ -28,6 +28,7 @@
 #include "asm/macroAssembler.hpp"
 #include "code/vmreg.hpp"
 #include "memory/allStatic.hpp"
+#include "utilities/checkedCast.hpp"
 
 // A VtableStub holds an individual code stub for a pair (vtable index, #args) for either itables or vtables
 // There's a one-to-one relationship between a VtableStub and such a pair.

src/hotspot/share/compiler/oopMap.hpp

@@ -30,6 +30,7 @@
 #include "memory/allocation.hpp"
 #include "memory/iterator.hpp"
 #include "oops/oopsHierarchy.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/growableArray.hpp"
 
 // Interface for generating the frame map for compiled code.  A frame map

src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 #include "gc/g1/g1CardSetContainers.hpp"
 #include "gc/g1/g1GCPhaseTimes.hpp"
 #include "utilities/bitMap.inline.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/spinYield.hpp"
 

src/hotspot/share/gc/x/xPage.inline.hpp

@@ -35,6 +35,7 @@
 #include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
 #include "utilities/align.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 
 inline uint8_t XPage::type_from_size(size_t size) const {

src/hotspot/share/gc/z/zPage.inline.hpp

@@ -39,6 +39,7 @@
 #include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
 #include "utilities/align.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 
 inline ZPageType ZPage::type_from_size(size_t size) const {

src/hotspot/share/interpreter/interpreterRuntime.cpp

@@ -73,6 +73,7 @@
 #include "runtime/synchronizer.hpp"
 #include "runtime/threadCritical.hpp"
 #include "utilities/align.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/events.hpp"
 #ifdef COMPILER2

src/hotspot/share/interpreter/rewriter.cpp

@@ -38,6 +38,7 @@
 #include "runtime/arguments.hpp"
 #include "runtime/fieldDescriptor.inline.hpp"
 #include "runtime/handles.inline.hpp"
+#include "utilities/checkedCast.hpp"
 
 // Computes a CPC map (new_index -> original_index) for constant pool entries
 // that are referred to by the interpreter at runtime via the constant pool cache.

src/hotspot/share/interpreter/templateInterpreter.cpp

@@ -34,6 +34,7 @@
 #include "prims/jvmtiExport.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/timerTrace.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/copy.hpp"
 
 # define __ _masm->

src/hotspot/share/memory/heap.cpp

@@ -29,6 +29,7 @@
 #include "runtime/mutexLocker.hpp"
 #include "services/memTracker.hpp"
 #include "utilities/align.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/powerOfTwo.hpp"
 
 // Implementation of Heap

src/hotspot/share/oops/constMethod.cpp

@@ -32,6 +32,7 @@
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/signature.hpp"
 #include "utilities/align.hpp"
+#include "utilities/checkedCast.hpp"
 
 // Static initialization
 const u2 ConstMethod::MAX_IDNUM   = 0xFFFE;

src/hotspot/share/oops/constMethod.hpp

@@ -28,6 +28,7 @@
 #include "oops/constMethodFlags.hpp"
 #include "oops/oop.hpp"
 #include "utilities/align.hpp"
+#include "utilities/checkedCast.hpp"
 
 // An ConstMethod represents portions of a Java method which are not written to after
 // the classfile is parsed(*see below).  This part of the method can be shared across

src/hotspot/share/oops/constantPool.cpp

@@ -64,6 +64,7 @@
 #include "runtime/javaThread.hpp"
 #include "runtime/signature.hpp"
 #include "runtime/vframe.inline.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/copy.hpp"
 
 ConstantPool* ConstantPool::allocate(ClassLoaderData* loader_data, int length, TRAPS) {

src/hotspot/share/oops/fieldInfo.inline.hpp

@@ -31,6 +31,7 @@
 #include "oops/constantPool.hpp"
 #include "oops/symbol.hpp"
 #include "runtime/atomic.hpp"
+#include "utilities/checkedCast.hpp"
 
 inline Symbol* FieldInfo::name(ConstantPool* cp) const {
   int index = _name_index;

src/hotspot/share/oops/methodData.cpp

@@ -43,6 +43,7 @@
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/signature.hpp"
 #include "utilities/align.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/copy.hpp"
 
 // ==================================================================

src/hotspot/share/oops/resolvedFieldEntry.hpp

@@ -28,6 +28,7 @@
 #include "interpreter/bytecodes.hpp"
 #include "oops/instanceKlass.hpp"
 #include "runtime/atomic.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/sizes.hpp"
 
 // ResolvedFieldEntry contains the resolution information for field related bytecodes like

src/hotspot/share/opto/castnode.cpp

@@ -32,6 +32,7 @@
 #include "opto/subnode.hpp"
 #include "opto/type.hpp"
 #include "castnode.hpp"
+#include "utilities/checkedCast.hpp"
 
 //=============================================================================
 // If input is already higher or equal to cast type, then this is an identity.

src/hotspot/share/opto/convertnode.cpp

@@ -32,6 +32,7 @@
 #include "opto/phaseX.hpp"
 #include "opto/subnode.hpp"
 #include "runtime/stubRoutines.hpp"
+#include "utilities/checkedCast.hpp"
 
 //=============================================================================
 //------------------------------Identity---------------------------------------

src/hotspot/share/opto/loopnode.cpp

@@ -47,6 +47,7 @@
 #include "opto/runtime.hpp"
 #include "opto/superword.hpp"
 #include "runtime/sharedRuntime.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/powerOfTwo.hpp"
 
 //=============================================================================

src/hotspot/share/opto/loopnode.hpp

@@ -30,6 +30,7 @@
 #include "opto/phaseX.hpp"
 #include "opto/subnode.hpp"
 #include "opto/type.hpp"
+#include "utilities/checkedCast.hpp"
 
 class CmpNode;
 class BaseCountedLoopEndNode;

src/hotspot/share/opto/type.cpp

@@ -39,6 +39,7 @@
 #include "opto/node.hpp"
 #include "opto/opcodes.hpp"
 #include "opto/type.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/powerOfTwo.hpp"
 #include "utilities/stringUtils.hpp"
 

src/hotspot/share/prims/forte.cpp

@@ -35,6 +35,7 @@
 #include "runtime/javaThread.inline.hpp"
 #include "runtime/vframe.inline.hpp"
 #include "runtime/vframeArray.hpp"
+#include "utilities/checkedCast.hpp"
 
 // call frame copied from old .h file and renamed
 typedef struct {

src/hotspot/share/prims/jvm.cpp

@@ -95,6 +95,7 @@
 #include "services/attachListener.hpp"
 #include "services/management.hpp"
 #include "services/threadService.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/dtrace.hpp"

src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp

@@ -34,6 +34,7 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/signature.hpp"
 #include "utilities/bytes.hpp"
+#include "utilities/checkedCast.hpp"
 
 // FIXME: add Deprecated attribute
 // FIXME: fix Synthetic attribute

src/hotspot/share/prims/jvmtiRedefineClasses.cpp

@@ -62,6 +62,7 @@
 #include "runtime/relocator.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "utilities/bitMap.inline.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/events.hpp"
 
 Array<Method*>* VM_RedefineClasses::_old_methods = nullptr;

src/hotspot/share/prims/upcallLinker.cpp

@@ -31,6 +31,7 @@
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/javaCalls.hpp"
 #include "runtime/jniHandles.inline.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 #define FOREIGN_ABI "jdk/internal/foreign/abi/"

src/hotspot/share/prims/vmstorage.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 #include <cstdint>
 
 #include "code/vmreg.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/ostream.hpp"
 

src/hotspot/share/prims/whitebox.cpp

@@ -93,6 +93,7 @@
 #include "services/memoryService.hpp"
 #include "services/memTracker.hpp"
 #include "utilities/align.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/elfFile.hpp"
 #include "utilities/exceptions.hpp"

src/hotspot/share/runtime/arguments.cpp

@@ -60,6 +60,7 @@
 #include "services/management.hpp"
 #include "services/nmtCommon.hpp"
 #include "utilities/align.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/macros.hpp"

src/hotspot/share/runtime/deoptimization.cpp

@@ -89,6 +89,7 @@
 #include "runtime/vframeArray.hpp"
 #include "runtime/vframe_hp.hpp"
 #include "runtime/vmOperations.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/events.hpp"
 #include "utilities/growableArray.hpp"
 #include "utilities/macros.hpp"

src/hotspot/share/runtime/frame.hpp

@@ -30,6 +30,7 @@
 #include "oops/oopsHierarchy.hpp"
 #include "runtime/basicLock.hpp"
 #include "runtime/monitorChunk.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/growableArray.hpp"
 #include "utilities/macros.hpp"
 #ifdef ZERO

src/hotspot/share/runtime/jfieldIDWorkaround.hpp

@@ -25,6 +25,8 @@
 #ifndef SHARE_RUNTIME_JFIELDIDWORKAROUND_HPP
 #define SHARE_RUNTIME_JFIELDIDWORKAROUND_HPP
 
+#include "utilities/checkedCast.hpp"
+
 class jfieldIDWorkaround: AllStatic {
   // This workaround is because JVMTI doesn't have distinct entry points
   // for methods that use static jfieldIDs and instance jfieldIDs.

src/hotspot/share/runtime/objectMonitor.hpp

@@ -30,6 +30,7 @@
 #include "oops/markWord.hpp"
 #include "oops/weakHandle.hpp"
 #include "runtime/perfDataTypes.hpp"
+#include "utilities/checkedCast.hpp"
 
 class ObjectMonitor;
 class ParkEvent;

src/hotspot/share/runtime/os.cpp

@@ -70,6 +70,7 @@
 #include "services/nmtCommon.hpp"
 #include "services/threadService.hpp"
 #include "utilities/align.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/count_trailing_zeros.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/events.hpp"

src/hotspot/share/runtime/relocator.cpp

@@ -31,6 +31,7 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/relocator.hpp"
+#include "utilities/checkedCast.hpp"
 
 #define MAX_METHOD_LENGTH  65535
 

src/hotspot/share/runtime/threadHeapSampler.cpp

@@ -31,6 +31,7 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/threadHeapSampler.hpp"
+#include "utilities/checkedCast.hpp"
 
 // Cheap random number generator.
 uint64_t ThreadHeapSampler::_rnd;

src/hotspot/share/services/heapDumper.cpp

@@ -59,6 +59,7 @@
 #include "services/heapDumper.hpp"
 #include "services/heapDumperCompression.hpp"
 #include "services/threadService.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
 

src/hotspot/share/services/nmtPreInit.hpp

@@ -31,6 +31,7 @@
 #include "runtime/atomic.hpp"
 #endif
 #include "services/memTracker.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"

src/hotspot/share/utilities/align.hpp

@@ -26,6 +26,7 @@
 #define SHARE_UTILITIES_ALIGN_HPP
 
 #include "metaprogramming/enableIf.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/powerOfTwo.hpp"

src/hotspot/share/utilities/checkedCast.hpp

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_UTILITIES_CHECKEDCAST_HPP
+#define SHARE_UTILITIES_CHECKEDCAST_HPP
+
+#include "utilities/debug.hpp"
+
+// In many places we've added C-style casts to silence compiler
+// warnings, for example when truncating a size_t to an int when we
+// know the size_t is a small struct. Such casts are risky because
+// they effectively disable useful compiler warnings. We can make our
+// lives safer with this function, which ensures that any cast is
+// reversible without loss of information. It doesn't check
+// everything: it isn't intended to make sure that pointer types are
+// compatible, for example.
+template <typename T2, typename T1>
+constexpr T2 checked_cast(T1 thing) {
+  T2 result = static_cast<T2>(thing);
+  assert(static_cast<T1>(result) == thing, "must be");
+  return result;
+}
+
+#endif // SHARE_UTILITIES_CHECKEDCAST_HPP
+

src/hotspot/share/utilities/elfFile.cpp

@@ -29,6 +29,7 @@
 #include "jvm_io.h"
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/decoder.hpp"
 #include "utilities/elfFile.hpp"
 #include "utilities/elfFuncDescTable.hpp"

src/hotspot/share/utilities/elfFile.hpp

@@ -70,6 +70,7 @@ typedef Elf32_Sym       Elf_Sym;
 #include "jvm_md.h"
 #include "globalDefinitions.hpp"
 #include "memory/allocation.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/decoder.hpp"
 
 #ifdef ASSERT

src/hotspot/share/utilities/elfSymbolTable.cpp

@@ -27,6 +27,7 @@
 #if !defined(_WINDOWS) && !defined(__APPLE__)
 
 #include "memory/allocation.inline.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/elfFuncDescTable.hpp"
 #include "utilities/elfSymbolTable.hpp"
 

src/hotspot/share/utilities/globalDefinitions.hpp

@@ -475,6 +475,16 @@ inline size_t pointer_delta(const MetaWord* left, const MetaWord* right) {
   return pointer_delta(left, right, sizeof(MetaWord));
 }
 
+// pointer_delta_as_int is called to do pointer subtraction for nearby pointers that
+// returns a non-negative int, usually used as a size of a code buffer range.
+// This scales to sizeof(T).
+template <typename T>
+inline int pointer_delta_as_int(const volatile T* left, const volatile T* right) {
+  size_t delta = pointer_delta(left, right, sizeof(T));
+  assert(delta <= size_t(INT_MAX), "pointer delta out of range: %zu", delta);
+  return static_cast<int>(delta);
+}
+
 //
 // ANSI C++ does not allow casting from one pointer type to a function pointer
 // directly without at best a warning. This macro accomplishes it silently
@@ -491,29 +501,6 @@ inline size_t pointer_delta(const MetaWord* left, const MetaWord* right) {
 #define CAST_TO_FN_PTR(func_type, value) (reinterpret_cast<func_type>(value))
 #define CAST_FROM_FN_PTR(new_type, func_ptr) ((new_type)((uintptr_t)(func_ptr)))
 
-// In many places we've added C-style casts to silence compiler
-// warnings, for example when truncating a size_t to an int when we
-// know the size_t is a small struct. Such casts are risky because
-// they effectively disable useful compiler warnings. We can make our
-// lives safer with this function, which ensures that any cast is
-// reversible without loss of information. It doesn't check
-// everything: it isn't intended to make sure that pointer types are
-// compatible, for example.
-template <typename T2, typename T1>
-constexpr T2 checked_cast(T1 thing) {
-  T2 result = static_cast<T2>(thing);
-  assert(static_cast<T1>(result) == thing, "must be");
-  return result;
-}
-
-// pointer_delta_as_int is called to do pointer subtraction for nearby pointers that
-// returns a non-negative int, usually used as a size of a code buffer range.
-// This scales to sizeof(T).
-template <typename T>
-inline int pointer_delta_as_int(const volatile T* left, const volatile T* right) {
-  return checked_cast<int>(pointer_delta(left, right, sizeof(T)));
-}
-
 // Need the correct linkage to call qsort without warnings
 extern "C" {
   typedef int (*_sort_Fn)(const void *, const void *);

src/hotspot/share/utilities/population_count.hpp

@@ -26,6 +26,7 @@
 #define SHARE_UTILITIES_POPULATION_COUNT_HPP
 
 #include "metaprogramming/enableIf.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"