Merge master HEAD into openj9-staging

Signed-off-by: J9 Build <[email protected]>

Author: j9build

.gitignore

@@ -45,8 +45,5 @@ NashornProfile.txt
 /src/utils/LogCompilation/target/
 /.project/
 /.settings/
-/.project
-/.classpath
-/.cproject
 /compile_commands.json
 /.cache

doc/ide.html

@@ -110,10 +110,6 @@ <h4 id="eclipse-cdt">Eclipse CDT</h4>
 <pre><code>make eclipse-mixed-env</code></pre>
 <p>Do note that this generates all features that come with both Java and
 C/C++ natures.</p>
-<p>By default, the Eclipse Workspace is located in the ide subdirectory
-in the build output. To share the JDK's source directory with the
-Eclipse Workspace, you can instead run:</p>
-<pre><code>make eclipse-shared-&lt;ENV&gt;-env</code></pre>
 <p>Eclipse support in the JDK is relatively new, so do keep in mind that
 not everything may work at the moment. As such, the resulting Workspace
 also has compilation database parsing support enabled, so you can pass
@@ -160,9 +156,6 @@ <h4 id="eclipse">Eclipse</h4>
 <p>If doing so results in an error, you can also import the JDK via
 <code>File -&gt; Import -&gt; Existing Projects into Workspace</code> as
 a last resort.</p>
-<p>Alternatively, if you want a Java Workspace inside the JDK's source
-directory, you can instead run:</p>
-<pre><code>make eclipse-shared-java-env</code></pre>
 <p>As mentioned above for Eclipse CDT, you can create a combined Java
 and C/C++ Workspace which can conveniently switch between Java and C/C++
 natures during development by running:</p>

doc/ide.md

@@ -100,14 +100,6 @@ make eclipse-mixed-env
 Do note that this generates all features that come with both Java and C/C++
 natures.
 
-By default, the Eclipse Workspace is located in the ide subdirectory in the
-build output. To share the JDK's source directory with the Eclipse Workspace,
-you can instead run:
-
-```
-make eclipse-shared-<ENV>-env
-```
-
 Eclipse support in the JDK is relatively new, so do keep in mind that not
 everything may work at the moment. As such, the resulting Workspace also
 has compilation database parsing support enabled, so you can pass Eclipse
@@ -176,13 +168,6 @@ If doing so results in an error, you can also import the JDK via
 `File -> Import -> Existing Projects into Workspace`
 as a last resort.
 
-Alternatively, if you want a Java Workspace inside the JDK's source directory,
-you can instead run:
-
-```
-make eclipse-shared-java-env
-```
-
 As mentioned above for Eclipse CDT, you can create a combined Java and C/C++
 Workspace which can conveniently switch between Java and C/C++ natures during
 development by running:

make/Main.gmk

