Changes for making java.lang.Integer

arjunhkumar · Nov 11, 2023 · 6d47bb5 · 6d47bb5
1 parent 320e17e
commit 6d47bb5
Show file tree

Hide file tree

Showing 100 changed files with 508 additions and 244 deletions.
diff --git a/closed/src/java.base/share/classes/com/sun/crypto/provider/NativeCipherBlockChaining.java b/closed/src/java.base/share/classes/com/sun/crypto/provider/NativeCipherBlockChaining.java
@@ -52,7 +52,7 @@ class NativeCipherBlockChaining extends FeedbackCipher  {
 
     protected final static int numContexts = 4096;
     protected static long[] contexts;
-    protected static ArrayDeque<Integer> avStack = new ArrayDeque<Integer>(numContexts);
+    protected static ArrayDeque<Integer.ref> avStack = new ArrayDeque<Integer.ref>(numContexts);
 
     private static final NativeCrypto nativeCrypto;
     private static final Cleaner contextCleaner;

diff --git a/make/CompileToolsJdk.gmk b/make/CompileToolsJdk.gmk
@@ -54,7 +54,7 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_JDK, \
         , \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \
     DISABLED_WARNINGS := options, \
-    JAVAC_FLAGS := \
+    JAVAC_FLAGS := -XDenablePrimitiveClasses\
         --add-exports java.desktop/sun.awt=ALL-UNNAMED \
         --add-exports java.base/sun.text=ALL-UNNAMED \
         --add-exports java.base/sun.security.util=ALL-UNNAMED, \

diff --git a/make/javac.20231110_055857.args b/make/javac.20231110_055857.args
@@ -0,0 +1,33 @@
+-g
+-Xlint:all
+-source
+21
+-target
+21
+-implicit:none
+-Xprefer:source
+-XDignore.symbol.file=true
+-encoding
+ascii
+-XDenablePrimitiveClasses
+-Xdoclint:all/protected
+-Xdoclint/package:java.*,javax.*
+-XDenablePrimitiveClasses
+-XDstringConcat=inline
+--module-source-path
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/gensrc/*:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/linux/classes:/openj9-openjdk-jdk.valuetypes/src/*/linux/classes:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/unix/classes:/openj9-openjdk-jdk.valuetypes/src/*/unix/classes:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/share/classes:/openj9-openjdk-jdk.valuetypes/src/*/share/classes
+--module-path
+
+--system
+none
+-classpath
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/buildtools/depend
+"-Xplugin:depend /openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_pubapi"
+-XDinternalAPIPath=/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_internalapi
+-XDLOG_LEVEL=warn
+-XDmodifiedInputs=/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_batch.modfiles.fixed
+-d
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules
+-h
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/headers.java.base.tmp
+@/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_batch.filelist
diff --git a/make/javac.20231110_060543.args b/make/javac.20231110_060543.args
@@ -0,0 +1,33 @@
+-g
+-Xlint:all
+-source
+21
+-target
+21
+-implicit:none
+-Xprefer:source
+-XDignore.symbol.file=true
+-encoding
+ascii
+-XDenablePrimitiveClasses
+-Xdoclint:all/protected
+-Xdoclint/package:java.*,javax.*
+-XDenablePrimitiveClasses
+-XDstringConcat=inline
+--module-source-path
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/gensrc/*:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/linux/classes:/openj9-openjdk-jdk.valuetypes/src/*/linux/classes:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/unix/classes:/openj9-openjdk-jdk.valuetypes/src/*/unix/classes:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/share/classes:/openj9-openjdk-jdk.valuetypes/src/*/share/classes
+--module-path
+
+--system
+none
+-classpath
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/buildtools/depend
+"-Xplugin:depend /openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_pubapi"
+-XDinternalAPIPath=/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_internalapi
+-XDLOG_LEVEL=warn
+-XDmodifiedInputs=/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_batch.modfiles.fixed
+-d
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules
+-h
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/headers.java.base.tmp
+@/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_batch.filelist
diff --git a/make/javac.20231110_062409.args b/make/javac.20231110_062409.args
@@ -0,0 +1,33 @@
+-g
+-Xlint:all
+-source
+21
+-target
+21
+-implicit:none
+-Xprefer:source
+-XDignore.symbol.file=true
+-encoding
+ascii
+-XDenablePrimitiveClasses
+-Xdoclint:all/protected
+-Xdoclint/package:java.*,javax.*
+-XDenablePrimitiveClasses
+-XDstringConcat=inline
+--module-source-path
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/gensrc/*:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/linux/classes:/openj9-openjdk-jdk.valuetypes/src/*/linux/classes:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/unix/classes:/openj9-openjdk-jdk.valuetypes/src/*/unix/classes:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/share/classes:/openj9-openjdk-jdk.valuetypes/src/*/share/classes
+--module-path
+
+--system
+none
+-classpath
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/buildtools/depend
+"-Xplugin:depend /openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_pubapi"
+-XDinternalAPIPath=/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_internalapi
+-XDLOG_LEVEL=warn
+-XDmodifiedInputs=/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_batch.modfiles.fixed
+-d
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules
+-h
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/headers.java.base.tmp
+@/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_batch.filelist
diff --git a/make/javac.20231110_070604.args b/make/javac.20231110_070604.args
@@ -0,0 +1,33 @@
+-g
+-Xlint:all
+-source
+21
+-target
+21
+-implicit:none
+-Xprefer:source
+-XDignore.symbol.file=true
+-encoding
+ascii
+-XDenablePrimitiveClasses
+-Xdoclint:all/protected
+-Xdoclint/package:java.*,javax.*
+-XDenablePrimitiveClasses
+-XDstringConcat=inline
+--module-source-path
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/gensrc/*:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/linux/classes:/openj9-openjdk-jdk.valuetypes/src/*/linux/classes:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/unix/classes:/openj9-openjdk-jdk.valuetypes/src/*/unix/classes:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/share/classes:/openj9-openjdk-jdk.valuetypes/src/*/share/classes
+--module-path
+
+--system
+none
+-classpath
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/buildtools/depend
+"-Xplugin:depend /openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_pubapi"
+-XDinternalAPIPath=/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_internalapi
+-XDLOG_LEVEL=warn
+-XDmodifiedInputs=/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_batch.modfiles.fixed
+-d
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules
+-h
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/headers.java.base.tmp
+@/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_batch.filelist
diff --git a/make/javac.20231110_112050.args b/make/javac.20231110_112050.args
@@ -0,0 +1,33 @@
+-g
+-Xlint:all
+-source
+21
+-target
+21
+-implicit:none
+-Xprefer:source
+-XDignore.symbol.file=true
+-encoding
+ascii
+-XDenablePrimitiveClasses
+-Xdoclint:all/protected
+-Xdoclint/package:java.*,javax.*
+-XDenablePrimitiveClasses
+-XDstringConcat=inline
+--module-source-path
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/gensrc/*:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/linux/classes:/openj9-openjdk-jdk.valuetypes/src/*/linux/classes:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/unix/classes:/openj9-openjdk-jdk.valuetypes/src/*/unix/classes:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/share/classes:/openj9-openjdk-jdk.valuetypes/src/*/share/classes
+--module-path
+
+--system
+none
+-classpath
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/buildtools/depend
+"-Xplugin:depend /openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_pubapi"
+-XDinternalAPIPath=/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_internalapi
+-XDLOG_LEVEL=warn
+-XDmodifiedInputs=/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_batch.modfiles.fixed
+-d
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules
+-h
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/headers.java.base.tmp
+@/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_batch.filelist
diff --git a/make/javac.20231110_142616.args b/make/javac.20231110_142616.args
@@ -0,0 +1,33 @@
+-g
+-Xlint:all
+-source
+21
+-target
+21
+-implicit:none
+-Xprefer:source
+-XDignore.symbol.file=true
+-encoding
+ascii
+-XDenablePrimitiveClasses
+-Xdoclint:all/protected
+-Xdoclint/package:java.*,javax.*
+-XDenablePrimitiveClasses
+-XDstringConcat=inline
+--module-source-path
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/gensrc/*:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/linux/classes:/openj9-openjdk-jdk.valuetypes/src/*/linux/classes:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/unix/classes:/openj9-openjdk-jdk.valuetypes/src/*/unix/classes:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/share/classes:/openj9-openjdk-jdk.valuetypes/src/*/share/classes
+--module-path
+
+--system
+none
+-classpath
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/buildtools/depend
+"-Xplugin:depend /openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_pubapi"
+-XDinternalAPIPath=/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_internalapi
+-XDLOG_LEVEL=warn
+-XDmodifiedInputs=/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_batch.modfiles.fixed
+-d
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules
+-h
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/headers.java.base.tmp
+@/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_batch.filelist
diff --git a/make/javac.20231110_175011.args b/make/javac.20231110_175011.args
@@ -0,0 +1,33 @@
+-g
+-Xlint:all
+-source
+21
+-target
+21
+-implicit:none
+-Xprefer:source
+-XDignore.symbol.file=true
+-encoding
+ascii
+-XDenablePrimitiveClasses
+-Xdoclint:all/protected
+-Xdoclint/package:java.*,javax.*
+-XDenablePrimitiveClasses
+-XDstringConcat=inline
+--module-source-path
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/gensrc/*:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/linux/classes:/openj9-openjdk-jdk.valuetypes/src/*/linux/classes:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/unix/classes:/openj9-openjdk-jdk.valuetypes/src/*/unix/classes:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/share/classes:/openj9-openjdk-jdk.valuetypes/src/*/share/classes
+--module-path
+
+--system
+none
+-classpath
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/buildtools/depend
+"-Xplugin:depend /openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_pubapi"
+-XDinternalAPIPath=/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_internalapi
+-XDLOG_LEVEL=warn
+-XDmodifiedInputs=/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_batch.modfiles.fixed
+-d
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules
+-h
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/headers.java.base.tmp
+@/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_batch.filelist
diff --git a/make/javac.20231110_175623.args b/make/javac.20231110_175623.args
@@ -0,0 +1,33 @@
+-g
+-Xlint:all
+-source
+21
+-target
+21
+-implicit:none
+-Xprefer:source
+-XDignore.symbol.file=true
+-encoding
+ascii
+-XDenablePrimitiveClasses
+-Xdoclint:all/protected
+-Xdoclint/package:java.*,javax.*
+-XDenablePrimitiveClasses
+-XDstringConcat=inline
+--module-source-path
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/gensrc/*:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/linux/classes:/openj9-openjdk-jdk.valuetypes/src/*/linux/classes:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/unix/classes:/openj9-openjdk-jdk.valuetypes/src/*/unix/classes:/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/j9jcl/*/share/classes:/openj9-openjdk-jdk.valuetypes/src/*/share/classes
+--module-path
+
+--system
+none
+-classpath
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/buildtools/depend
+"-Xplugin:depend /openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_pubapi"
+-XDinternalAPIPath=/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_internalapi
+-XDLOG_LEVEL=warn
+-XDmodifiedInputs=/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_batch.modfiles.fixed
+-d
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules
+-h
+/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/support/headers.java.base.tmp
+@/openj9-openjdk-jdk.valuetypes/build/linux-x86_64-server-release/jdk/modules/java.base/_the.java.base_batch.filelist
diff --git a/make/modules/jdk.compiler/Gendata.gmk b/make/modules/jdk.compiler/Gendata.gmk
@@ -58,7 +58,7 @@ $(eval $(call SetupJavaCompilation, COMPILE_CREATE_SYMBOLS, \
     INCLUDES := build/tools/symbolgenerator com/sun/tools/classfile, \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/create_symbols, \
     DISABLED_WARNINGS := options, \
-    JAVAC_FLAGS := \
+    JAVAC_FLAGS := -XDenablePrimitiveClasses\
         $(INTERIM_LANGTOOLS_ARGS) \
         $(COMPILECREATESYMBOLS_ADD_EXPORTS), \
 ))

diff --git a/make/modules/jdk.javadoc/Gendata.gmk b/make/modules/jdk.javadoc/Gendata.gmk
@@ -56,7 +56,7 @@ $(eval $(call SetupJavaCompilation, COMPILE_CREATE_SYMBOLS, \
     INCLUDES := build/tools/symbolgenerator com/sun/tools/classfile, \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/create_symbols_javadoc, \
     DISABLED_WARNINGS := options, \
-    JAVAC_FLAGS := \
+    JAVAC_FLAGS := -XDenablePrimitiveClasses\
         $(INTERIM_LANGTOOLS_ARGS) \
         $(COMPILECREATESYMBOLS_ADD_EXPORTS), \
 ))

diff --git a/make/test/BuildFailureHandler.gmk b/make/test/BuildFailureHandler.gmk
@@ -55,7 +55,7 @@ $(eval $(call SetupJavaCompilation, BUILD_FAILURE_HANDLER, \
     COPY := .properties, \
     CLASSPATH := $(JTREG_JAR) $(TOOLS_JAR), \
     JAR := $(FH_JAR), \
-    JAVAC_FLAGS := -XDstringConcat=inline, \
+    JAVAC_FLAGS := -XDenablePrimitiveClasses -XDstringConcat=inline, \
 ))
 
 TARGETS += $(BUILD_FAILURE_HANDLER)

diff --git a/make/test/BuildMicrobenchmark.gmk b/make/test/BuildMicrobenchmark.gmk
@@ -78,7 +78,7 @@ $(eval $(call SetupJavaCompilation, BUILD_INDIFY, \
     INCLUDE_FILES := indify/Indify.java, \
     DISABLED_WARNINGS := rawtypes serial options, \
     BIN := $(MICROBENCHMARK_TOOLS_CLASSES), \
-    JAVAC_FLAGS := -XDstringConcat=inline -Xprefer:newer, \
+    JAVAC_FLAGS := -XDenablePrimitiveClasses -XDstringConcat=inline -Xprefer:newer, \
 ))
 
 #### Compile Targets
@@ -94,7 +94,7 @@ $(eval $(call SetupJavaCompilation, BUILD_JDK_MICROBENCHMARK, \
     DISABLED_WARNINGS := processing rawtypes unchecked cast serial preview deprecation, \
     SRC := $(MICROBENCHMARK_SRC), \
     BIN := $(MICROBENCHMARK_CLASSES), \
-    JAVAC_FLAGS := --add-exports java.base/sun.security.util=ALL-UNNAMED \
+    JAVAC_FLAGS := -XDenablePrimitiveClasses --add-exports java.base/sun.security.util=ALL-UNNAMED \
         --add-exports java.base/sun.invoke.util=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.vm=ALL-UNNAMED \
         -XDenablePrimitiveClasses \

diff --git a/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java b/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java
@@ -63,7 +63,7 @@ class EPollSelectorImpl extends SelectorImpl {
     private final EventFD eventfd;
 
     // maps file descriptor to selection key, synchronize on selector
-    private final Map<Integer, SelectionKeyImpl> fdToKey = new HashMap<>();
+    private final Map<Integer.ref, SelectionKeyImpl> fdToKey = new HashMap<>();
 
     // pending new registrations/updates, queued by setEventOps
     private final Object updateLock = new Object();

diff --git a/src/java.base/linux/classes/sun/nio/fs/LinuxWatchService.java b/src/java.base/linux/classes/sun/nio/fs/LinuxWatchService.java
@@ -179,7 +179,7 @@ private static class Poller extends AbstractPoller {
         // socketpair used to shutdown polling thread
         private final int socketpair[];
         // maps watch descriptor to Key
-        private final Map<Integer,LinuxWatchKey> wdToKey;
+        private final Map<Integer.ref,LinuxWatchKey> wdToKey;
         // address of read buffer
         private final long address;
 

diff --git a/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java b/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java
@@ -89,7 +89,7 @@ final class ConditionalSpecialCasing {
     };
 
     // A hash table that contains the above entries
-    private static final HashMap<Integer, HashSet<Entry>> entryTable = new HashMap<>();
+    private static final HashMap<Integer.ref, HashSet<Entry>> entryTable = new HashMap<>();
     static {
         // create hashtable from the entry
         for (Entry cur : entry) {

diff --git a/src/java.base/share/classes/java/lang/PinnedThreadPrinter.java b/src/java.base/share/classes/java/lang/PinnedThreadPrinter.java
@@ -60,12 +60,12 @@ protected Hashes computeValue(Class<?> type) {
     };
 
     @SuppressWarnings("serial")
-    private static class Hashes extends LinkedHashMap<Integer, Boolean> {
+    private static class Hashes extends LinkedHashMap<Integer.ref, Boolean> {
         boolean add(int hash) {
             return (putIfAbsent(hash, Boolean.TRUE) == null);
         }
         @Override
-        protected boolean removeEldestEntry(Map.Entry<Integer, Boolean> oldest) {
+        protected boolean removeEldestEntry(Map.Entry<Integer.ref, Boolean> oldest) {
             // limit number of hashes
             return size() > 8;
         }

diff --git a/src/java.base/share/classes/java/lang/ProcessHandleImpl.java b/src/java.base/share/classes/java/lang/ProcessHandleImpl.java
@@ -107,7 +107,7 @@ final class ProcessHandleImpl implements ProcessHandle {
                 return Executors.newCachedThreadPool(threadFactory);
             });
 
-    private static class ExitCompletion extends CompletableFuture<Integer> {
+    private static class ExitCompletion extends CompletableFuture<Integer.ref> {
         final boolean isReaping;
 
         ExitCompletion(boolean isReaping) {
@@ -137,7 +137,7 @@ private static void privilegedThreadSetDaemon(Thread thread, boolean on) {
      *
      * @param shouldReap true if the exit value should be reaped
      */
-    static CompletableFuture<Integer> completion(long pid, boolean shouldReap) {
+    static CompletableFuture<Integer.ref> completion(long pid, boolean shouldReap) {
         // check canonicalizing cache 1st
         ExitCompletion completion = completions.get(pid);
         // re-try until we get a completion that shouldReap => isReaping