search

ibmruntimes / openj9-openjdk-jdk11

Extensions for OpenJDK 11 for Eclipse OpenJ9
GNU General Public License v2.0
31 stars 112 forks source link

Merge master jdk-11.0.21+1 into openj9-staging #689

Closed JasonFengJ9 closed 1 year ago

JasonFengJ9 commented 1 year ago

Merge master jdk-11.0.21+1 into openj9-staging

Resolved conflicts:

    src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
    src/java.base/share/classes/java/security/Security.java
    src/java.base/share/classes/sun/security/provider/SunEntries.java
    src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
    src/java.base/share/classes/sun/security/rsa/RSAPublicKeyImpl.java
    src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
    src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
    test/jdk/java/lang/StringBuilder/HugeCapacity.java

Modified:

    jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
    jdk.crypto.ec/share/classes/sun/security/ec/NativeECUtil.java
    jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java

Signed-off-by: Jason Feng fengj@ca.ibm.com

keithc-ca commented 1 year ago

Upstream has adopted a newer version of harfbuzz. I expect AIX builds will fail unless the rest of https://github.com/ibmruntimes/openj9-openjdk-jdk21/pull/24 is applied here.

Concretely, in hb-map.hh the definitions of keys() and values() near line 348 should be

  auto keys () const HB_AUTO_RETURN
  (
    + keys_ref ()
    | hb_map (hb_ridentity)
  )

and

  auto values () const HB_AUTO_RETURN
  (
    + values_ref ()
    | hb_map (hb_ridentity)
  )

See also https://github.com/ibmruntimes/openj9-openjdk-jdk17/pull/244.

JasonFengJ9 commented 1 year ago

Passed an internal build