@@ -274,42 +274,22 @@ $(eval $(call SetupTarget, hotspot-ide-project, \
 
 $(eval $(call SetupTarget, eclipse-java-env, \
     MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make WORKSPACE=java SHARED=false, \
+    ARGS := --always-make WORKSPACE=java, \
 ))
 
 $(eval $(call SetupTarget, eclipse-hotspot-env, \
     MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make WORKSPACE=hotspot SHARED=false, \
+    ARGS := --always-make WORKSPACE=hotspot, \
 ))
 
 $(eval $(call SetupTarget, eclipse-native-env, \
     MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make WORKSPACE=native SHARED=false, \
+    ARGS := --always-make WORKSPACE=native, \
 ))
 
 $(eval $(call SetupTarget, eclipse-mixed-env, \
     MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make SHARED=false, \
-))
-
-$(eval $(call SetupTarget, eclipse-shared-java-env, \
-    MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make WORKSPACE=java SHARED=true, \
-))
-
-$(eval $(call SetupTarget, eclipse-shared-hotspot-env, \
-    MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make WORKSPACE=hotspot SHARED=true, \
-))
-
-$(eval $(call SetupTarget, eclipse-shared-native-env, \
-    MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make WORKSPACE=native SHARED=true, \
-))
-
-$(eval $(call SetupTarget, eclipse-shared-mixed-env, \
-    MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make SHARED=true, \
+    ARGS := --always-make, \
 ))
 
 ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \

make/ide/eclipse/CreateWorkspace.gmk

@@ -78,8 +78,6 @@ EmitExtractedDefines = \
 # Remaining parameter(s) are named arguments:
 #   NATURE - Which Eclipse Workspace nature to generate for the Workspace. Can
 #       be one of JAVA, HOTSPOT, NATIVE, or MIXED.
-#   SHARED - Workspace will share the same directory as the JDK if true. Can be
-#       either true or false. Defaults to false if not specified.
 SetupEclipseWorkspace = $(NamedParamsMacroTemplate)
 define SetupEclipseWorkspaceBody
 
@@ -95,26 +93,12 @@ define SetupEclipseWorkspaceBody
     $$(error Unrecognised nature $$($1_NATURE) specified for Eclipse Workspace)
   endif
 
-  ifeq ($$($1_SHARED), )
-    $$(info Workspace sharing option not given, assuming non-shared Eclipse Workspace)
-    $1_SHARED := false
-  else ifeq ($$(findstring $$($1_SHARED), true false), )
-    $$(error $$($1_NATURE) is not a boolean word)
-  endif
-
-  ifeq ($$($1_SHARED), true)
-    $1_CLASSPATH_FILE := $(TOPDIR)/.classpath
-    $1_WORKSPACE_FILE := $(TOPDIR)/.project
-    $1_NATIVE_FILE := $(TOPDIR)/.cproject
-    $1_SETTINGS_FILE := $(TOPDIR)/.settings/language.settings.xml
-  else
-    $1_IDE_OUTPUTDIR := $(OUTPUTDIR)/ide/eclipse
-    $1_CLASSPATH_FILE := $$($1_IDE_OUTPUTDIR)/.classpath
-    $1_WORKSPACE_FILE := $$($1_IDE_OUTPUTDIR)/.project
-    $1_NATIVE_FILE := $$($1_IDE_OUTPUTDIR)/.cproject
-    $1_SETTINGS_FILE := $$($1_IDE_OUTPUTDIR)/.settings/language.settings.xml
-    $$(call MakeDir, $$($1_IDE_OUTPUTDIR))
-  endif
+  $1_IDE_OUTPUTDIR := $(OUTPUTDIR)/ide/eclipse
+  $1_CLASSPATH_FILE := $$($1_IDE_OUTPUTDIR)/.classpath
+  $1_WORKSPACE_FILE := $$($1_IDE_OUTPUTDIR)/.project
+  $1_NATIVE_FILE := $$($1_IDE_OUTPUTDIR)/.cproject
+  $1_SETTINGS_FILE := $$($1_IDE_OUTPUTDIR)/.settings/language.settings.xml
+  $$(call MakeDir, $$($1_IDE_OUTPUTDIR))
 
   ifneq ($$(findstring $$($1_NATURE), HOTSPOT NATIVE MIXED), )
     ifeq ($$(call isCompiler, microsoft), true)
@@ -198,14 +182,11 @@ define SetupEclipseWorkspaceBody
       $1_MAKE := $$(call FixPath, $(MAKE))
     endif
 
-    $1_MATCHING_MAKE_TARGETS :=
-    $1_PLAIN_MAKE_TARGETS := update-build-docs docs gensrc gendata \
-        copy java launchers libs hotspot jdk product-images all-images test-image clean
-
     # make reconfigure omitted since it is sensitive to which make was used
-    ifeq ($$($1_SHARED), true)
-      $1_PLAIN_MAKE_TARGETS += dist-clean
-    endif
+    # make dist-clean omitted since it would delete the Workspace as well
+    $1_MATCHING_MAKE_TARGETS :=
+    $1_PLAIN_MAKE_TARGETS := update-build-docs docs gensrc gendata copy java \
+        launchers libs hotspot jdk product-images product-bundles all-images test-image clean
 
     $1_MATCHING_MAKE_TARGETS += $$(foreach name,$$($1_PLAIN_MAKE_TARGETS), \
       <target name="$$(strip $$(name))" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> \
@@ -232,11 +213,7 @@ define SetupEclipseWorkspaceBody
 
     TARGETS += $$($1_CREATE_NATIVE_FILE)
 
-    ifeq ($$($1_SHARED), true)
-      $$(call MakeDir, $(TOPDIR)/.settings)
-    else
-      $$(call MakeDir, $$($1_IDE_OUTPUTDIR)/.settings)
-    endif
+    $$(call MakeDir, $$($1_IDE_OUTPUTDIR)/.settings)
 
     $1_CSETTINGS :=
     $1_CXXSETTINGS :=
@@ -314,40 +291,38 @@ define SetupEclipseWorkspaceBody
 
   endif
 
-  ifeq ($$($1_SHARED), false)
-    ifneq ($$(findstring $$($1_NATURE), JAVA MIXED), )
-      $1_LINKED_RESOURCES += $$(foreach src,$(JAVA_DIRS), \
-          <link> \
-              <name>$$(strip $$(src))</name> \
-              <type>2</type> \
-              <location>$$(subst \\,/,$$(call FixPath, $(TOPDIR)/$$(src)))</location> \
-          </link>$$(NEWLINE))
-    endif
+  ifneq ($$(findstring $$($1_NATURE), JAVA MIXED), )
+    $1_LINKED_RESOURCES += $$(foreach src,$(JAVA_DIRS), \
+        <link> \
+            <name>$$(strip $$(src))</name> \
+            <type>2</type> \
+            <location>$$(subst \\,/,$$(call FixPath, $(TOPDIR)/$$(src)))</location> \
+        </link>$$(NEWLINE))
+  endif
 
-    ifneq ($$(findstring $$($1_NATURE), HOTSPOT NATIVE MIXED), )
-      # CDT includes a Makefile editor, so if CDT support was indicated there's no harm in
-      # including the make sources as well, since the cost of indexing them is miniscule
-      $1_LINKED_RESOURCES += \
-          <link> \
-              <name>make</name> \
-              <type>2</type> \
-              <location>$$(subst \\,/,$$(call FixPath, $(TOPDIR)/make))</location> \
-          </link> \
-          <link> \
-              <name>src/hotspot</name> \
-              <type>2</type> \
-              <location>$$(subst \\,/,$$(call FixPath, $(TOPDIR)/src/hotspot))</location> \
-          </link>$$(NEWLINE)
-    endif
+  ifneq ($$(findstring $$($1_NATURE), HOTSPOT NATIVE MIXED), )
+    # CDT includes a Makefile editor, so if CDT support was indicated there's no harm in
+    # including the make sources as well, since the cost of indexing them is miniscule
+    $1_LINKED_RESOURCES += \
+        <link> \
+            <name>make</name> \
+            <type>2</type> \
+            <location>$$(subst \\,/,$$(call FixPath, $(TOPDIR)/make))</location> \
+        </link> \
+        <link> \
+            <name>src/hotspot</name> \
+            <type>2</type> \
+            <location>$$(subst \\,/,$$(call FixPath, $(TOPDIR)/src/hotspot))</location> \
+        </link>$$(NEWLINE)
+  endif
 
-    ifneq ($$(findstring $$($1_NATURE), NATIVE MIXED), )
-      $1_LINKED_RESOURCES += $$(foreach src,$(NATIVE_DIRS), \
-          <link> \
-              <name>$$(strip $$(src))</name> \
-              <type>2</type> \
-              <location>$$(subst \\,/,$$(call FixPath, $(TOPDIR)/$$(src)))</location> \
-          </link>$$(NEWLINE))
-    endif
+  ifneq ($$(findstring $$($1_NATURE), NATIVE MIXED), )
+    $1_LINKED_RESOURCES += $$(foreach src,$(NATIVE_DIRS), \
+        <link> \
+            <name>$$(strip $$(src))</name> \
+            <type>2</type> \
+            <location>$$(subst \\,/,$$(call FixPath, $(TOPDIR)/$$(src)))</location> \
+        </link>$$(NEWLINE))
   endif
 
   $$(eval $$(call SetupTextFileProcessing, $1_CREATE_WORKSPACE_FILE, \
@@ -366,22 +341,18 @@ endef
 ifeq ($(WORKSPACE), java)
   $(eval $(call SetupEclipseWorkspace, SETUP_WORKSPACE, \
       NATURE := JAVA, \
-      SHARED := $(SHARED), \
   ))
 else ifeq ($(WORKSPACE), hotspot)
   $(eval $(call SetupEclipseWorkspace, SETUP_WORKSPACE, \
       NATURE := HOTSPOT, \
-      SHARED := $(SHARED), \
   ))
 else ifeq ($(WORKSPACE), native)
   $(eval $(call SetupEclipseWorkspace, SETUP_WORKSPACE, \
       NATURE := NATIVE, \
-      SHARED := $(SHARED), \
   ))
 else
   $(eval $(call SetupEclipseWorkspace, SETUP_WORKSPACE, \
       NATURE := MIXED, \
-      SHARED := $(SHARED), \
   ))
 endif
 

src/java.base/share/classes/java/lang/StringUTF16.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,8 @@
 import java.util.function.IntConsumer;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
+
+import jdk.internal.misc.Unsafe;
 import jdk.internal.util.ArraysSupport;
 import jdk.internal.util.DecimalDigits;
 import jdk.internal.vm.annotation.ForceInline;
@@ -1658,12 +1660,10 @@ public static int lastIndexOfLatin1(byte[] src, int srcCount,
 
     ////////////////////////////////////////////////////////////////
 
-    private static native boolean isBigEndian();
-
     private static final int HI_BYTE_SHIFT;
     private static final int LO_BYTE_SHIFT;
     static {
-        if (isBigEndian()) {
+        if (Unsafe.getUnsafe().isBigEndian()) {
             HI_BYTE_SHIFT = 8;
             LO_BYTE_SHIFT = 0;
         } else {

src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -84,7 +84,7 @@ public enum Feature {
         /**
          * A key for testing.
          */
-        @JEP(number=0, title="Test Feature")
+        @JEP(number=2_147_483_647, title="Test Feature")
         TEST,
         ;
     }

src/java.base/share/classes/sun/invoke/util/VerifyAccess.java

@@ -201,9 +201,10 @@ public static boolean isClassAccessible(Class<?> refc,
             Module lookupModule = lookupClass.getModule();
             Module refModule = refc.getModule();
 
-            // early VM startup case, java.base not defined
-            if (lookupModule == null) {
-                assert refModule == null;
+            // early VM startup case, java.base not defined or
+            // module system is not fully initialized and exports are not set up
+            if (lookupModule == null || !jdk.internal.misc.VM.isModuleSystemInited()) {
+                assert lookupModule == refModule;
                 return true;
             }
 
@@ -230,11 +231,6 @@ public static boolean isClassAccessible(Class<?> refc,
             if (isModuleAccessible(refc, lookupModule, prevLookupModule))
                 return true;
 
-            // not exported but allow access during VM initialization
-            // because java.base does not have its exports setup
-            if (!jdk.internal.misc.VM.isModuleSystemInited())
-                return true;
-
             // public class not accessible to lookupClass
             return false;
         }

src/java.base/share/classes/sun/security/ssl/X509Authentication.java

@@ -278,8 +278,8 @@ private static SSLPossession createServerPossession(
             SSLLogger.finest("X509KeyManager class: " +
                     km.getClass().getName());
         }
-        String serverAlias = null;
         for (String keyType : keyTypes) {
+            String serverAlias = null;
             if (shc.conContext.transport instanceof SSLSocketImpl socket) {
                 serverAlias = km.chooseServerAlias(keyType,
                         shc.peerSupportedAuthorities == null ? null :

src/java.base/share/native/libjava/String.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,14 +31,3 @@ Java_java_lang_String_intern(JNIEnv *env, jobject this)
 {
     return JVM_InternString(env, this);
 }
-
-JNIEXPORT jboolean JNICALL
-Java_java_lang_StringUTF16_isBigEndian(JNIEnv *env, jclass cls)
-{
-  unsigned int endianTest = 0xff000000;
-  if (((char*)(&endianTest))[0] != 0) {
-    return JNI_TRUE;
-  } else {
-    return JNI_FALSE;
-  }
-}