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
index f6789c25331..9669ac25f4c 100755
--- 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
index f56b4f3ce47..5415dbfbc8b 100755
--- 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
new file mode 100644
index 00000000000..2646ad91eea
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..2646ad91eea
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..2646ad91eea
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..2646ad91eea
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..2646ad91eea
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..2646ad91eea
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..2646ad91eea
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..2646ad91eea
--- /dev/null
+++ 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
index 5471fa1127c..f18426a6d49 100755
--- 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
index 69c93c29468..485befc3599 100755
--- 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
index e69c9bf6fea..dbe53c8b68d 100755
--- 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
index 0644f073ce5..f113f7e779e 100755
--- 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
index e13fe4c93f3..c8e0236fdb3 100755
--- 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
index 863b8cd7aff..802ed0583af 100755
--- 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
index 17ec3601ec6..070118d9697 100755
--- 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
index 02e0683a1b9..a8c230d9da9 100755
--- 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
index 7dd6bf6a5e4..4add4a8d983 100755
--- 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
diff --git a/src/java.base/share/classes/java/lang/Runtime.java b/src/java.base/share/classes/java/lang/Runtime.java
index 25d2351a24e..b29a5543fcb 100755
--- a/src/java.base/share/classes/java/lang/Runtime.java
+++ b/src/java.base/share/classes/java/lang/Runtime.java
@@ -1027,9 +1027,9 @@ public static Version version() {
     public static final class Version
         implements Comparable<Version>
     {
-        private final List<Integer>     version;
+        private final List<Integer.ref>     version;
         private final Optional<String>  pre;
-        private final Optional<Integer> build;
+        private final Optional<Integer.ref> build;
         private final Optional<String>  optional;
 
         /*
@@ -1038,9 +1038,9 @@ public static final class Version
          * unmodifiable list, the caller MUST hand the list over to this
          * constructor and never change the underlying list.
          */
-        private Version(List<Integer> unmodifiableListOfVersions,
+        private Version(List<Integer.ref> unmodifiableListOfVersions,
                         Optional<String> pre,
-                        Optional<Integer> build,
+                        Optional<Integer.ref> build,
                         Optional<String> optional)
         {
             this.version = unmodifiableListOfVersions;
@@ -1249,7 +1249,7 @@ public int security() {
          * @return  An unmodifiable list of the integers
          *          represented in the version number
          */
-        public List<Integer> version() {
+        public List<Integer.ref> version() {
             return version;
         }
 
@@ -1267,7 +1267,7 @@ public Optional<String> pre() {
          *
          * @return  The optional build number.
          */
-        public Optional<Integer> build() {
+        public Optional<Integer.ref> build() {
             return build;
         }
 
diff --git a/src/java.base/share/classes/java/lang/VersionProps.java.template b/src/java.base/share/classes/java/lang/VersionProps.java.template
index d58be681f55..d65dcfa3cca 100755
--- a/src/java.base/share/classes/java/lang/VersionProps.java.template
+++ b/src/java.base/share/classes/java/lang/VersionProps.java.template
@@ -130,7 +130,7 @@ class VersionProps {
     }
 
     // This method is reflectively used by regression tests.
-    static List<Integer> parseVersionNumbers(String version) {
+    static List<Integer.ref> parseVersionNumbers(String version) {
         // Let's find the size of an array required to hold $VNUM components
         int size = 0;
         int prevIndex = 0;
@@ -159,7 +159,7 @@ class VersionProps {
         return List.of(verNumbers);
     }
 
-    static List<Integer> versionNumbers() {
+    static List<Integer.ref> versionNumbers() {
         return parseVersionNumbers(VERSION_NUMBER);
     }
 
@@ -167,7 +167,7 @@ class VersionProps {
         return optionalOf(VERSION_PRE);
     }
 
-    static Optional<Integer> build() {
+    static Optional<Integer.ref> build() {
         return VERSION_BUILD.isEmpty() ?
                 Optional.empty() :
                 Optional.of(Integer.parseInt(VERSION_BUILD));
diff --git a/src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java b/src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java
index 98bd1b7c034..5caf2fc0074 100755
--- a/src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java
+++ b/src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java
@@ -609,12 +609,12 @@ public ProtectionDomain run() {
         private final int SPECIES_DATA_MODS = sdAccessor.getModifiers();
         private final List<String> TRANSFORM_NAMES;  // derived from transformMethods
         private final List<MethodType> TRANSFORM_TYPES;
-        private final List<Integer> TRANSFORM_MODS;
+        private final List<Integer.ref> TRANSFORM_MODS;
         {
             // Tear apart transformMethods to get the names, types, and modifiers.
             List<String> tns = new ArrayList<>();
             List<MethodType> tts = new ArrayList<>();
-            List<Integer> tms = new ArrayList<>();
+            List<Integer.ref> tms = new ArrayList<>();
             for (int i = 0; i < transformMethods.size(); i++) {
                 MemberName tm = transformMethods.get(i);
                 tns.add(tm.getName());
diff --git a/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java b/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java
index fd5621379a7..6ba02e8095b 100755
--- a/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java
+++ b/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java
@@ -49,7 +49,7 @@
  */
 class GenerateJLIClassesHelper {
     // Map from DirectMethodHandle method type name to index to LambdForms
-    static final Map<String, Integer> DMH_METHOD_TYPE_MAP =
+    static final Map<String, Integer.ref> DMH_METHOD_TYPE_MAP =
             Map.of(
                     DIRECT_INVOKE_VIRTUAL.methodName,     LF_INVVIRTUAL,
                     DIRECT_INVOKE_STATIC.methodName,      LF_INVSTATIC,
diff --git a/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java b/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
index 4b2b7066fca..1a1ef0a0bc0 100755
--- a/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
+++ b/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
@@ -173,7 +173,7 @@ private InvokerBytecodeGenerator(String name, LambdaForm form, MethodType invoke
     }
 
     /** instance counters for dumped classes */
-    private static final HashMap<String,Integer> DUMP_CLASS_FILES_COUNTERS;
+    private static final HashMap<String,Integer.ref> DUMP_CLASS_FILES_COUNTERS;
     /** debugging flag for saving generated class files */
     private static final File DUMP_CLASS_FILES_DIR;
 
diff --git a/src/java.base/share/classes/java/lang/invoke/LambdaForm.java b/src/java.base/share/classes/java/lang/invoke/LambdaForm.java
index 911756d5d1a..9703891a43a 100755
--- a/src/java.base/share/classes/java/lang/invoke/LambdaForm.java
+++ b/src/java.base/share/classes/java/lang/invoke/LambdaForm.java
@@ -1816,7 +1816,7 @@ private static void createFormsFor(BasicType type) {
     @interface Compiled {
     }
 
-    private static final HashMap<String,Integer> DEBUG_NAME_COUNTERS;
+    private static final HashMap<String,Integer.ref> DEBUG_NAME_COUNTERS;
     private static final HashMap<LambdaForm,String> DEBUG_NAMES;
     static {
         if (debugEnabled()) {
diff --git a/src/java.base/share/classes/java/lang/invoke/VarHandles.java b/src/java.base/share/classes/java/lang/invoke/VarHandles.java
index 08099ca7548..5246f95eded 100755
--- a/src/java.base/share/classes/java/lang/invoke/VarHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/VarHandles.java
@@ -46,7 +46,7 @@
 
 final class VarHandles {
 
-    static ClassValue<ConcurrentMap<Integer, MethodHandle>> ADDRESS_FACTORIES = new ClassValue<>() {
+    static ClassValue<ConcurrentMap<Integer.ref, MethodHandle>> ADDRESS_FACTORIES = new ClassValue<>() {
         @Override
         protected ConcurrentMap<Integer, MethodHandle> computeValue(Class<?> type) {
             return new ConcurrentHashMap<>();
diff --git a/src/java.base/share/classes/java/net/HttpConnectSocketImpl.java b/src/java.base/share/classes/java/net/HttpConnectSocketImpl.java
index ab8429d7d51..2fd531c744e 100755
--- a/src/java.base/share/classes/java/net/HttpConnectSocketImpl.java
+++ b/src/java.base/share/classes/java/net/HttpConnectSocketImpl.java
@@ -53,7 +53,7 @@
     private final String server;
     private final Socket socket;
     private InetSocketAddress external_address;
-    private HashMap<Integer, Object> optionsMap = new HashMap<>();
+    private HashMap<Integer.ref, Object> optionsMap = new HashMap<>();
 
     static  {
         try {
diff --git a/src/java.base/share/classes/java/net/StandardSocketOptions.java b/src/java.base/share/classes/java/net/StandardSocketOptions.java
index bf5a9df5797..c207f533bf1 100755
--- a/src/java.base/share/classes/java/net/StandardSocketOptions.java
+++ b/src/java.base/share/classes/java/net/StandardSocketOptions.java
@@ -112,8 +112,8 @@ private StandardSocketOptions() { }
      *
      * @see Socket#setSendBufferSize
      */
-    public static final SocketOption<Integer> SO_SNDBUF =
-        new StdSocketOption<Integer>("SO_SNDBUF", Integer.class);
+    public static final SocketOption<Integer.ref> SO_SNDBUF =
+        new StdSocketOption<Integer.ref>("SO_SNDBUF", Integer.class);
 
 
     /**
@@ -152,8 +152,8 @@ private StandardSocketOptions() { }
      * @see Socket#setReceiveBufferSize
      * @see ServerSocket#setReceiveBufferSize
      */
-    public static final SocketOption<Integer> SO_RCVBUF =
-        new StdSocketOption<Integer>("SO_RCVBUF", Integer.class);
+    public static final SocketOption<Integer.ref> SO_RCVBUF =
+        new StdSocketOption<Integer.ref>("SO_RCVBUF", Integer.class);
 
     /**
      * Re-use address.
@@ -238,8 +238,8 @@ private StandardSocketOptions() { }
      *
      * @see Socket#setSoLinger
      */
-    public static final SocketOption<Integer> SO_LINGER =
-        new StdSocketOption<Integer>("SO_LINGER", Integer.class);
+    public static final SocketOption<Integer.ref> SO_LINGER =
+        new StdSocketOption<Integer.ref>("SO_LINGER", Integer.class);
 
 
     // -- IPPROTO_IP --
@@ -270,8 +270,8 @@ private StandardSocketOptions() { }
      *
      * @see DatagramSocket#setTrafficClass
      */
-    public static final SocketOption<Integer> IP_TOS =
-        new StdSocketOption<Integer>("IP_TOS", Integer.class);
+    public static final SocketOption<Integer.ref> IP_TOS =
+        new StdSocketOption<Integer.ref>("IP_TOS", Integer.class);
 
     /**
      * The network interface for Internet Protocol (IP) multicast datagrams.
@@ -319,8 +319,8 @@ private StandardSocketOptions() { }
      * @see java.nio.channels.MulticastChannel
      * @see MulticastSocket#setTimeToLive
      */
-    public static final SocketOption<Integer> IP_MULTICAST_TTL =
-        new StdSocketOption<Integer>("IP_MULTICAST_TTL", Integer.class);
+    public static final SocketOption<Integer.ref> IP_MULTICAST_TTL =
+        new StdSocketOption<Integer.ref>("IP_MULTICAST_TTL", Integer.class);
 
     /**
      * Loopback for Internet Protocol (IP) multicast datagrams.
diff --git a/src/java.base/share/classes/java/nio/channels/AsynchronousByteChannel.java b/src/java.base/share/classes/java/nio/channels/AsynchronousByteChannel.java
index 56003d53ec7..1b4e31987b8 100755
--- a/src/java.base/share/classes/java/nio/channels/AsynchronousByteChannel.java
+++ b/src/java.base/share/classes/java/nio/channels/AsynchronousByteChannel.java
@@ -107,7 +107,7 @@ public interface AsynchronousByteChannel
      */
     <A> void read(ByteBuffer dst,
                   A attachment,
-                  CompletionHandler<Integer,? super A> handler);
+                  CompletionHandler<Integer.ref,? super A> handler);
 
     /**
      * Reads a sequence of bytes from this channel into the given buffer.
@@ -133,7 +133,7 @@ <A> void read(ByteBuffer dst,
      *          If the channel does not allow more than one read to be outstanding
      *          and a previous read has not completed
      */
-    Future<Integer> read(ByteBuffer dst);
+    Future<Integer.ref> read(ByteBuffer dst);
 
     /**
      * Writes a sequence of bytes to this channel from the given buffer.
@@ -186,7 +186,7 @@ <A> void read(ByteBuffer dst,
      */
     <A> void write(ByteBuffer src,
                    A attachment,
-                   CompletionHandler<Integer,? super A> handler);
+                   CompletionHandler<Integer.ref,? super A> handler);
 
     /**
      * Writes a sequence of bytes to this channel from the given buffer.
@@ -209,5 +209,5 @@ <A> void write(ByteBuffer src,
      *          If the channel does not allow more than one write to be outstanding
      *          and a previous write has not completed
      */
-    Future<Integer> write(ByteBuffer src);
+    Future<Integer.ref> write(ByteBuffer src);
 }
diff --git a/src/java.base/share/classes/java/nio/channels/AsynchronousFileChannel.java b/src/java.base/share/classes/java/nio/channels/AsynchronousFileChannel.java
index 2ad51f80a45..08af2dbb1ac 100755
--- a/src/java.base/share/classes/java/nio/channels/AsynchronousFileChannel.java
+++ b/src/java.base/share/classes/java/nio/channels/AsynchronousFileChannel.java
@@ -712,7 +712,7 @@ public final FileLock tryLock() throws IOException {
     public abstract <A> void read(ByteBuffer dst,
                                   long position,
                                   A attachment,
-                                  CompletionHandler<Integer,? super A> handler);
+                                  CompletionHandler<Integer.ref,? super A> handler);
 
     /**
      * Reads a sequence of bytes from this channel into the given buffer,
@@ -744,7 +744,7 @@ public abstract <A> void read(ByteBuffer dst,
      * @throws  NonReadableChannelException
      *          If this channel was not opened for reading
      */
-    public abstract Future<Integer> read(ByteBuffer dst, long position);
+    public abstract Future<Integer.ref> read(ByteBuffer dst, long position);
 
     /**
      * Writes a sequence of bytes to this channel from the given buffer, starting
@@ -778,7 +778,7 @@ public abstract <A> void read(ByteBuffer dst,
     public abstract <A> void write(ByteBuffer src,
                                    long position,
                                    A attachment,
-                                   CompletionHandler<Integer,? super A> handler);
+                                   CompletionHandler<Integer.ref,? super A> handler);
 
     /**
      * Writes a sequence of bytes to this channel from the given buffer, starting
@@ -811,5 +811,5 @@ public abstract <A> void write(ByteBuffer src,
      * @throws  NonWritableChannelException
      *          If this channel was not opened for writing
      */
-    public abstract Future<Integer> write(ByteBuffer src, long position);
+    public abstract Future<Integer.ref> write(ByteBuffer src, long position);
 }
diff --git a/src/java.base/share/classes/java/nio/channels/AsynchronousSocketChannel.java b/src/java.base/share/classes/java/nio/channels/AsynchronousSocketChannel.java
index 8e54704beab..d08417b842b 100755
--- a/src/java.base/share/classes/java/nio/channels/AsynchronousSocketChannel.java
+++ b/src/java.base/share/classes/java/nio/channels/AsynchronousSocketChannel.java
@@ -407,7 +407,7 @@ public abstract <A> void read(ByteBuffer dst,
                                   long timeout,
                                   TimeUnit unit,
                                   A attachment,
-                                  CompletionHandler<Integer,? super A> handler);
+                                  CompletionHandler<Integer.ref,? super A> handler);
 
     /**
      * @throws  IllegalArgumentException        {@inheritDoc}
@@ -420,7 +420,7 @@ public abstract <A> void read(ByteBuffer dst,
     @Override
     public final <A> void read(ByteBuffer dst,
                                A attachment,
-                               CompletionHandler<Integer,? super A> handler)
+                               CompletionHandler<Integer.ref,? super A> handler)
     {
         read(dst, 0L, TimeUnit.MILLISECONDS, attachment, handler);
     }
@@ -432,7 +432,7 @@ public final <A> void read(ByteBuffer dst,
      *          If this channel is not yet connected
      */
     @Override
-    public abstract Future<Integer> read(ByteBuffer dst);
+    public abstract Future<Integer.ref> read(ByteBuffer dst);
 
     /**
      * Reads a sequence of bytes from this channel into a subsequence of the
@@ -564,7 +564,7 @@ public abstract <A> void write(ByteBuffer src,
                                    long timeout,
                                    TimeUnit unit,
                                    A attachment,
-                                   CompletionHandler<Integer,? super A> handler);
+                                   CompletionHandler<Integer.ref,? super A> handler);
 
     /**
      * @throws  WritePendingException          {@inheritDoc}
@@ -576,7 +576,7 @@ public abstract <A> void write(ByteBuffer src,
     @Override
     public final <A> void write(ByteBuffer src,
                                 A attachment,
-                                CompletionHandler<Integer,? super A> handler)
+                                CompletionHandler<Integer.ref,? super A> handler)
 
     {
         write(src, 0L, TimeUnit.MILLISECONDS, attachment, handler);
@@ -588,7 +588,7 @@ public final <A> void write(ByteBuffer src,
      *          If this channel is not yet connected
      */
     @Override
-    public abstract Future<Integer> write(ByteBuffer src);
+    public abstract Future<Integer.ref> write(ByteBuffer src);
 
     /**
      * Writes a sequence of bytes to this channel from a subsequence of the given
diff --git a/src/java.base/share/classes/java/nio/charset/CoderResult.java b/src/java.base/share/classes/java/nio/charset/CoderResult.java
index 8bfbf9f54af..8989434254a 100755
--- a/src/java.base/share/classes/java/nio/charset/CoderResult.java
+++ b/src/java.base/share/classes/java/nio/charset/CoderResult.java
@@ -194,8 +194,8 @@ private static final class Cache {
         static final Cache INSTANCE = new Cache();
         private Cache() {}
 
-        final Map<Integer, CoderResult> unmappable = new ConcurrentHashMap<>();
-        final Map<Integer, CoderResult> malformed  = new ConcurrentHashMap<>();
+        final Map<Integer.ref, CoderResult> unmappable = new ConcurrentHashMap<>();
+        final Map<Integer.ref, CoderResult> malformed  = new ConcurrentHashMap<>();
     }
 
     private static final CoderResult[] malformed4 = new CoderResult[] {
diff --git a/src/java.base/share/classes/java/text/SimpleDateFormat.java b/src/java.base/share/classes/java/text/SimpleDateFormat.java
index 4eb08f6f5f6..122630e70c5 100755
--- a/src/java.base/share/classes/java/text/SimpleDateFormat.java
+++ b/src/java.base/share/classes/java/text/SimpleDateFormat.java
@@ -1659,7 +1659,7 @@ private int matchString(String text, int start, int field, String[] data, Calend
      * String[].
      */
     private int matchString(String text, int start, int field,
-                            Map<String,Integer> data, CalendarBuilder calb) {
+                            Map<String,Integer.ref> data, CalendarBuilder calb) {
         if (data != null) {
             // TODO: make this default when it's in the spec.
             if (data instanceof SortedMap) {
@@ -2441,7 +2441,7 @@ public boolean equals(Object obj)
     private static final int[] REST_OF_STYLES = {
         Calendar.SHORT_STANDALONE, Calendar.LONG_FORMAT, Calendar.LONG_STANDALONE,
     };
-    private Map<String, Integer> getDisplayNamesMap(int field, Locale locale) {
+    private Map<String, Integer.ref> getDisplayNamesMap(int field, Locale locale) {
         Map<String, Integer> map = calendar.getDisplayNames(field, Calendar.SHORT_FORMAT, locale);
         // Get all SHORT and LONG styles (avoid NARROW styles).
         for (int style : REST_OF_STYLES) {
@@ -2457,8 +2457,8 @@ private Map<String, Integer> getDisplayNamesMap(int field, Locale locale) {
      * Obtains display names map, taking the context into account. Currently only
      * the month name pattern 'M' is context dependent.
      */
-    private Map<String, Integer> getDisplayContextNamesMap(int field, Locale locale) {
-        Map<String, Integer> map = calendar.getDisplayNames(field,
+    private Map<String, Integer.ref> getDisplayContextNamesMap(int field, Locale locale) {
+        Map<String, Integer.ref> map = calendar.getDisplayNames(field,
             forceStandaloneForm ? Calendar.SHORT_STANDALONE : Calendar.SHORT_FORMAT, locale);
         // Get the LONG style
         Map<String, Integer> m = calendar.getDisplayNames(field,
diff --git a/src/java.base/share/classes/java/time/ZoneOffset.java b/src/java.base/share/classes/java/time/ZoneOffset.java
index 7cb4ce2d627..aee47618b40 100755
--- a/src/java.base/share/classes/java/time/ZoneOffset.java
+++ b/src/java.base/share/classes/java/time/ZoneOffset.java
@@ -135,7 +135,7 @@ public final class ZoneOffset
         implements TemporalAccessor, TemporalAdjuster, Comparable<ZoneOffset>, Serializable {
 
     /** Cache of time-zone offset by offset in seconds. */
-    private static final ConcurrentMap<Integer, ZoneOffset> SECONDS_CACHE = new ConcurrentHashMap<>(16, 0.75f, 4);
+    private static final ConcurrentMap<Integer.ref, ZoneOffset> SECONDS_CACHE = new ConcurrentHashMap<>(16, 0.75f, 4);
     /** Cache of time-zone offset by ID. */
     private static final ConcurrentMap<String, ZoneOffset> ID_CACHE = new ConcurrentHashMap<>(16, 0.75f, 4);
 
diff --git a/src/java.base/share/classes/java/time/chrono/HijrahChronology.java b/src/java.base/share/classes/java/time/chrono/HijrahChronology.java
index 681333dfa9f..22372fe0cd6 100755
--- a/src/java.base/share/classes/java/time/chrono/HijrahChronology.java
+++ b/src/java.base/share/classes/java/time/chrono/HijrahChronology.java
@@ -943,7 +943,7 @@ private void loadCalendarData() {
      * @param years a Map of year to the array of 12 month lengths
      * @return array of epochDays for each month from min to max
      */
-    private int[] createEpochMonths(int epochDay, int minYear, int maxYear, Map<Integer, int[]> years) {
+    private int[] createEpochMonths(int epochDay, int minYear, int maxYear, Map<Integer.ref, int[]> years) {
         // Compute the size for the array of dates
         int numMonths = (maxYear - minYear + 1) * 12 + 1;
 
diff --git a/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
index d45bfa03f91..b665436b72b 100755
--- a/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
+++ b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
@@ -4515,9 +4515,9 @@ public boolean format(DateTimePrintContext context, StringBuilder buf) {
         }
 
         // cache per instance for now
-        private final Map<Locale, Entry<Integer, SoftReference<PrefixTree>>>
+        private final Map<Locale, Entry<Integer.ref, SoftReference<PrefixTree>>>
             cachedTree = new HashMap<>();
-        private final Map<Locale, Entry<Integer, SoftReference<PrefixTree>>>
+        private final Map<Locale, Entry<Integer.ref, SoftReference<PrefixTree>>>
             cachedTreeCI = new HashMap<>();
 
         @Override
@@ -4616,8 +4616,8 @@ public boolean format(DateTimePrintContext context, StringBuilder buf) {
         /**
          * The cached tree to speed up parsing.
          */
-        private static volatile Entry<Integer, PrefixTree> cachedPrefixTree;
-        private static volatile Entry<Integer, PrefixTree> cachedPrefixTreeCI;
+        private static volatile Entry<Integer.ref, PrefixTree> cachedPrefixTree;
+        private static volatile Entry<Integer.ref, PrefixTree> cachedPrefixTreeCI;
 
         protected PrefixTree getTree(DateTimeParseContext context) {
             // prepare parse tree
diff --git a/src/java.base/share/classes/java/time/zone/ZoneRules.java b/src/java.base/share/classes/java/time/zone/ZoneRules.java
index 480ff2bb27c..f1740aa70bc 100755
--- a/src/java.base/share/classes/java/time/zone/ZoneRules.java
+++ b/src/java.base/share/classes/java/time/zone/ZoneRules.java
@@ -146,7 +146,7 @@ public final class ZoneRules implements Serializable {
     /**
      * The map of recent transitions.
      */
-    private final transient ConcurrentMap<Integer, ZoneOffsetTransition[]> lastRulesCache;
+    private final transient ConcurrentMap<Integer.ref, ZoneOffsetTransition[]> lastRulesCache;
     /**
      * The zero-length long array.
      */
diff --git a/src/java.base/share/classes/java/util/Calendar.java b/src/java.base/share/classes/java/util/Calendar.java
index 361733dabec..45a2bd20baa 100755
--- a/src/java.base/share/classes/java/util/Calendar.java
+++ b/src/java.base/share/classes/java/util/Calendar.java
@@ -2191,7 +2191,7 @@ public String getDisplayName(int field, int style, Locale locale) {
      *        if {@code locale} is null
      * @since 1.6
      */
-    public Map<String, Integer> getDisplayNames(int field, int style, Locale locale) {
+    public Map<String, Integer.ref> getDisplayNames(int field, int style, Locale locale) {
         if (!checkDisplayNameParams(field, style, ALL_STYLES, NARROW_FORMAT, locale,
                                     ERA_MASK|MONTH_MASK|DAY_OF_WEEK_MASK|AM_PM_MASK)) {
             return null;
@@ -2220,7 +2220,7 @@ public Map<String, Integer> getDisplayNames(int field, int style, Locale locale)
         return getDisplayNamesImpl(field, style, locale);
     }
 
-    private Map<String,Integer> getDisplayNamesImpl(int field, int style, Locale locale) {
+    private Map<String,Integer.ref> getDisplayNamesImpl(int field, int style, Locale locale) {
         DateFormatSymbols symbols = DateFormatSymbols.getInstance(locale);
         String[] strings = getFieldStrings(field, style, symbols);
         if (strings != null) {
diff --git a/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java b/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
index d275b09834a..9b505a3db66 100755
--- a/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
+++ b/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
@@ -1035,7 +1035,7 @@ public String getDisplayName(int field, int style, Locale locale) {
     }
 
     @Override
-    public Map<String,Integer> getDisplayNames(int field, int style, Locale locale) {
+    public Map<String,Integer.ref> getDisplayNames(int field, int style, Locale locale) {
         if (!checkDisplayNameParams(field, style, ALL_STYLES, NARROW_FORMAT, locale,
                                     ERA_MASK|YEAR_MASK|MONTH_MASK|DAY_OF_WEEK_MASK|AM_PM_MASK)) {
             return null;
diff --git a/src/java.base/share/classes/java/util/Spliterators.java b/src/java.base/share/classes/java/util/Spliterators.java
index 48633e4caf0..ab128e71555 100755
--- a/src/java.base/share/classes/java/util/Spliterators.java
+++ b/src/java.base/share/classes/java/util/Spliterators.java
@@ -909,7 +909,7 @@ private static final class OfRef<T>
         }
 
         private static final class OfInt
-                extends EmptySpliterator<Integer, Spliterator.OfInt, IntConsumer>
+                extends EmptySpliterator<Integer.ref, Spliterator.OfInt, IntConsumer>
                 implements Spliterator.OfInt {
             OfInt() { }
         }
@@ -1129,7 +1129,7 @@ public int characteristics() {
         }
 
         @Override
-        public Comparator<? super Integer> getComparator() {
+        public Comparator<? super Integer.ref> getComparator() {
             if (hasCharacteristics(Spliterator.SORTED))
                 return null;
             throw new IllegalStateException();
@@ -2049,7 +2049,7 @@ public long estimateSize() {
         public int characteristics() { return characteristics; }
 
         @Override
-        public Comparator<? super Integer> getComparator() {
+        public Comparator<? super Integer.ref> getComparator() {
             if (hasCharacteristics(Spliterator.SORTED))
                 return null;
             throw new IllegalStateException();
diff --git a/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java b/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
index 0f0243d4348..c62894f67d8 100755
--- a/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
+++ b/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
@@ -6169,7 +6169,7 @@ public final void compute() {
 
     @SuppressWarnings("serial")
     static final class MapReduceKeysToIntTask<K,V>
-        extends BulkTask<K,V,Integer> {
+        extends BulkTask<K,V,Integer.ref> {
         final ToIntFunction<? super K> transformer;
         final IntBinaryOperator reducer;
         final int basis;
@@ -6219,7 +6219,7 @@ public final void compute() {
 
     @SuppressWarnings("serial")
     static final class MapReduceValuesToIntTask<K,V>
-        extends BulkTask<K,V,Integer> {
+        extends BulkTask<K,V,Integer.ref> {
         final ToIntFunction<? super V> transformer;
         final IntBinaryOperator reducer;
         final int basis;
@@ -6269,7 +6269,7 @@ public final void compute() {
 
     @SuppressWarnings("serial")
     static final class MapReduceEntriesToIntTask<K,V>
-        extends BulkTask<K,V,Integer> {
+        extends BulkTask<K,V,Integer.ref> {
         final ToIntFunction<Map.Entry<K,V>> transformer;
         final IntBinaryOperator reducer;
         final int basis;
@@ -6319,7 +6319,7 @@ public final void compute() {
 
     @SuppressWarnings("serial")
     static final class MapReduceMappingsToIntTask<K,V>
-        extends BulkTask<K,V,Integer> {
+        extends BulkTask<K,V,Integer.ref> {
         final ToIntBiFunction<? super K, ? super V> transformer;
         final IntBinaryOperator reducer;
         final int basis;
diff --git a/src/java.base/share/classes/java/util/regex/MatchResult.java b/src/java.base/share/classes/java/util/regex/MatchResult.java
index de44f3b7fb8..a94032857e9 100755
--- a/src/java.base/share/classes/java/util/regex/MatchResult.java
+++ b/src/java.base/share/classes/java/util/regex/MatchResult.java
@@ -315,7 +315,7 @@ default String group(String name) {
      *
      * @since 20
      */
-    default Map<String,Integer> namedGroups() {
+    default Map<String,Integer.ref> namedGroups() {
         throw new UnsupportedOperationException("namedGroups()");
     }
 
diff --git a/src/java.base/share/classes/java/util/regex/Matcher.java b/src/java.base/share/classes/java/util/regex/Matcher.java
index 2db0f6baa97..b290a8d22d1 100755
--- a/src/java.base/share/classes/java/util/regex/Matcher.java
+++ b/src/java.base/share/classes/java/util/regex/Matcher.java
@@ -230,7 +230,7 @@ public final class Matcher implements MatchResult {
      */
     int modCount;
 
-    private Map<String, Integer> namedGroups;
+    private Map<String, Integer.ref> namedGroups;
 
     /**
      * No default constructor.
@@ -291,11 +291,11 @@ private static class ImmutableMatchResult implements MatchResult {
         private final int[] groups;
         private final int groupCount;
         private final String text;
-        private final Map<String, Integer> namedGroups;
+        private final Map<String, Integer.ref> namedGroups;
 
         ImmutableMatchResult(int first, int last, int groupCount,
                              int[] groups, String text,
-                             Map<String, Integer> namedGroups)
+                             Map<String, Integer.ref> namedGroups)
         {
             this.first = first;
             this.last = last;
@@ -352,7 +352,7 @@ public String group(int group) {
         }
 
         @Override
-        public Map<String, Integer> namedGroups() {
+        public Map<String, Integer.ref> namedGroups() {
             return namedGroups;
         }
 
@@ -1829,7 +1829,7 @@ private void checkMatch() {
      * @since {@inheritDoc}
      */
     @Override
-    public Map<String, Integer> namedGroups() {
+    public Map<String, Integer.ref> namedGroups() {
         if (namedGroups == null) {
             return namedGroups = parentPattern.namedGroups();
         }
diff --git a/src/java.base/share/classes/java/util/regex/Pattern.java b/src/java.base/share/classes/java/util/regex/Pattern.java
index 03072638f60..b8c63f88701 100755
--- a/src/java.base/share/classes/java/util/regex/Pattern.java
+++ b/src/java.base/share/classes/java/util/regex/Pattern.java
@@ -1017,7 +1017,7 @@ public final class Pattern
      * Map the "name" of the "named capturing group" to its group id
      * node.
      */
-    transient volatile Map<String, Integer> namedGroups;
+    transient volatile Map<String, Integer.ref> namedGroups;
 
     /**
      * Temporary storage used while parsing group references.
@@ -1880,7 +1880,7 @@ private void compile() {
         topClosureNodes = null;
     }
 
-    private Map<String, Integer> namedGroupsMap() {
+    private Map<String, Integer.ref> namedGroupsMap() {
         Map<String, Integer> groups = namedGroups;
         if (groups == null) {
             namedGroups = groups = new HashMap<>(2);
@@ -1896,7 +1896,7 @@ private Map<String, Integer> namedGroupsMap() {
      *
      * @since 20
      */
-    public Map<String, Integer> namedGroups() {
+    public Map<String, Integer.ref> namedGroups() {
         return Map.copyOf(namedGroupsMap());
     }
 
diff --git a/src/java.base/share/classes/java/util/regex/PrintPattern.java b/src/java.base/share/classes/java/util/regex/PrintPattern.java
index eb37043d4f4..2e26bb0f895 100755
--- a/src/java.base/share/classes/java/util/regex/PrintPattern.java
+++ b/src/java.base/share/classes/java/util/regex/PrintPattern.java
@@ -35,7 +35,7 @@
 
 class PrintPattern {
 
-    private static HashMap<Pattern.Node, Integer> ids = new HashMap<>();
+    private static HashMap<Pattern.Node, Integer.ref> ids = new HashMap<>();
 
     private static void print(Pattern.Node node, String text, int depth) {
         if (!ids.containsKey(node))
diff --git a/src/java.base/share/classes/java/util/spi/CalendarNameProvider.java b/src/java.base/share/classes/java/util/spi/CalendarNameProvider.java
index e0ad28fc88c..87637ca0ac5 100755
--- a/src/java.base/share/classes/java/util/spi/CalendarNameProvider.java
+++ b/src/java.base/share/classes/java/util/spi/CalendarNameProvider.java
@@ -299,7 +299,7 @@ public abstract String getDisplayName(String calendarType,
      *         if {@code locale} is {@code null}
      * @see Calendar#getDisplayNames(int, int, Locale)
      */
-    public abstract Map<String, Integer> getDisplayNames(String calendarType,
+    public abstract Map<String, Integer.ref> getDisplayNames(String calendarType,
                                                          int field, int style,
                                                          Locale locale);
 }
diff --git a/src/java.base/share/classes/java/util/stream/Collectors.java b/src/java.base/share/classes/java/util/stream/Collectors.java
index 992f2f4a2a3..d011bf151a2 100755
--- a/src/java.base/share/classes/java/util/stream/Collectors.java
+++ b/src/java.base/share/classes/java/util/stream/Collectors.java
@@ -637,7 +637,7 @@ public static<T,A,R,RR> Collector<T,A,RR> collectingAndThen(Collector<T,A,R> dow
      * @param mapper a function extracting the property to be summed
      * @return a {@code Collector} that produces the sum of a derived property
      */
-    public static <T> Collector<T, ?, Integer>
+    public static <T> Collector<T, ?, Integer.ref>
     summingInt(ToIntFunction<? super T> mapper) {
         return new CollectorImpl<>(
                 () -> new int[1],
diff --git a/src/java.base/share/classes/java/util/stream/FindOps.java b/src/java.base/share/classes/java/util/stream/FindOps.java
index 131eec06236..82a1ab3a817 100755
--- a/src/java.base/share/classes/java/util/stream/FindOps.java
+++ b/src/java.base/share/classes/java/util/stream/FindOps.java
@@ -67,7 +67,7 @@ public static <T> TerminalOp<T, Optional<T>> makeRef(boolean mustFindFirst) {
      *        first element in the encounter order
      * @return a {@code TerminalOp} implementing the find operation
      */
-    public static TerminalOp<Integer, OptionalInt> makeInt(boolean mustFindFirst) {
+    public static TerminalOp<Integer.ref, OptionalInt> makeInt(boolean mustFindFirst) {
         return mustFindFirst ? FindSink.OfInt.OP_FIND_FIRST : FindSink.OfInt.OP_FIND_ANY;
     }
 
@@ -204,7 +204,7 @@ public Optional<T> get() {
         }
 
         /** Specialization of {@code FindSink} for int streams */
-        static final class OfInt extends FindSink<Integer, OptionalInt>
+        static final class OfInt extends FindSink<Integer.ref, OptionalInt>
                 implements Sink.OfInt {
             @Override
             public void accept(int value) {
@@ -217,10 +217,10 @@ public OptionalInt get() {
                 return hasValue ? OptionalInt.of(value) : null;
             }
 
-            static final TerminalOp<Integer, OptionalInt> OP_FIND_FIRST = new FindOp<>(true,
+            static final TerminalOp<Integer.ref, OptionalInt> OP_FIND_FIRST = new FindOp<>(true,
                     StreamShape.INT_VALUE, OptionalInt.empty(),
                     OptionalInt::isPresent, FindSink.OfInt::new);
-            static final TerminalOp<Integer, OptionalInt> OP_FIND_ANY = new FindOp<>(false,
+            static final TerminalOp<Integer.ref, OptionalInt> OP_FIND_ANY = new FindOp<>(false,
                     StreamShape.INT_VALUE, OptionalInt.empty(),
                     OptionalInt::isPresent, FindSink.OfInt::new);
         }
diff --git a/src/java.base/share/classes/java/util/stream/ForEachOps.java b/src/java.base/share/classes/java/util/stream/ForEachOps.java
index 69714ca3f85..4fdf8a9ee54 100755
--- a/src/java.base/share/classes/java/util/stream/ForEachOps.java
+++ b/src/java.base/share/classes/java/util/stream/ForEachOps.java
@@ -81,7 +81,7 @@ public static <T> TerminalOp<T, Void> makeRef(Consumer<? super T> action,
      * @param ordered whether an ordered traversal is requested
      * @return the {@code TerminalOp} instance
      */
-    public static TerminalOp<Integer, Void> makeInt(IntConsumer action,
+    public static TerminalOp<Integer.ref, Void> makeInt(IntConsumer action,
                                                     boolean ordered) {
         Objects.requireNonNull(action);
         return new ForEachOp.OfInt(action, ordered);
@@ -185,7 +185,7 @@ public void accept(T t) {
         }
 
         /** Implementation class for {@code IntStream} */
-        static final class OfInt extends ForEachOp<Integer>
+        static final class OfInt extends ForEachOp<Integer.ref>
                 implements Sink.OfInt {
             final IntConsumer consumer;
 
diff --git a/src/java.base/share/classes/java/util/stream/IntPipeline.java b/src/java.base/share/classes/java/util/stream/IntPipeline.java
index 63a5c77b438..6124b95c888 100755
--- a/src/java.base/share/classes/java/util/stream/IntPipeline.java
+++ b/src/java.base/share/classes/java/util/stream/IntPipeline.java
@@ -56,7 +56,7 @@
  * @since 1.8
  */
 abstract class IntPipeline<E_IN>
-        extends AbstractPipeline<E_IN, Integer, IntStream>
+        extends AbstractPipeline<E_IN, Integer.ref, IntStream>
         implements IntStream {
 
     /**
@@ -67,7 +67,7 @@ abstract class IntPipeline<E_IN>
      *        {@link StreamOpFlag}
      * @param parallel {@code true} if the pipeline is parallel
      */
-    IntPipeline(Supplier<? extends Spliterator<Integer>> source,
+    IntPipeline(Supplier<? extends Spliterator<Integer.ref>> source,
                 int sourceFlags, boolean parallel) {
         super(source, sourceFlags, parallel);
     }
@@ -80,7 +80,7 @@ abstract class IntPipeline<E_IN>
      *        {@link StreamOpFlag}
      * @param parallel {@code true} if the pipeline is parallel
      */
-    IntPipeline(Spliterator<Integer> source,
+    IntPipeline(Spliterator<Integer.ref> source,
                 int sourceFlags, boolean parallel) {
         super(source, sourceFlags, parallel);
     }
@@ -100,7 +100,7 @@ abstract class IntPipeline<E_IN>
      * Adapt a {@code Sink<Integer> to an {@code IntConsumer}, ideally simply
      * by casting.
      */
-    private static IntConsumer adapt(Sink<Integer> sink) {
+    private static IntConsumer adapt(Sink<Integer.ref> sink) {
         if (sink instanceof IntConsumer) {
             return (IntConsumer) sink;
         }
@@ -119,7 +119,7 @@ private static IntConsumer adapt(Sink<Integer> sink) {
      * The implementation attempts to cast to a Spliterator.OfInt, and throws an
      * exception if this cast is not possible.
      */
-    private static Spliterator.OfInt adapt(Spliterator<Integer> s) {
+    private static Spliterator.OfInt adapt(Spliterator<Integer.ref> s) {
         if (s instanceof Spliterator.OfInt) {
             return (Spliterator.OfInt) s;
         }
@@ -140,7 +140,7 @@ final StreamShape getOutputShape() {
     }
 
     @Override
-    final <P_IN> Node<Integer> evaluateToNode(PipelineHelper<Integer> helper,
+    final <P_IN> Node<Integer.ref> evaluateToNode(PipelineHelper<Integer.ref> helper,
                                               Spliterator<P_IN> spliterator,
                                               boolean flattenTree,
                                               IntFunction<Integer[]> generator) {
@@ -148,7 +148,7 @@ final <P_IN> Node<Integer> evaluateToNode(PipelineHelper<Integer> helper,
     }
 
     @Override
-    final <P_IN> Spliterator<Integer> wrap(PipelineHelper<Integer> ph,
+    final <P_IN> Spliterator<Integer.ref> wrap(PipelineHelper<Integer.ref> ph,
                                            Supplier<Spliterator<P_IN>> supplier,
                                            boolean isParallel) {
         return new StreamSpliterators.IntWrappingSpliterator<>(ph, supplier, isParallel);
@@ -156,12 +156,12 @@ final <P_IN> Spliterator<Integer> wrap(PipelineHelper<Integer> ph,
 
     @Override
     @SuppressWarnings("unchecked")
-    final Spliterator.OfInt lazySpliterator(Supplier<? extends Spliterator<Integer>> supplier) {
+    final Spliterator.OfInt lazySpliterator(Supplier<? extends Spliterator<Integer.ref>> supplier) {
         return new StreamSpliterators.DelegatingSpliterator.OfInt((Supplier<Spliterator.OfInt>) supplier);
     }
 
     @Override
-    final boolean forEachWithCancel(Spliterator<Integer> spliterator, Sink<Integer> sink) {
+    final boolean forEachWithCancel(Spliterator<Integer.ref> spliterator, Sink<Integer.ref> sink) {
         Spliterator.OfInt spl = adapt(spliterator);
         IntConsumer adaptedSink = adapt(sink);
         boolean cancelled;
@@ -170,7 +170,7 @@ final boolean forEachWithCancel(Spliterator<Integer> spliterator, Sink<Integer>
     }
 
     @Override
-    final Node.Builder<Integer> makeNodeBuilder(long exactSizeIfKnown,
+    final Node.Builder<Integer.ref> makeNodeBuilder(long exactSizeIfKnown,
                                                 IntFunction<Integer[]> generator) {
         return Nodes.intBuilder(exactSizeIfKnown);
     }
@@ -234,7 +234,7 @@ public void accept(int t) {
     }
 
     @Override
-    public final Stream<Integer> boxed() {
+    public final Stream<Integer.ref> boxed() {
         return mapToObj(Integer::valueOf, 0);
     }
 
@@ -609,7 +609,7 @@ static class Head<E_IN> extends IntPipeline<E_IN> {
          *                    in {@link StreamOpFlag}
          * @param parallel {@code true} if the pipeline is parallel
          */
-        Head(Supplier<? extends Spliterator<Integer>> source,
+        Head(Supplier<? extends Spliterator<Integer.ref>> source,
              int sourceFlags, boolean parallel) {
             super(source, sourceFlags, parallel);
         }
@@ -622,7 +622,7 @@ static class Head<E_IN> extends IntPipeline<E_IN> {
          *                    in {@link StreamOpFlag}
          * @param parallel {@code true} if the pipeline is parallel
          */
-        Head(Spliterator<Integer> source,
+        Head(Spliterator<Integer.ref> source,
              int sourceFlags, boolean parallel) {
             super(source, sourceFlags, parallel);
         }
@@ -633,7 +633,7 @@ final boolean opIsStateful() {
         }
 
         @Override
-        final Sink<E_IN> opWrapSink(int flags, Sink<Integer> sink) {
+        final Sink<E_IN> opWrapSink(int flags, Sink<Integer.ref> sink) {
             throw new UnsupportedOperationException();
         }
 
@@ -714,7 +714,7 @@ final boolean opIsStateful() {
         }
 
         @Override
-        abstract <P_IN> Node<Integer> opEvaluateParallel(PipelineHelper<Integer> helper,
+        abstract <P_IN> Node<Integer.ref> opEvaluateParallel(PipelineHelper<Integer.ref> helper,
                                                          Spliterator<P_IN> spliterator,
                                                          IntFunction<Integer[]> generator);
     }
diff --git a/src/java.base/share/classes/java/util/stream/MatchOps.java b/src/java.base/share/classes/java/util/stream/MatchOps.java
index 568060d3afb..810f0a6eebb 100755
--- a/src/java.base/share/classes/java/util/stream/MatchOps.java
+++ b/src/java.base/share/classes/java/util/stream/MatchOps.java
@@ -105,11 +105,11 @@ public void accept(T t) {
      * @return a {@code TerminalOp} implementing the desired quantified match
      *         criteria
      */
-    public static TerminalOp<Integer, Boolean> makeInt(IntPredicate predicate,
+    public static TerminalOp<Integer.ref, Boolean> makeInt(IntPredicate predicate,
                                                        MatchKind matchKind) {
         Objects.requireNonNull(predicate);
         Objects.requireNonNull(matchKind);
-        class MatchSink extends BooleanTerminalSink<Integer> implements Sink.OfInt {
+        class MatchSink extends BooleanTerminalSink<Integer.ref> implements Sink.OfInt {
             MatchSink() {
                 super(matchKind);
             }
diff --git a/src/java.base/share/classes/java/util/stream/Node.java b/src/java.base/share/classes/java/util/stream/Node.java
index 7c4dda8adaf..8e399936a38 100755
--- a/src/java.base/share/classes/java/util/stream/Node.java
+++ b/src/java.base/share/classes/java/util/stream/Node.java
@@ -202,7 +202,7 @@ interface Builder<T> extends Sink<T> {
         /**
          * Specialized {@code Node.Builder} for int elements
          */
-        interface OfInt extends Node.Builder<Integer>, Sink.OfInt {
+        interface OfInt extends Node.Builder<Integer.ref>, Sink.OfInt {
             @Override
             Node.OfInt build();
         }
@@ -314,7 +314,7 @@ default T[] asArray(IntFunction<T[]> generator) {
     /**
      * Specialized {@code Node} for int elements
      */
-    interface OfInt extends OfPrimitive<Integer, IntConsumer, int[], Spliterator.OfInt, OfInt> {
+    interface OfInt extends OfPrimitive<Integer.ref, IntConsumer, int[], Spliterator.OfInt, OfInt> {
 
         /**
          * {@inheritDoc}
@@ -325,7 +325,7 @@ interface OfInt extends OfPrimitive<Integer, IntConsumer, int[], Spliterator.OfI
          *        elements may be processed without boxing.
          */
         @Override
-        default void forEach(Consumer<? super Integer> consumer) {
+        default void forEach(Consumer<? super Integer.ref> consumer) {
             if (consumer instanceof IntConsumer) {
                 forEach((IntConsumer) consumer);
             }
diff --git a/src/java.base/share/classes/java/util/stream/Nodes.java b/src/java.base/share/classes/java/util/stream/Nodes.java
index ffc5ae9cb10..79ca6ac5bc8 100755
--- a/src/java.base/share/classes/java/util/stream/Nodes.java
+++ b/src/java.base/share/classes/java/util/stream/Nodes.java
@@ -351,7 +351,7 @@ public static <P_IN, P_OUT> Node<P_OUT> collect(PipelineHelper<P_OUT> helper,
      *                    describing an array before returning
      * @return a {@link Node.OfInt} describing the output elements
      */
-    public static <P_IN> Node.OfInt collectInt(PipelineHelper<Integer> helper,
+    public static <P_IN> Node.OfInt collectInt(PipelineHelper<Integer.ref> helper,
                                                Spliterator<P_IN> spliterator,
                                                boolean flattenTree) {
         long size = helper.exactOutputSizeIfKnown(spliterator);
@@ -583,7 +583,7 @@ public Spliterator<T> spliterator() {
         }
 
         private static final class OfInt
-                extends EmptyNode<Integer, int[], IntConsumer>
+                extends EmptyNode<Integer.ref, int[], IntConsumer>
                 implements Node.OfInt {
 
             OfInt() { } // Avoid creation of special accessor
@@ -881,7 +881,7 @@ public String toString() {
         }
 
         static final class OfInt
-                extends ConcNode.OfPrimitive<Integer, IntConsumer, int[], Spliterator.OfInt, Node.OfInt>
+                extends ConcNode.OfPrimitive<Integer.ref, IntConsumer, int[], Spliterator.OfInt, Node.OfInt>
                 implements Node.OfInt {
 
             OfInt(Node.OfInt left, Node.OfInt right) {
@@ -1161,7 +1161,7 @@ public void forEachRemaining(T_CONS consumer) {
         }
 
         private static final class OfInt
-                extends OfPrimitive<Integer, IntConsumer, int[], Spliterator.OfInt, Node.OfInt>
+                extends OfPrimitive<Integer.ref, IntConsumer, int[], Spliterator.OfInt, Node.OfInt>
                 implements Spliterator.OfInt {
 
             OfInt(Node.OfInt cur) {
@@ -1926,11 +1926,11 @@ public void accept(P_OUT value) {
 
         @SuppressWarnings("serial")
         static final class OfInt<P_IN>
-                extends SizedCollectorTask<P_IN, Integer, Sink.OfInt, OfInt<P_IN>>
+                extends SizedCollectorTask<P_IN, Integer.ref, Sink.OfInt, OfInt<P_IN>>
                 implements Sink.OfInt {
             private final int[] array;
 
-            OfInt(Spliterator<P_IN> spliterator, PipelineHelper<Integer> helper, int[] array) {
+            OfInt(Spliterator<P_IN> spliterator, PipelineHelper<Integer.ref> helper, int[] array) {
                 super(spliterator, helper, array.length);
                 this.array = array;
             }
@@ -2123,7 +2123,7 @@ void copyNodeToArray() {
 
         @SuppressWarnings("serial")
         private static final class OfInt
-                extends OfPrimitive<Integer, IntConsumer, int[], Spliterator.OfInt, Node.OfInt> {
+                extends OfPrimitive<Integer.ref, IntConsumer, int[], Spliterator.OfInt, Node.OfInt> {
             private OfInt(Node.OfInt node, int[] array, int offset) {
                 super(node, array, offset);
             }
@@ -2202,8 +2202,8 @@ private static final class OfRef<P_IN, P_OUT>
 
         @SuppressWarnings("serial")
         private static final class OfInt<P_IN>
-                extends CollectorTask<P_IN, Integer, Node.OfInt, Node.Builder.OfInt> {
-            OfInt(PipelineHelper<Integer> helper, Spliterator<P_IN> spliterator) {
+                extends CollectorTask<P_IN, Integer.ref, Node.OfInt, Node.Builder.OfInt> {
+            OfInt(PipelineHelper<Integer.ref> helper, Spliterator<P_IN> spliterator) {
                 super(helper, spliterator, Nodes::intBuilder, ConcNode.OfInt::new);
             }
         }
diff --git a/src/java.base/share/classes/java/util/stream/ReduceOps.java b/src/java.base/share/classes/java/util/stream/ReduceOps.java
index 64c94ef35fd..1695fe74182 100755
--- a/src/java.base/share/classes/java/util/stream/ReduceOps.java
+++ b/src/java.base/share/classes/java/util/stream/ReduceOps.java
@@ -282,7 +282,7 @@ public int getOpFlags() {
      * @param operator the combining function
      * @return a {@code TerminalOp} implementing the reduction
      */
-    public static TerminalOp<Integer, Integer>
+    public static TerminalOp<Integer.ref, Integer.ref>
     makeInt(int identity, IntBinaryOperator operator) {
         Objects.requireNonNull(operator);
         class ReducingSink
@@ -324,7 +324,7 @@ public ReducingSink makeSink() {
      * @param operator the combining function
      * @return a {@code TerminalOp} implementing the reduction
      */
-    public static TerminalOp<Integer, OptionalInt>
+    public static TerminalOp<Integer.ref, OptionalInt>
     makeInt(IntBinaryOperator operator) {
         Objects.requireNonNull(operator);
         class ReducingSink
@@ -378,7 +378,7 @@ public ReducingSink makeSink() {
      * @param combiner a function to combine an accumulator into another
      * @return A {@code ReduceOp} implementing the reduction
      */
-    public static <R> TerminalOp<Integer, R>
+    public static <R> TerminalOp<Integer.ref, R>
     makeInt(Supplier<R> supplier,
             ObjIntConsumer<R> accumulator,
             BinaryOperator<R> combiner) {
@@ -419,7 +419,7 @@ public ReducingSink makeSink() {
      *
      * @return a {@code TerminalOp} implementing the counting
      */
-    public static TerminalOp<Integer, Long>
+    public static TerminalOp<Integer.ref, Long>
     makeIntCounting() {
         return new ReduceOp<Integer, Long, CountingSink<Integer>>(StreamShape.INT_VALUE) {
             @Override
@@ -832,7 +832,7 @@ public void accept(T t) {
             }
         }
 
-        static final class OfInt extends CountingSink<Integer> implements Sink.OfInt {
+        static final class OfInt extends CountingSink<Integer.ref> implements Sink.OfInt {
             @Override
             public void accept(int t) {
                 count++;
diff --git a/src/java.base/share/classes/java/util/stream/Sink.java b/src/java.base/share/classes/java/util/stream/Sink.java
index a0fe5b31721..471eb4514dc 100755
--- a/src/java.base/share/classes/java/util/stream/Sink.java
+++ b/src/java.base/share/classes/java/util/stream/Sink.java
@@ -186,7 +186,7 @@ default void accept(double value) {
      * {@code accept(int)}, and wires {@code accept(Integer)} to bridge to
      * {@code accept(int)}.
      */
-    interface OfInt extends Sink<Integer>, IntConsumer {
+    interface OfInt extends Sink<Integer.ref>, IntConsumer {
         @Override
         void accept(int value);
 
diff --git a/src/java.base/share/classes/java/util/stream/SliceOps.java b/src/java.base/share/classes/java/util/stream/SliceOps.java
index 7dbc2e52edb..27117005a9d 100755
--- a/src/java.base/share/classes/java/util/stream/SliceOps.java
+++ b/src/java.base/share/classes/java/util/stream/SliceOps.java
@@ -223,7 +223,7 @@ public boolean cancellationRequested() {
      * @param limit The maximum size of the resulting stream, or -1 if no limit
      *        is to be imposed
      */
-    public static IntStream makeInt(AbstractPipeline<?, Integer, ?> upstream,
+    public static IntStream makeInt(AbstractPipeline<?, Integer.ref, ?> upstream,
                                     long skip, long limit) {
         if (skip < 0)
             throw new IllegalArgumentException("Skip must be non-negative: " + skip);
diff --git a/src/java.base/share/classes/java/util/stream/SortedOps.java b/src/java.base/share/classes/java/util/stream/SortedOps.java
index 91892eba44f..76cf082fd84 100755
--- a/src/java.base/share/classes/java/util/stream/SortedOps.java
+++ b/src/java.base/share/classes/java/util/stream/SortedOps.java
@@ -69,7 +69,7 @@ static <T> Stream<T> makeRef(AbstractPipeline<?, T, ?> upstream,
      * @param <T> the type of both input and output elements
      * @param upstream a reference stream with element type T
      */
-    static <T> IntStream makeInt(AbstractPipeline<?, Integer, ?> upstream) {
+    static <T> IntStream makeInt(AbstractPipeline<?, Integer.ref, ?> upstream) {
         return new OfInt(upstream);
     }
 
@@ -164,14 +164,14 @@ public <P_IN> Node<T> opEvaluateParallel(PipelineHelper<T> helper,
     /**
      * Specialized subtype for sorting int streams.
      */
-    private static final class OfInt extends IntPipeline.StatefulOp<Integer> {
-        OfInt(AbstractPipeline<?, Integer, ?> upstream) {
+    private static final class OfInt extends IntPipeline.StatefulOp<Integer.ref> {
+        OfInt(AbstractPipeline<?, Integer.ref, ?> upstream) {
             super(upstream, StreamShape.INT_VALUE,
                   StreamOpFlag.IS_ORDERED | StreamOpFlag.IS_SORTED);
         }
 
         @Override
-        public Sink<Integer> opWrapSink(int flags, Sink<Integer> sink) {
+        public Sink<Integer.ref> opWrapSink(int flags, Sink<Integer.ref> sink) {
             Objects.requireNonNull(sink);
 
             if (StreamOpFlag.SORTED.isKnown(flags))
@@ -183,7 +183,7 @@ else if (StreamOpFlag.SIZED.isKnown(flags))
         }
 
         @Override
-        public <P_IN> Node<Integer> opEvaluateParallel(PipelineHelper<Integer> helper,
+        public <P_IN> Node<Integer.ref> opEvaluateParallel(PipelineHelper<Integer.ref> helper,
                                                        Spliterator<P_IN> spliterator,
                                                        IntFunction<Integer[]> generator) {
             if (StreamOpFlag.SORTED.isKnown(helper.getStreamAndOpFlags())) {
@@ -413,11 +413,11 @@ public void accept(T t) {
     /**
      * Abstract {@link Sink} for implementing sort on int streams.
      */
-    private abstract static class AbstractIntSortingSink extends Sink.ChainedInt<Integer> {
+    private abstract static class AbstractIntSortingSink extends Sink.ChainedInt<Integer.ref> {
         // true if cancellationRequested() has been called
         protected boolean cancellationRequestedCalled;
 
-        AbstractIntSortingSink(Sink<? super Integer> downstream) {
+        AbstractIntSortingSink(Sink<? super Integer.ref> downstream) {
             super(downstream);
         }
 
@@ -435,7 +435,7 @@ private static final class SizedIntSortingSink extends AbstractIntSortingSink {
         private int[] array;
         private int offset;
 
-        SizedIntSortingSink(Sink<? super Integer> downstream) {
+        SizedIntSortingSink(Sink<? super Integer.ref> downstream) {
             super(downstream);
         }
 
@@ -474,7 +474,7 @@ public void accept(int t) {
     private static final class IntSortingSink extends AbstractIntSortingSink {
         private SpinedBuffer.OfInt b;
 
-        IntSortingSink(Sink<? super Integer> sink) {
+        IntSortingSink(Sink<? super Integer.ref> sink) {
             super(sink);
         }
 
diff --git a/src/java.base/share/classes/java/util/stream/SpinedBuffer.java b/src/java.base/share/classes/java/util/stream/SpinedBuffer.java
index 163692cf858..4d2325fe753 100755
--- a/src/java.base/share/classes/java/util/stream/SpinedBuffer.java
+++ b/src/java.base/share/classes/java/util/stream/SpinedBuffer.java
@@ -720,7 +720,7 @@ else if (splSpineIndex == lastSpineIndex) {
     /**
      * An ordered collection of {@code int} values.
      */
-    static class OfInt extends SpinedBuffer.OfPrimitive<Integer, int[], IntConsumer>
+    static class OfInt extends SpinedBuffer.OfPrimitive<Integer.ref, int[], IntConsumer>
             implements IntConsumer {
         OfInt() { }
 
@@ -729,7 +729,7 @@ static class OfInt extends SpinedBuffer.OfPrimitive<Integer, int[], IntConsumer>
         }
 
         @Override
-        public void forEach(Consumer<? super Integer> consumer) {
+        public void forEach(Consumer<? super Integer.ref> consumer) {
             if (consumer instanceof IntConsumer) {
                 forEach((IntConsumer) consumer);
             }
diff --git a/src/java.base/share/classes/java/util/stream/StreamOpFlag.java b/src/java.base/share/classes/java/util/stream/StreamOpFlag.java
index df98125cbc0..dfed7afb66a 100755
--- a/src/java.base/share/classes/java/util/stream/StreamOpFlag.java
+++ b/src/java.base/share/classes/java/util/stream/StreamOpFlag.java
@@ -397,9 +397,9 @@ private static MaskBuilder set(Type t) {
     }
 
     private static class MaskBuilder {
-        final Map<Type, Integer> map;
+        final Map<Type, Integer.ref> map;
 
-        MaskBuilder(Map<Type, Integer> map) {
+        MaskBuilder(Map<Type, Integer.ref> map) {
             this.map = map;
         }
 
@@ -420,7 +420,7 @@ MaskBuilder setAndClear(Type t) {
             return mask(t, PRESERVE_BITS);
         }
 
-        Map<Type, Integer> build() {
+        Map<Type, Integer.ref> build() {
             for (Type t : Type.values()) {
                 map.putIfAbsent(t, 0b00);
             }
@@ -432,7 +432,7 @@ Map<Type, Integer> build() {
      * The mask table for a flag, this is used to determine if a flag
      * corresponds to a certain flag type and for creating mask constants.
      */
-    private final Map<Type, Integer> maskTable;
+    private final Map<Type, Integer.ref> maskTable;
 
     /**
      * The bit position in the bit mask.
diff --git a/src/java.base/share/classes/java/util/stream/StreamSpliterators.java b/src/java.base/share/classes/java/util/stream/StreamSpliterators.java
index 01ba72d1950..db92d3cdf19 100755
--- a/src/java.base/share/classes/java/util/stream/StreamSpliterators.java
+++ b/src/java.base/share/classes/java/util/stream/StreamSpliterators.java
@@ -317,23 +317,23 @@ public void forEachRemaining(Consumer<? super P_OUT> consumer) {
     }
 
     static final class IntWrappingSpliterator<P_IN>
-            extends AbstractWrappingSpliterator<P_IN, Integer, SpinedBuffer.OfInt>
+            extends AbstractWrappingSpliterator<P_IN, Integer.ref, SpinedBuffer.OfInt>
             implements Spliterator.OfInt {
 
-        IntWrappingSpliterator(PipelineHelper<Integer> ph,
+        IntWrappingSpliterator(PipelineHelper<Integer.ref> ph,
                                Supplier<Spliterator<P_IN>> supplier,
                                boolean parallel) {
             super(ph, supplier, parallel);
         }
 
-        IntWrappingSpliterator(PipelineHelper<Integer> ph,
+        IntWrappingSpliterator(PipelineHelper<Integer.ref> ph,
                                Spliterator<P_IN> spliterator,
                                boolean parallel) {
             super(ph, spliterator, parallel);
         }
 
         @Override
-        AbstractWrappingSpliterator<P_IN, Integer, ?> wrap(Spliterator<P_IN> s) {
+        AbstractWrappingSpliterator<P_IN, Integer.ref, ?> wrap(Spliterator<P_IN> s) {
             return new IntWrappingSpliterator<>(ph, s, isParallel);
         }
 
@@ -573,7 +573,7 @@ public void forEachRemaining(T_CONS consumer) {
         }
 
         static final class OfInt
-                extends OfPrimitive<Integer, IntConsumer, Spliterator.OfInt>
+                extends OfPrimitive<Integer.ref, IntConsumer, Spliterator.OfInt>
                 implements Spliterator.OfInt {
 
             OfInt(Supplier<Spliterator.OfInt> supplier) {
@@ -815,7 +815,7 @@ public void forEachRemaining(T_CONS action) {
             protected abstract T_CONS emptyConsumer();
         }
 
-        static final class OfInt extends OfPrimitive<Integer, Spliterator.OfInt, IntConsumer>
+        static final class OfInt extends OfPrimitive<Integer.ref, Spliterator.OfInt, IntConsumer>
                 implements Spliterator.OfInt {
             OfInt(Spliterator.OfInt s, long sliceOrigin, long sliceFence) {
                 super(s, sliceOrigin, sliceFence);
@@ -1129,7 +1129,7 @@ public void forEachRemaining(T_CONS action) {
         }
 
         static final class OfInt
-                extends OfPrimitive<Integer, IntConsumer, ArrayBuffer.OfInt, Spliterator.OfInt>
+                extends OfPrimitive<Integer.ref, IntConsumer, ArrayBuffer.OfInt, Spliterator.OfInt>
                 implements Spliterator.OfInt, IntConsumer {
 
             int tmpValue;
@@ -1367,7 +1367,7 @@ public Spliterator<T> trySplit() {
             }
         }
 
-        static final class OfInt extends InfiniteSupplyingSpliterator<Integer>
+        static final class OfInt extends InfiniteSupplyingSpliterator<Integer.ref>
                 implements Spliterator.OfInt {
             final IntSupplier s;
 
diff --git a/src/java.base/share/classes/java/util/stream/Streams.java b/src/java.base/share/classes/java/util/stream/Streams.java
index 75e91dfb374..b8e55537a54 100755
--- a/src/java.base/share/classes/java/util/stream/Streams.java
+++ b/src/java.base/share/classes/java/util/stream/Streams.java
@@ -128,7 +128,7 @@ public int characteristics() {
         }
 
         @Override
-        public Comparator<? super Integer> getComparator() {
+        public Comparator<? super Integer.ref> getComparator() {
             return null;
         }
 
@@ -420,7 +420,7 @@ public void forEachRemaining(Consumer<? super T> action) {
     }
 
     static final class IntStreamBuilderImpl
-            extends AbstractStreamBuilderImpl<Integer, Spliterator.OfInt>
+            extends AbstractStreamBuilderImpl<Integer.ref, Spliterator.OfInt>
             implements IntStream.Builder, Spliterator.OfInt {
         // The first element in the stream
         // valid if count == 1
@@ -810,7 +810,7 @@ public void forEachRemaining(T_CONS action) {
         }
 
         static class OfInt
-                extends ConcatSpliterator.OfPrimitive<Integer, IntConsumer, Spliterator.OfInt>
+                extends ConcatSpliterator.OfPrimitive<Integer.ref, IntConsumer, Spliterator.OfInt>
                 implements Spliterator.OfInt {
             OfInt(Spliterator.OfInt aSpliterator, Spliterator.OfInt bSpliterator) {
                 super(aSpliterator, bSpliterator);
diff --git a/src/java.base/share/classes/java/util/stream/WhileOps.java b/src/java.base/share/classes/java/util/stream/WhileOps.java
index 684b52f3be2..ca2fc034220 100755
--- a/src/java.base/share/classes/java/util/stream/WhileOps.java
+++ b/src/java.base/share/classes/java/util/stream/WhileOps.java
@@ -115,7 +115,7 @@ public boolean cancellationRequested() {
      * @param upstream a reference stream with element type T
      * @param predicate the predicate that returns false to halt taking.
      */
-    static IntStream makeTakeWhileInt(AbstractPipeline<?, Integer, ?> upstream,
+    static IntStream makeTakeWhileInt(AbstractPipeline<?, Integer.ref, ?> upstream,
                                       IntPredicate predicate) {
         Objects.requireNonNull(predicate);
         return new IntPipeline.StatefulOp<Integer>(upstream, StreamShape.INT_VALUE, TAKE_FLAGS) {
@@ -403,7 +403,7 @@ public long getDropCount() {
      * @param upstream a reference stream with element type T
      * @param predicate the predicate that returns false to halt dropping.
      */
-    static IntStream makeDropWhileInt(AbstractPipeline<?, Integer, ?> upstream,
+    static IntStream makeDropWhileInt(AbstractPipeline<?, Integer.ref, ?> upstream,
                                       IntPredicate predicate) {
         Objects.requireNonNull(predicate);
         class Op extends IntPipeline.StatefulOp<Integer> implements DropWhileOp<Integer> {
@@ -820,7 +820,7 @@ Spliterator<T> makeSpliterator(Spliterator<T> s) {
             }
         }
 
-        abstract static class OfInt extends UnorderedWhileSpliterator<Integer, Spliterator.OfInt> implements IntConsumer, Spliterator.OfInt {
+        abstract static class OfInt extends UnorderedWhileSpliterator<Integer.ref, Spliterator.OfInt> implements IntConsumer, Spliterator.OfInt {
             final IntPredicate p;
             int t;
 
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java b/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java
index 2d84778d81c..54bd12136df 100755
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java
@@ -219,7 +219,7 @@ private static int strlen(MemorySegment segment, long start) {
         throw new IllegalArgumentException("String too large");
     }
 
-    static Map<VMStorage, Integer> indexMap(Binding.Move[] moves) {
+    static Map<VMStorage, Integer.ref> indexMap(Binding.Move[] moves) {
         return IntStream.range(0, moves.length)
                         .boxed()
                         .collect(Collectors.toMap(i -> moves[i].storage(), i -> i));
diff --git a/src/java.base/share/classes/jdk/internal/icu/util/VersionInfo.java b/src/java.base/share/classes/jdk/internal/icu/util/VersionInfo.java
index b270124c980..5d2231491fb 100755
--- a/src/java.base/share/classes/jdk/internal/icu/util/VersionInfo.java
+++ b/src/java.base/share/classes/jdk/internal/icu/util/VersionInfo.java
@@ -171,7 +171,7 @@ public int compareTo(VersionInfo other)
     /**
      * Map of singletons
      */
-    private static final HashMap<Integer, Object> MAP_ = new HashMap<>();
+    private static final HashMap<Integer.ref, Object> MAP_ = new HashMap<>();
     /**
      * Error statement string
      */
diff --git a/src/java.base/share/classes/jdk/internal/jimage/ImageBufferCache.java b/src/java.base/share/classes/jdk/internal/jimage/ImageBufferCache.java
index c2cc4a028be..c2693d6f9dd 100755
--- a/src/java.base/share/classes/jdk/internal/jimage/ImageBufferCache.java
+++ b/src/java.base/share/classes/jdk/internal/jimage/ImageBufferCache.java
@@ -60,7 +60,7 @@ class ImageBufferCache {
      * with thread local are bootstrap types and so no metaspace leak.
      */
     @SuppressWarnings("unchecked")
-    private static final ThreadLocal<Map.Entry<WeakReference<ByteBuffer>, Integer>[]> CACHE =
+    private static final ThreadLocal<Map.Entry<WeakReference<ByteBuffer>, Integer.ref>[]> CACHE =
         new ThreadLocal<Map.Entry<WeakReference<ByteBuffer>, Integer>[]>() {
             @Override
             protected Map.Entry<WeakReference<ByteBuffer>, Integer>[] initialValue() {
@@ -134,20 +134,20 @@ static void releaseBuffer(ByteBuffer buffer) {
         cache[MAX_CACHED_BUFFERS] = null;
     }
 
-    private static Map.Entry<WeakReference<ByteBuffer>, Integer> newCacheEntry(ByteBuffer bb) {
-        return new AbstractMap.SimpleEntry<WeakReference<ByteBuffer>, Integer>(
+    private static Map.Entry<WeakReference<ByteBuffer>, Integer.ref> newCacheEntry(ByteBuffer bb) {
+        return new AbstractMap.SimpleEntry<WeakReference<ByteBuffer>, Integer.ref>(
                     new WeakReference<ByteBuffer>(bb), bb.capacity());
     }
 
-    private static int getCapacity(Map.Entry<WeakReference<ByteBuffer>, Integer> e) {
+    private static int getCapacity(Map.Entry<WeakReference<ByteBuffer>, Integer.ref> e) {
         return e == null? 0 : e.getValue();
     }
 
-    private static ByteBuffer getByteBuffer(Map.Entry<WeakReference<ByteBuffer>, Integer> e) {
+    private static ByteBuffer getByteBuffer(Map.Entry<WeakReference<ByteBuffer>, Integer.ref> e) {
         return e == null? null : e.getKey().get();
     }
 
-    private static Comparator<Map.Entry<WeakReference<ByteBuffer>, Integer>> DECREASING_CAPACITY_NULLS_LAST =
+    private static Comparator<Map.Entry<WeakReference<ByteBuffer>, Integer.ref>> DECREASING_CAPACITY_NULLS_LAST =
         new Comparator<Map.Entry<WeakReference<ByteBuffer>, Integer>>() {
             @Override
             public int compare(Map.Entry<WeakReference<ByteBuffer>, Integer> br1,
diff --git a/src/java.base/share/classes/jdk/internal/jimage/decompressor/CompressIndexes.java b/src/java.base/share/classes/jdk/internal/jimage/decompressor/CompressIndexes.java
index 709b82a808c..d370470e8ed 100755
--- a/src/java.base/share/classes/jdk/internal/jimage/decompressor/CompressIndexes.java
+++ b/src/java.base/share/classes/jdk/internal/jimage/decompressor/CompressIndexes.java
@@ -46,7 +46,7 @@ public class CompressIndexes {
     private static final int HEADER_WIDTH = 3;
     private static final int HEADER_SHIFT = Byte.SIZE - HEADER_WIDTH;
 
-    public static List<Integer> decompressFlow(byte[] values) {
+    public static List<Integer.ref> decompressFlow(byte[] values) {
         List<Integer> lst = new ArrayList<>();
 
         for (int i = 0; i < values.length; i += getHeaderLength(values[i])) {
diff --git a/src/java.base/share/classes/jdk/internal/misc/FileSystemOption.java b/src/java.base/share/classes/jdk/internal/misc/FileSystemOption.java
index 5a55b7df67c..5ea48f03a99 100755
--- a/src/java.base/share/classes/jdk/internal/misc/FileSystemOption.java
+++ b/src/java.base/share/classes/jdk/internal/misc/FileSystemOption.java
@@ -47,11 +47,11 @@ public final class FileSystemOption<T> {
         new FileSystemOption<>(ExtendedOptions.FILE_TREE);
     public static final FileSystemOption<Void> DIRECT =
         new FileSystemOption<>(ExtendedOptions.DIRECT);
-    public static final FileSystemOption<Integer> SENSITIVITY_HIGH =
+    public static final FileSystemOption<Integer.ref> SENSITIVITY_HIGH =
         new FileSystemOption<>(ExtendedOptions.SENSITIVITY_HIGH);
-    public static final FileSystemOption<Integer> SENSITIVITY_MEDIUM =
+    public static final FileSystemOption<Integer.ref> SENSITIVITY_MEDIUM =
         new FileSystemOption<>(ExtendedOptions.SENSITIVITY_MEDIUM);
-    public static final FileSystemOption<Integer> SENSITIVITY_LOW =
+    public static final FileSystemOption<Integer.ref> SENSITIVITY_LOW =
         new FileSystemOption<>(ExtendedOptions.SENSITIVITY_LOW);
 
     private final ExtendedOptions.InternalOption<T> internalOption;
diff --git a/src/java.base/share/classes/jdk/internal/misc/Signal.java b/src/java.base/share/classes/jdk/internal/misc/Signal.java
index 9cd9ea0be0d..1be22022eee 100755
--- a/src/java.base/share/classes/jdk/internal/misc/Signal.java
+++ b/src/java.base/share/classes/jdk/internal/misc/Signal.java
@@ -72,7 +72,7 @@
  */
 public final class Signal {
     private static final Hashtable<Signal, Signal.Handler> handlers = new Hashtable<>(4);
-    private static final Hashtable<Integer, Signal> signals = new Hashtable<>(4);
+    private static final Hashtable<Integer.ref, Signal> signals = new Hashtable<>(4);
 
     private int number;
     private String name;
diff --git a/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java b/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java
index 1a751423358..1bbe17ed67a 100755
--- a/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java
@@ -44,14 +44,14 @@
 
 public final class ModuleInfoWriter {
 
-    private static final Map<ModuleDescriptor.Modifier, Integer>
+    private static final Map<ModuleDescriptor.Modifier, Integer.ref>
         MODULE_MODS_TO_FLAGS = Map.of(
             ModuleDescriptor.Modifier.OPEN, ACC_OPEN,
             ModuleDescriptor.Modifier.SYNTHETIC, ACC_SYNTHETIC,
             ModuleDescriptor.Modifier.MANDATED, ACC_MANDATED
         );
 
-    private static final Map<ModuleDescriptor.Requires.Modifier, Integer>
+    private static final Map<ModuleDescriptor.Requires.Modifier, Integer.ref>
         REQUIRES_MODS_TO_FLAGS = Map.of(
             ModuleDescriptor.Requires.Modifier.TRANSITIVE, ACC_TRANSITIVE,
             ModuleDescriptor.Requires.Modifier.STATIC, ACC_STATIC_PHASE,
@@ -59,13 +59,13 @@ public final class ModuleInfoWriter {
             ModuleDescriptor.Requires.Modifier.MANDATED, ACC_MANDATED
         );
 
-    private static final Map<ModuleDescriptor.Exports.Modifier, Integer>
+    private static final Map<ModuleDescriptor.Exports.Modifier, Integer.ref>
         EXPORTS_MODS_TO_FLAGS = Map.of(
             ModuleDescriptor.Exports.Modifier.SYNTHETIC, ACC_SYNTHETIC,
             ModuleDescriptor.Exports.Modifier.MANDATED, ACC_MANDATED
         );
 
-    private static final Map<ModuleDescriptor.Opens.Modifier, Integer>
+    private static final Map<ModuleDescriptor.Opens.Modifier, Integer.ref>
         OPENS_MODS_TO_FLAGS = Map.of(
             ModuleDescriptor.Opens.Modifier.SYNTHETIC, ACC_SYNTHETIC,
             ModuleDescriptor.Opens.Modifier.MANDATED, ACC_MANDATED
diff --git a/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java b/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
index a23a72dacec..cf53d97dd5e 100755
--- a/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
@@ -58,7 +58,7 @@ private static final class Mapper implements Function<String, ClassLoader> {
          * Map from module to a class loader index. The index is resolved to the
          * actual class loader in {@code apply}.
          */
-        private final Map<String, Integer> map;
+        private final Map<String, Integer.ref> map;
 
         /**
          * Creates a Mapper to map module names in the given Configuration to
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java
index 2753e06b06e..83b3fba40a8 100755
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java
@@ -89,7 +89,7 @@ public class LocalVariableAnnotationNode extends TypeAnnotationNode {
       * The local variable's index in each range. This list must have the same size as the 'start'
       * list. Must not be {@literal null}.
       */
-    public List<Integer> index;
+    public List<Integer.ref> index;
 
     /**
       * Constructs a new {@link LocalVariableAnnotationNode}. <i>Subclasses must not use this
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java
index 513f2c06cfa..7facdba4e31 100755
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java
@@ -76,7 +76,7 @@ public class LookupSwitchInsnNode extends AbstractInsnNode {
     public LabelNode dflt;
 
     /** The values of the keys. */
-    public List<Integer> keys;
+    public List<Integer.ref> keys;
 
     /** Beginnings of the handler blocks. */
     public List<LabelNode> labels;
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/Util.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/Util.java
index ac747f4cec2..461a097fe96 100755
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/Util.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/tree/Util.java
@@ -141,7 +141,7 @@ static List<Character> asArrayList(final char[] charArray) {
         return charList;
     }
 
-    static List<Integer> asArrayList(final int[] intArray) {
+    static List<Integer.ref> asArrayList(final int[] intArray) {
         if (intArray == null) {
             return new ArrayList<>();
         }
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java
index a1563bee95b..a29f528636e 100755
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java
@@ -118,7 +118,7 @@ public class ASMifier extends Printer {
                             "Opcodes.NULL",
                             "Opcodes.UNINITIALIZED_THIS"));
 
-    private static final Map<Integer, String> CLASS_VERSIONS;
+    private static final Map<Integer.ref, String> CLASS_VERSIONS;
 
     static {
         HashMap<Integer, String> classVersions = new HashMap<>();
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java
index 53b0c424969..9679413119c 100755
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java
@@ -181,7 +181,7 @@ public class CheckClassAdapter extends ClassVisitor {
     private boolean visitEndCalled;
 
     /** The index of the instruction designated by each visited label so far. */
-    private Map<Label, Integer> labelInsnIndices;
+    private Map<Label, Integer.ref> labelInsnIndices;
 
     // -----------------------------------------------------------------------------------------------
     // Constructors
diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java
index 47173705565..0560d32b22d 100755
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java
@@ -355,7 +355,7 @@ private enum Method {
     private int insnCount;
 
     /** The index of the instruction designated by each visited label. */
-    private final Map<Label, Integer> labelInsnIndices;
+    private final Map<Label, Integer.ref> labelInsnIndices;
 
     /** The labels referenced by the visited method. */
     private Set<Label> referencedLabels;
@@ -399,7 +399,7 @@ public CheckMethodAdapter(final MethodVisitor methodvisitor) {
       * @throws IllegalStateException If a subclass calls this constructor.
       */
     public CheckMethodAdapter(
-            final MethodVisitor methodVisitor, final Map<Label, Integer> labelInsnIndices) {
+            final MethodVisitor methodVisitor, final Map<Label, Integer.ref> labelInsnIndices) {
         this(/* latest api = */ Opcodes.ASM9, methodVisitor, labelInsnIndices);
         if (getClass() != CheckMethodAdapter.class) {
             throw new IllegalStateException();
@@ -419,7 +419,7 @@ public CheckMethodAdapter(
     protected CheckMethodAdapter(
             final int api,
             final MethodVisitor methodVisitor,
-            final Map<Label, Integer> labelInsnIndices) {
+            final Map<Label, Integer.ref> labelInsnIndices) {
         super(api, methodVisitor);
         this.labelInsnIndices = labelInsnIndices;
         this.referencedLabels = new HashSet<>();
@@ -445,7 +445,7 @@ public CheckMethodAdapter(
             final String name,
             final String descriptor,
             final MethodVisitor methodVisitor,
-            final Map<Label, Integer> labelInsnIndices) {
+            final Map<Label, Integer.ref> labelInsnIndices) {
         this(
                 /* latest api = */ Opcodes.ASM9, access, name, descriptor, methodVisitor, labelInsnIndices);
         if (getClass() != CheckMethodAdapter.class) {
@@ -473,7 +473,7 @@ protected CheckMethodAdapter(
             final String name,
             final String descriptor,
             final MethodVisitor methodVisitor,
-            final Map<Label, Integer> labelInsnIndices) {
+            final Map<Label, Integer.ref> labelInsnIndices) {
         this(
                 api,
                 new MethodNode(api, access, name, descriptor, null, null) {
diff --git a/src/java.base/share/classes/jdk/internal/vm/vector/VectorSupport.java b/src/java.base/share/classes/jdk/internal/vm/vector/VectorSupport.java
index a38b72a3b35..21cd6a86d45 100755
--- a/src/java.base/share/classes/jdk/internal/vm/vector/VectorSupport.java
+++ b/src/java.base/share/classes/jdk/internal/vm/vector/VectorSupport.java
@@ -466,13 +466,13 @@ public interface LoadVectorOperationWithMap<C,
     public static
     <C,
      V extends Vector<?>,
-     W extends Vector<Integer>,
+     W extends Vector<Integer.ref>,
      S extends VectorSpecies<E>,
      M extends VectorMask<E>,
      E>
     V loadWithMap(Class<? extends V> vClass, Class<M> mClass, Class<E> eClass,
                   int length,
-                  Class<? extends Vector<Integer>> vectorIndexClass,
+                  Class<? extends Vector<Integer.ref>> vectorIndexClass,
                   Object base, long offset,
                   W index_vector,
                   M m, C container, int index, int[] indexMap, int indexM, S s,
@@ -534,12 +534,12 @@ public interface StoreVectorOperationWithMap<C,
     public static
     <C,
      V extends Vector<E>,
-     W extends Vector<Integer>,
+     W extends Vector<Integer.ref>,
      M extends VectorMask<E>,
      E>
     void storeWithMap(Class<? extends V> vClass, Class<M> mClass, Class<E> eClass,
                       int length,
-                      Class<? extends Vector<Integer>> vectorIndexClass,
+                      Class<? extends Vector<Integer.ref>> vectorIndexClass,
                       Object base, long offset,
                       W index_vector,
                       V v, M m, C container, int index, int[] indexMap, int indexM,
diff --git a/src/java.base/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java
index 2ca1f8a87b8..f1526cbc313 100755
--- a/src/java.base/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java
@@ -208,13 +208,13 @@ final void release(FileLockImpl fli) throws IOException {
 
     // -- reading and writing --
 
-    abstract <A> Future<Integer> implRead(ByteBuffer dst,
+    abstract <A> Future<Integer.ref> implRead(ByteBuffer dst,
                                          long position,
                                          A attachment,
-                                         CompletionHandler<Integer,? super A> handler);
+                                         CompletionHandler<Integer.ref,? super A> handler);
 
     @Override
-    public final Future<Integer> read(ByteBuffer dst, long position) {
+    public final Future<Integer.ref> read(ByteBuffer dst, long position) {
         return implRead(dst, position, null, null);
     }
 
@@ -222,21 +222,21 @@ public final Future<Integer> read(ByteBuffer dst, long position) {
     public final <A> void read(ByteBuffer dst,
                                long position,
                                A attachment,
-                               CompletionHandler<Integer,? super A> handler)
+                               CompletionHandler<Integer.ref,? super A> handler)
     {
         if (handler == null)
             throw new NullPointerException("'handler' is null");
         implRead(dst, position, attachment, handler);
     }
 
-    abstract <A> Future<Integer> implWrite(ByteBuffer src,
+    abstract <A> Future<Integer.ref> implWrite(ByteBuffer src,
                                            long position,
                                            A attachment,
-                                           CompletionHandler<Integer,? super A> handler);
+                                           CompletionHandler<Integer.ref,? super A> handler);
 
 
     @Override
-    public final Future<Integer> write(ByteBuffer src, long position) {
+    public final Future<Integer.ref> write(ByteBuffer src, long position) {
         return implWrite(src, position, null, null);
     }
 
@@ -244,7 +244,7 @@ public final Future<Integer> write(ByteBuffer src, long position) {
     public final <A> void write(ByteBuffer src,
                                 long position,
                                 A attachment,
-                                CompletionHandler<Integer,? super A> handler)
+                                CompletionHandler<Integer.ref,? super A> handler)
     {
         if (handler == null)
             throw new NullPointerException("'handler' is null");
diff --git a/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
index 9c07dc47cd2..c9db2d8492c 100755
--- a/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
@@ -278,7 +278,7 @@ private <V extends Number,A> Future<V> read(boolean isScatteringRead,
     }
 
     @Override
-    public final Future<Integer> read(ByteBuffer dst) {
+    public final Future<Integer.ref> read(ByteBuffer dst) {
         if (dst.isReadOnly())
             throw new IllegalArgumentException("Read-only buffer");
         return read(false, dst, null, 0L, TimeUnit.MILLISECONDS, null, null);
@@ -289,7 +289,7 @@ public final <A> void read(ByteBuffer dst,
                                long timeout,
                                TimeUnit unit,
                                A attachment,
-                               CompletionHandler<Integer,? super A> handler)
+                               CompletionHandler<Integer.ref,? super A> handler)
     {
         if (handler == null)
             throw new NullPointerException("'handler' is null");
@@ -383,7 +383,7 @@ private <V extends Number,A> Future<V> write(boolean isGatheringWrite,
     }
 
     @Override
-    public final Future<Integer> write(ByteBuffer src) {
+    public final Future<Integer.ref> write(ByteBuffer src) {
         return write(false, src, null, 0L, TimeUnit.MILLISECONDS, null, null);
     }
 
@@ -392,7 +392,7 @@ public final <A> void write(ByteBuffer src,
                                 long timeout,
                                 TimeUnit unit,
                                 A attachment,
-                                CompletionHandler<Integer,? super A> handler)
+                                CompletionHandler<Integer.ref,? super A> handler)
     {
         if (handler == null)
             throw new NullPointerException("'handler' is null");
diff --git a/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java b/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
index d59a4dc4b92..22e4ee7c661 100755
--- a/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
+++ b/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
@@ -325,7 +325,7 @@ private void setBooleanOption(SocketOption<Boolean> name, boolean value)
         }
     }
 
-    private void setIntOption(SocketOption<Integer> name, int value)
+    private void setIntOption(SocketOption<Integer.ref> name, int value)
         throws SocketException
     {
         try {
@@ -344,7 +344,7 @@ private boolean getBooleanOption(SocketOption<Boolean> name) throws SocketExcept
         }
     }
 
-    private int getIntOption(SocketOption<Integer> name) throws SocketException {
+    private int getIntOption(SocketOption<Integer.ref> name) throws SocketException {
         try {
             return dc.getOption(name).intValue();
         } catch (IOException x) {
diff --git a/src/java.base/share/classes/sun/nio/ch/Poller.java b/src/java.base/share/classes/sun/nio/ch/Poller.java
index f4e95e1dcce..b8880006810 100755
--- a/src/java.base/share/classes/sun/nio/ch/Poller.java
+++ b/src/java.base/share/classes/sun/nio/ch/Poller.java
@@ -53,7 +53,7 @@ public abstract class Poller {
     private final boolean read;
 
     // maps file descriptors to parked Thread
-    private final Map<Integer, Thread> map = new ConcurrentHashMap<>();
+    private final Map<Integer.ref, Thread> map = new ConcurrentHashMap<>();
 
     // the queue of updates to the updater Thread
     private final BlockingQueue<Request> queue = new LinkedTransferQueue<>();
diff --git a/src/java.base/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java
index b41430c8d9d..76e2b4bcf77 100755
--- a/src/java.base/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java
@@ -290,10 +290,10 @@ protected void implRelease(FileLockImpl fli) throws IOException {
     }
 
     @Override
-    <A> Future<Integer> implRead(final ByteBuffer dst,
+    <A> Future<Integer.ref> implRead(final ByteBuffer dst,
                                  final long position,
                                  final A attachment,
-                                 final CompletionHandler<Integer,? super A> handler)
+                                 final CompletionHandler<Integer.ref,? super A> handler)
     {
         if (position < 0)
             throw new IllegalArgumentException("Negative position");
@@ -346,10 +346,10 @@ public void run() {
     }
 
     @Override
-    <A> Future<Integer> implWrite(final ByteBuffer src,
+    <A> Future<Integer.ref> implWrite(final ByteBuffer src,
                                   final long position,
                                   final A attachment,
-                                  final CompletionHandler<Integer,? super A> handler)
+                                  final CompletionHandler<Integer.ref,? super A> handler)
     {
         if (position < 0)
             throw new IllegalArgumentException("Negative position");
diff --git a/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java b/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java
index 076f817d5ce..f0b28586313 100755
--- a/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java
+++ b/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java
@@ -205,7 +205,7 @@ private void setBooleanOption(SocketOption<Boolean> name, boolean value)
         }
     }
 
-    private void setIntOption(SocketOption<Integer> name, int value)
+    private void setIntOption(SocketOption<Integer.ref> name, int value)
         throws SocketException
     {
         try {
@@ -224,7 +224,7 @@ private boolean getBooleanOption(SocketOption<Boolean> name) throws SocketExcept
         }
     }
 
-    private int getIntOption(SocketOption<Integer> name) throws SocketException {
+    private int getIntOption(SocketOption<Integer.ref> name) throws SocketException {
         try {
             return sc.getOption(name).intValue();
         } catch (IOException x) {
diff --git a/src/java.base/share/classes/sun/nio/fs/ExtendedOptions.java b/src/java.base/share/classes/sun/nio/fs/ExtendedOptions.java
index 673c3296696..476566b0f9c 100755
--- a/src/java.base/share/classes/sun/nio/fs/ExtendedOptions.java
+++ b/src/java.base/share/classes/sun/nio/fs/ExtendedOptions.java
@@ -139,7 +139,7 @@ public T parameter() {
 
     public static final InternalOption<Void> DIRECT = new InternalOption<>();
 
-    public static final InternalOption<Integer> SENSITIVITY_HIGH = new InternalOption<>();
-    public static final InternalOption<Integer> SENSITIVITY_MEDIUM = new InternalOption<>();
-    public static final InternalOption<Integer> SENSITIVITY_LOW = new InternalOption<>();
+    public static final InternalOption<Integer.ref> SENSITIVITY_HIGH = new InternalOption<>();
+    public static final InternalOption<Integer.ref> SENSITIVITY_MEDIUM = new InternalOption<>();
+    public static final InternalOption<Integer.ref> SENSITIVITY_LOW = new InternalOption<>();
 }
diff --git a/src/java.base/share/classes/sun/security/action/GetIntegerAction.java b/src/java.base/share/classes/sun/security/action/GetIntegerAction.java
index 2d9a598149c..bb970d07369 100755
--- a/src/java.base/share/classes/sun/security/action/GetIntegerAction.java
+++ b/src/java.base/share/classes/sun/security/action/GetIntegerAction.java
@@ -66,7 +66,7 @@
  */
 
 public class GetIntegerAction
-        implements java.security.PrivilegedAction<Integer> {
+        implements java.security.PrivilegedAction<Integer.ref> {
     private final String theProp;
     private final int defaultVal;
     private final boolean defaultSet;
diff --git a/src/java.base/share/classes/sun/security/provider/ParameterCache.java b/src/java.base/share/classes/sun/security/provider/ParameterCache.java
index 9cdc7a215c3..564cf803b20 100755
--- a/src/java.base/share/classes/sun/security/provider/ParameterCache.java
+++ b/src/java.base/share/classes/sun/security/provider/ParameterCache.java
@@ -51,10 +51,10 @@ private ParameterCache() {
     }
 
     // cache of DSA parameters
-    private static final Map<Integer,DSAParameterSpec> dsaCache;
+    private static final Map<Integer.ref,DSAParameterSpec> dsaCache;
 
     // cache of DH parameters
-    private static final Map<Integer,DHParameterSpec> dhCache;
+    private static final Map<Integer.ref,DHParameterSpec> dhCache;
 
     // convert DHParameterSpec to SafeDHParameterSpec if its parameters are
     // safe primes; validation takes time but should be worthwhile for the
diff --git a/src/java.base/share/classes/sun/security/rsa/RSAPSSSignature.java b/src/java.base/share/classes/sun/security/rsa/RSAPSSSignature.java
index f15b058014a..87fee0c7987 100755
--- a/src/java.base/share/classes/sun/security/rsa/RSAPSSSignature.java
+++ b/src/java.base/share/classes/sun/security/rsa/RSAPSSSignature.java
@@ -81,7 +81,7 @@ private boolean isDigestEqual(String stdAlg, String givenAlg) {
 
     private static final byte[] EIGHT_BYTES_OF_ZEROS = new byte[8];
 
-    private static final Hashtable<KnownOIDs, Integer> DIGEST_LENGTHS =
+    private static final Hashtable<KnownOIDs, Integer.ref> DIGEST_LENGTHS =
             new Hashtable<>();
     static {
         DIGEST_LENGTHS.put(KnownOIDs.SHA_1, 20);
diff --git a/src/java.base/share/classes/sun/security/ssl/CipherSuite.java b/src/java.base/share/classes/sun/security/ssl/CipherSuite.java
index 019f1ad34d9..09c0a778545 100755
--- a/src/java.base/share/classes/sun/security/ssl/CipherSuite.java
+++ b/src/java.base/share/classes/sun/security/ssl/CipherSuite.java
@@ -853,7 +853,7 @@ enum CipherSuite {
 
     final boolean exportable;
 
-    private static final Map<Integer, CipherSuite> cipherSuiteIds;
+    private static final Map<Integer.ref, CipherSuite> cipherSuiteIds;
     private static final Map<String, CipherSuite> cipherSuiteNames;
     private static final List<CipherSuite> allowedCipherSuites;
     private static final List<CipherSuite> defaultCipherSuites;
diff --git a/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java b/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java
index 337cf76f2c2..196283518fe 100755
--- a/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java
@@ -561,7 +561,7 @@ private static final class HandshakeFlight implements Cloneable {
         HashMap<Byte, List<HoleDescriptor>> holesMap;
 
         // A map used to check duplicated handshake messages.
-        HashMap<Byte, Integer> messageSeqMap;
+        HashMap<Byte, Integer.ref> messageSeqMap;
 
         HandshakeFlight() {
             this.handshakeType = HF_UNKNOWN;
diff --git a/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java b/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java
index 14f4a9b4d90..cd11c0f9d3f 100755
--- a/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java
+++ b/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java
@@ -224,10 +224,10 @@ final class PredefinedDHParameterSpecs {
             "\\{([0-9A-Fa-f]+),([0-9A-Fa-f]+)}");
 
     // cache of predefined default DH ephemeral parameters
-    static final Map<Integer, DHParameterSpec> definedParams;
+    static final Map<Integer.ref, DHParameterSpec> definedParams;
 
     // cache of Finite Field DH Ephemeral parameters (RFC 7919/FFDHE)
-    static final Map<Integer, DHParameterSpec> ffdheParams;
+    static final Map<Integer.ref, DHParameterSpec> ffdheParams;
 
     static {
         @SuppressWarnings("removal")
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java b/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java
index 5ad93cfc836..5d878cf9b0f 100755
--- a/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java
@@ -42,7 +42,7 @@ final class SSLExtensions {
     private int encodedLength;
 
     // Extension map for debug logging
-    private final Map<Integer, byte[]> logMap =
+    private final Map<Integer.ref, byte[]> logMap =
             SSLLogger.isOn ? new LinkedHashMap<>() : null;
 
     SSLExtensions(HandshakeMessage handshakeMessage) {
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java
index eb9eb75debe..3eb21a54cfc 100755
--- a/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java
@@ -76,7 +76,7 @@ final class SSLSessionContextImpl implements SSLSessionContext {
     // The current session ticket encryption key ID (only used in server context)
     private int currentKeyID;
     // Session ticket encryption keys and IDs map (only used in server context)
-    private final Map<Integer, SessionTicketExtension.StatelessKey> keyHashMap;
+    private final Map<Integer.ref, SessionTicketExtension.StatelessKey> keyHashMap;
 
     // Default setting for stateless session resumption support (RFC 5077)
     private boolean statelessSession = true;
diff --git a/src/java.base/share/classes/sun/security/util/CurveDB.java b/src/java.base/share/classes/sun/security/util/CurveDB.java
index 37578c157bd..ceacada0aad 100755
--- a/src/java.base/share/classes/sun/security/util/CurveDB.java
+++ b/src/java.base/share/classes/sun/security/util/CurveDB.java
@@ -48,7 +48,7 @@ public class CurveDB {
             new LinkedHashMap<>();
     private static final Map<String,NamedCurve> nameMap =
             new HashMap<>();
-    private static final Map<Integer,NamedCurve> lengthMap =
+    private static final Map<Integer.ref,NamedCurve> lengthMap =
             new HashMap<>();
 
     private static final Collection<? extends NamedCurve> specCollection;
diff --git a/src/java.base/share/classes/sun/util/BuddhistCalendar.java b/src/java.base/share/classes/sun/util/BuddhistCalendar.java
index d8ea06f72c5..53409ce580b 100755
--- a/src/java.base/share/classes/sun/util/BuddhistCalendar.java
+++ b/src/java.base/share/classes/sun/util/BuddhistCalendar.java
@@ -195,7 +195,7 @@ public String getDisplayName(int field, int style, Locale locale) {
     }
 
     @Override
-    public Map<String,Integer> getDisplayNames(int field, int style, Locale locale) {
+    public Map<String,Integer.ref> getDisplayNames(int field, int style, Locale locale) {
         if (field != ERA) {
             return super.getDisplayNames(field, style, locale);
         }
diff --git a/src/java.base/share/classes/sun/util/cldr/CLDRCalendarDataProviderImpl.java b/src/java.base/share/classes/sun/util/cldr/CLDRCalendarDataProviderImpl.java
index 388af637e54..cb087149aae 100755
--- a/src/java.base/share/classes/sun/util/cldr/CLDRCalendarDataProviderImpl.java
+++ b/src/java.base/share/classes/sun/util/cldr/CLDRCalendarDataProviderImpl.java
@@ -47,8 +47,8 @@
  */
 public class CLDRCalendarDataProviderImpl extends CalendarDataProviderImpl {
 
-    private static Map<String, Integer> firstDay = new ConcurrentHashMap<>();
-    private static Map<String, Integer> minDays = new ConcurrentHashMap<>();
+    private static Map<String, Integer.ref> firstDay = new ConcurrentHashMap<>();
+    private static Map<String, Integer.ref> minDays = new ConcurrentHashMap<>();
 
     public CLDRCalendarDataProviderImpl(Type type, Set<String> langtags) {
         super(type, langtags);
@@ -97,7 +97,7 @@ private static int findValue(String key, Locale locale) {
         return val;
     }
 
-    private static Optional<Integer> retrieveInteger(String src, String region) {
+    private static Optional<Integer.ref> retrieveInteger(String src, String region) {
         int regionIndex = src.indexOf(region);
         if (regionIndex >= 0) {
             int start = src.lastIndexOf(';', regionIndex) + 1;
diff --git a/src/java.base/share/classes/sun/util/locale/provider/BreakIteratorProviderImpl.java b/src/java.base/share/classes/sun/util/locale/provider/BreakIteratorProviderImpl.java
index 3f531c9a5f9..f2807e696b3 100755
--- a/src/java.base/share/classes/sun/util/locale/provider/BreakIteratorProviderImpl.java
+++ b/src/java.base/share/classes/sun/util/locale/provider/BreakIteratorProviderImpl.java
@@ -198,7 +198,7 @@ public boolean isSupportedLocale(Locale locale) {
     static final class GraphemeBreakIterator extends BreakIterator {
         CharacterIterator ci;
         int offset;
-        List<Integer> boundaries;
+        List<Integer.ref> boundaries;
         int boundaryIndex;
 
         GraphemeBreakIterator() {
diff --git a/src/java.base/share/classes/sun/util/locale/provider/CalendarDataUtility.java b/src/java.base/share/classes/sun/util/locale/provider/CalendarDataUtility.java
index 72a05904ade..72a60a369c2 100755
--- a/src/java.base/share/classes/sun/util/locale/provider/CalendarDataUtility.java
+++ b/src/java.base/share/classes/sun/util/locale/provider/CalendarDataUtility.java
@@ -108,17 +108,17 @@ public static String retrieveJavaTimeFieldValueName(String id, int field, int va
         return name;
     }
 
-    public static Map<String, Integer> retrieveFieldValueNames(String id, int field, int style, Locale locale) {
+    public static Map<String, Integer.ref> retrieveFieldValueNames(String id, int field, int style, Locale locale) {
         LocaleServiceProviderPool pool =
             LocaleServiceProviderPool.getPool(CalendarNameProvider.class);
         return pool.getLocalizedObject(CalendarFieldValueNamesMapGetter.INSTANCE, locale,
                                        normalizeCalendarType(id), field, style, false);
     }
 
-    public static Map<String, Integer> retrieveJavaTimeFieldValueNames(String id, int field, int style, Locale locale) {
+    public static Map<String, Integer.ref> retrieveJavaTimeFieldValueNames(String id, int field, int style, Locale locale) {
         LocaleServiceProviderPool pool =
             LocaleServiceProviderPool.getPool(CalendarNameProvider.class);
-        Map<String, Integer> map;
+        Map<String, Integer.ref> map;
         map = pool.getLocalizedObject(CalendarFieldValueNamesMapGetter.INSTANCE, locale,
                                        normalizeCalendarType(id), field, style, true);
         if (map == null) {
@@ -207,12 +207,12 @@ public String getObject(CalendarNameProvider calendarNameProvider,
      */
     private static class CalendarFieldValueNamesMapGetter
         implements LocaleServiceProviderPool.LocalizedObjectGetter<CalendarNameProvider,
-                                                                   Map<String, Integer>> {
+                                                                   Map<String, Integer.ref>> {
         private static final CalendarFieldValueNamesMapGetter INSTANCE =
             new CalendarFieldValueNamesMapGetter();
 
         @Override
-        public Map<String, Integer> getObject(CalendarNameProvider calendarNameProvider,
+        public Map<String, Integer.ref> getObject(CalendarNameProvider calendarNameProvider,
                                               Locale locale,
                                               String requestID, // calendarType
                                               Object... params) {
@@ -235,7 +235,7 @@ public Map<String, Integer> getObject(CalendarNameProvider calendarNameProvider,
 
     private static class CalendarWeekParameterGetter
         implements LocaleServiceProviderPool.LocalizedObjectGetter<CalendarDataProvider,
-                                                                   Integer> {
+                                                                   Integer.ref> {
         private static final CalendarWeekParameterGetter INSTANCE =
             new CalendarWeekParameterGetter();
 
diff --git a/src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java b/src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java
index 19d32f16793..df83b0bf53e 100755
--- a/src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java
+++ b/src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java
@@ -135,7 +135,7 @@ public String getDisplayNameImpl(String calendarType, int field, int value, int
     };
 
     @Override
-    public Map<String, Integer> getDisplayNames(String calendarType, int field, int style, Locale locale) {
+    public Map<String, Integer.ref> getDisplayNames(String calendarType, int field, int style, Locale locale) {
         Map<String, Integer> names;
         if (style == ALL_STYLES) {
             names = getDisplayNamesImpl(calendarType, field, SHORT_FORMAT, locale, false);
@@ -150,13 +150,13 @@ public Map<String, Integer> getDisplayNames(String calendarType, int field, int
     }
 
     // NOTE: This method should be used ONLY BY JSR 310 classes.
-    public Map<String, Integer> getJavaTimeDisplayNames(String calendarType, int field, int style, Locale locale) {
+    public Map<String, Integer.ref> getJavaTimeDisplayNames(String calendarType, int field, int style, Locale locale) {
         Map<String, Integer> names;
         names = getDisplayNamesImpl(calendarType, field, style, locale, true);
         return names.isEmpty() ? null : names;
     }
 
-    private Map<String, Integer> getDisplayNamesImpl(String calendarType, int field,
+    private Map<String, Integer.ref> getDisplayNamesImpl(String calendarType, int field,
                                                      int style, Locale locale, boolean javatime) {
         String key = getResourceKey(calendarType, field, style, javatime);
         Map<String, Integer> map = new TreeMap<>(LengthBasedComparator.INSTANCE);
diff --git a/src/java.base/share/classes/sun/util/locale/provider/SPILocaleProviderAdapter.java b/src/java.base/share/classes/sun/util/locale/provider/SPILocaleProviderAdapter.java
index 65b1b75a87c..b0f16d6b915 100755
--- a/src/java.base/share/classes/sun/util/locale/provider/SPILocaleProviderAdapter.java
+++ b/src/java.base/share/classes/sun/util/locale/provider/SPILocaleProviderAdapter.java
@@ -452,7 +452,7 @@ public String getDisplayName(String calendarType,
         }
 
         @Override
-        public Map<String, Integer> getDisplayNames(String calendarType,
+        public Map<String, Integer.ref> getDisplayNames(String calendarType,
                                                              int field, int style,
                                                              Locale locale) {
             locale = CalendarDataUtility.findRegionOverride(locale);
diff --git a/src/java.base/unix/classes/sun/nio/ch/Port.java b/src/java.base/unix/classes/sun/nio/ch/Port.java
index 81e1ed87615..03ac7e5d97b 100755
--- a/src/java.base/unix/classes/sun/nio/ch/Port.java
+++ b/src/java.base/unix/classes/sun/nio/ch/Port.java
@@ -50,8 +50,8 @@ interface PollableChannel extends Closeable {
 
     // maps fd to "pollable" channel
     protected final ReadWriteLock fdToChannelLock = new ReentrantReadWriteLock();
-    protected final Map<Integer,PollableChannel> fdToChannel =
-        new HashMap<Integer,PollableChannel>();
+    protected final Map<Integer.ref,PollableChannel> fdToChannel =
+        new HashMap<Integer.ref,PollableChannel>();
 
 
     Port(AsynchronousChannelProvider provider, ThreadPool pool) {