Changes to make java.lang.Integer primitive class.

arjunhkumar · Nov 10, 2023 · 320e17e · 320e17e
1 parent abd5df1
commit 320e17e
Show file tree

Hide file tree

Showing 40 changed files with 179 additions and 45,579 deletions.
diff --git a/Snap.20231018.053732.562846.0003.trc b/Snap.20231018.053732.562846.0003.trc
diff --git a/closed/DDR.gmk b/closed/DDR.gmk
@@ -71,7 +71,7 @@ $(eval $(call SetupJavaCompilation,BUILD_DDR_TOOLS, \
 	TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
 	BIN := $(DDR_TOOLS_BIN), \
 	CLASSPATH := $(JDK_OUTPUTDIR)/modules/java.base, \
-	JAVAC_FLAGS := --add-exports=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED, \
+	JAVAC_FLAGS := --add-exports=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED,-XDenablePrimitiveClasses \
 	SRC := $(DDR_VM_SRC_ROOT), \
 	INCLUDE_FILES := \
 		com/ibm/j9ddr/BytecodeGenerator.java \
@@ -165,7 +165,7 @@ ifneq (,$(wildcard $(DDR_GENSRC_DIR)))
 # as they would be dynamically generated from the blob.
 $(eval $(call SetupJavaCompilation,BUILD_J9DDR_TEST_CLASSES, \
 	DEPENDS := $(DDR_CLASSES_MARKER), \
-	JAVAC_FLAGS := \
+	JAVAC_FLAGS := -XDenablePrimitiveClasses\
 		--patch-module openj9.dtfj=$(DDR_CLASSES_BIN) \
 		--upgrade-module-path $(JDK_OUTPUTDIR)/modules \
 		--system none, \

diff --git a/javacore.20231018.053732.562846.0002.txt b/javacore.20231018.053732.562846.0002.txt
diff --git a/jitdump.20231018.053732.562846.0004.dmp b/jitdump.20231018.053732.562846.0004.dmp
diff --git a/make/CompileInterimLangtools.gmk b/make/CompileInterimLangtools.gmk
@@ -104,7 +104,7 @@ define SetupInterimModule
       COPY := .gif .png .xml .css .svg .js .js.template .txt javax.tools.JavaCompilerTool, \
       BIN := $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules/$1.interim, \
       DISABLED_WARNINGS := module options, \
-      JAVAC_FLAGS := \
+      JAVAC_FLAGS := -XDenablePrimitiveClasses\
           --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
           $$(INTERIM_LANGTOOLS_ADD_EXPORTS) \
           --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \

diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
@@ -107,7 +107,7 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
     EXCLUDES := $(EXCLUDES), \
     EXCLUDE_FILES := $(EXCLUDE_FILES), \
     KEEP_ALL_TRANSLATIONS := $(KEEP_ALL_TRANSLATIONS), \
-    JAVAC_FLAGS := \
+    JAVAC_FLAGS := -XDenablePrimitiveClasses\
         $(DOCLINT) \
         $(JAVAC_FLAGS) \
         --module-source-path $(MODULESOURCEPATH) \

diff --git a/make/CompileModuleTools.gmk b/make/CompileModuleTools.gmk
@@ -54,7 +54,7 @@ $(eval $(call SetupJavaCompilation, BUILD_JIGSAW_TOOLS, \
     COPY := .properties .html, \
     BIN := $(TOOLS_CLASSES_DIR), \
     DISABLED_WARNINGS := fallthrough, \
-    JAVAC_FLAGS := \
+    JAVAC_FLAGS := -XDenablePrimitiveClasses\
         --add-modules jdk.jdeps \
         --add-exports java.base/jdk.internal.module=ALL-UNNAMED \
         --add-exports jdk.jdeps/com.sun.tools.jdeps=ALL-UNNAMED, \

diff --git a/make/CompileToolsJdk.gmk b/make/CompileToolsJdk.gmk
@@ -77,7 +77,7 @@ $(eval $(call SetupJavaCompilation, COMPILE_DEPEND, \
     INCLUDES := build/tools/depend, \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/depend, \
     DISABLED_WARNINGS := options, \
-    JAVAC_FLAGS := \
+    JAVAC_FLAGS := -XDenablePrimitiveClasses\
         --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
         --add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
         --add-exports jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \

diff --git a/make/Snap.20231015.105247.2664674.0009.trc b/make/Snap.20231015.105247.2664674.0009.trc
diff --git a/make/Snap.20231015.164329.2768939.0015.trc b/make/Snap.20231015.164329.2768939.0015.trc
diff --git a/make/Snap.20231016.090043.3219092.0003.trc b/make/Snap.20231016.090043.3219092.0003.trc
diff --git a/make/Snap.20231016.092740.3261501.0003.trc b/make/Snap.20231016.092740.3261501.0003.trc
diff --git a/make/Snap.20231018.053738.563119.0003.trc b/make/Snap.20231018.053738.563119.0003.trc
diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk
@@ -169,6 +169,7 @@ endef
 #        hash which can be used for down stream dependencies to only rebuild
 #        when the API changes.
 #   KEEP_ALL_TRANSLATIONS:=Set to true to skip translation filtering
+JAVAC_FLAGS:=-XDenablePrimitiveClasses
 SetupJavaCompilation = $(NamedParamsMacroTemplate)
 define SetupJavaCompilationBody
 

diff --git a/make/ide/visualstudio/hotspot/CreateVSProject.gmk b/make/ide/visualstudio/hotspot/CreateVSProject.gmk
@@ -90,7 +90,7 @@ ifeq ($(call isTargetOs, windows), true)
       DISABLED_WARNINGS := auxiliaryclass deprecation rawtypes unchecked cast options, \
       SRC := $(TOPDIR)/make/ide/visualstudio/hotspot/src/classes, \
       BIN := $(TOOLS_OUTPUTDIR), \
-      JAVAC_FLAGS := -XDstringConcat=inline, \
+      JAVAC_FLAGS := -XDstringConcat=inline \
   ))
 
   TARGETS += $(BUILD_PROJECT_CREATOR)

diff --git a/make/javac.20231108_080906.args b/make/javac.20231108_080906.args
@@ -0,0 +1,31 @@
+-g
+-Xlint:all
+-source
+21
+-target
+21
+-implicit:none
+-Xprefer:source
+-XDignore.symbol.file=true
+-encoding
+ascii
+-Xdoclint:all/protected
+-Xdoclint/package:java.*,javax.*
+-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.20231108_084653.args b/make/javac.20231108_084653.args
@@ -0,0 +1,31 @@
+-g
+-Xlint:all
+-source
+21
+-target
+21
+-implicit:none
+-Xprefer:source
+-XDignore.symbol.file=true
+-encoding
+ascii
+-Xdoclint:all/protected
+-Xdoclint/package:java.*,javax.*
+-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.20231108_162854.args b/make/javac.20231108_162854.args
@@ -0,0 +1,32 @@
+-g
+-Xlint:all
+-source
+21
+-target
+21
+-implicit:none
+-Xprefer:source
+-XDignore.symbol.file=true
+-encoding
+ascii
+-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.20231108_163944.args b/make/javac.20231108_163944.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.20231108_164139.args b/make/javac.20231108_164139.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