Merge master jdk-19+28 into openj9-staging

closed/autoconf/custom-hook.m4

@@ -391,7 +391,15 @@ AC_DEFUN([OPENJ9_CONFIGURE_JITSERVER],
   elif test "x$enable_jitserver" = xno ; then
     AC_MSG_RESULT([no (explicitly disabled)])
   elif test "x$enable_jitserver" = x ; then
-    AC_MSG_RESULT([no (default)])
+    case "$OPENJ9_PLATFORM_CODE" in
+      xa64|xl64|xz64)
+        AC_MSG_RESULT([yes (default)])
+        OPENJ9_ENABLE_JITSERVER=true
+        ;;
+      *)
+        AC_MSG_RESULT([no (default)])
+        ;;
+    esac
   else
     AC_MSG_ERROR([--enable-jitserver accepts no argument])
   fi

closed/openjdk-tag.gmk

@@ -1 +1 @@
-OPENJDK_TAG := jdk-19+27
+OPENJDK_TAG := jdk-19+28

closed/src/java.base/share/classes/java/lang/ref/NativeReferenceQueue.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved
+ * ===========================================================================
+ */
+package java.lang.ref;
+
+/**
+ * An implementation of a ReferenceQueue that uses native monitors.
+ * The use of java.util.concurrent.lock locks interacts with various mechanisms,
+ * such as virtual threads and ForkJoinPool, that might not be appropriate for some
+ * low-level mechanisms, in particular MethodType's weak intern set.
+ */
+final class NativeReferenceQueue<T> extends ReferenceQueue<T> {
+	public NativeReferenceQueue() {
+		super(0);
+	}
+}

closed/src/java.base/share/classes/jdk/crypto/jniprovider/NativeCrypto.java

@@ -23,16 +23,20 @@
  */
 package jdk.crypto.jniprovider;
 
+import java.lang.ref.Cleaner;
 import java.security.*;
 
 import com.ibm.oti.vm.VM;
 
 import jdk.internal.misc.Unsafe;
+import jdk.internal.ref.CleanerFactory;
 import jdk.internal.reflect.Reflection;
 import jdk.internal.reflect.CallerSensitive;
 
 public class NativeCrypto {
 
+    private static final Cleaner ECKeyCleaner = CleanerFactory.cleaner();
+
     //ossl_vers:
     // -1 : library load failed
     //  0 : openssl 1.0.x
@@ -79,6 +83,15 @@ public static NativeCrypto getNativeCrypto() {
         throw new SecurityException("NativeCrypto");
     }
 
+    public void createECKeyCleaner(Object owner, long key) {
+        ECKeyCleaner.register(owner, new Runnable() {
+            @Override
+            public void run() {
+                NativeCrypto.this.ECDestroyKey(key);
+            }
+        });
+    }
+
     /* Native digest interfaces */
 
     private static final native int loadCrypto(boolean trace);
@@ -230,4 +243,56 @@ public final native int ChaCha20FinalDecrypt(long context,
                                        int aadLen,
                                        int tagLen);
 
+    /* Native EC interfaces */
+    public final native int ECCreatePublicKey(long key,
+                                              byte[] x,
+                                              int xLen,
+                                              byte[] y,
+                                              int yLen,
+                                              int field);
+
+    public final native int ECCreatePrivateKey(long key,
+                                               byte[] s,
+                                               int sLen);
+
+    public final native long ECEncodeGFp(byte[] a,
+                                         int aLen,
+                                         byte[] b,
+                                         int bLen,
+                                         byte[] p,
+                                         int pLen,
+                                         byte[] x,
+                                         int xLen,
+                                         byte[] y,
+                                         int yLen,
+                                         byte[] n,
+                                         int nLen,
+                                         byte[] h,
+                                         int hLen);
+
+    public final native long ECEncodeGF2m(byte[] a,
+                                          int aLen,
+                                          byte[] b,
+                                          int bLen,
+                                          byte[] p,
+                                          int pLen,
+                                          byte[] x,
+                                          int xLen,
+                                          byte[] y,
+                                          int yLen,
+                                          byte[] n,
+                                          int nLen,
+                                          byte[] h,
+                                          int hLen);
+
+    public final native int ECDestroyKey(long key);
+
+    public final native int ECDeriveKey(long publicKey,
+                                        long privateKey,
+                                        byte[] secret,
+                                        int secretOffset,
+                                        int secretLen);
+
+    public final native boolean ECNativeGF2m();
+
 }