Update FFI specific code for compilation in JDK21 #598

ChengJin01 · 2023-05-05T15:28:41Z

The changes update FFI specific code by disabling/removing
part of our code to pass the compilation in JDK21.

Note:
The modifications in code are based on the new APIs in JDK21 & JEP442
as mentioned at eclipse-openj9/openj9#16951.

Signed-off-by: ChengJin01 jincheng@ca.ibm.com

…GraphicsPrimitiveMgr Reviewed-by: serb, aivanov

Reviewed-by: dholmes

…Client::close Reviewed-by: jpai, djelinski

…view) Co-authored-by: Maurizio Cimadamore <mcimadamore@openjdk.org> Co-authored-by: Jorn Vernee <jvernee@openjdk.org> Co-authored-by: Paul Sandoz <psandoz@openjdk.org> Co-authored-by: Feilong Jiang <fjiang@openjdk.org> Co-authored-by: Per Minborg <pminborg@openjdk.org> Reviewed-by: erikj, jvernee, vlivanov, psandoz

Reviewed-by: clanger, mbaesken

Reviewed-by: epeter, jbhateja, thartmann

… statically linking JDK/VM natives with standard launcher Reviewed-by: alanb

Reviewed-by: serb, azvegint

Reviewed-by: darcy

…erflowException where IndexOutOfBoundsException expected Reviewed-by: alanb

…anguage locale. Reviewed-by: jlu, iris, joehw

Reviewed-by: iris

Copied j9cfg.h & omrcfg.h into $(SUPPORT_OUTPUTDIR)/modules_include/java.base. Signed-off-by: Jason Feng <fengj@ca.ibm.com>

Reviewed-by: bchristi

Reviewed-by: naoto, lancea

Recognize OpenJ9 flags in openjdk jcl natives

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

Conflicts: src/java.base/share/classes/java/lang/foreign/VaList.java src/java.base/share/classes/jdk/internal/foreign/CABI.java src/java.base/share/classes/jdk/internal/foreign/SystemLookup.java src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/CallArranger.java src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/windows/WindowsAArch64VaList.java src/java.base/share/classes/jdk/internal/foreign/abi/riscv64/linux/LinuxRISCV64CallArranger.java src/java.base/share/classes/jdk/internal/foreign/abi/riscv64/linux/LinuxRISCV64VaList.java src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/CallArranger.java src/java.base/share/classes/jdk/internal/foreign/abi/x64/windows/CallArranger.java test/jdk/java/foreign/NativeTestHelper.java test/jdk/java/foreign/TestClassLoaderFindNative.java test/jdk/java/foreign/TestVarArgs.java test/jdk/java/foreign/callarranger/platform/PlatformLayouts.java test/jdk/java/foreign/valist/VaListTest.java test/jdk/java/text/testlib/IntlTest.java Modified: src/java.base/share/classes/jdk/internal/foreign/Utils.java Signed-off-by: Jason Feng <fengj@ca.ibm.com>

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

ChengJin01 · 2023-05-05T15:35:36Z

Note:

The PR is built on the top of Merge master HEAD into openj9-staging #595.
All VaList related code are removed as required in JEP442 at JEP 442: Foreign Function & Memory API (Third Preview) eclipse-openj9/openj9#16951.
The PR must be merged along with the disabled code in OpenJ9 at Disable FFI specific code for compilation in JDK21 eclipse-openj9/openj9#17352.

ChengJin01 · 2023-05-05T15:37:01Z

Reviewer: @keithc-ca
FYI: @tajila, @pshipton

src/java.base/share/classes/jdk/internal/foreign/SystemLookup.java

src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java

src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/CallArranger.java

src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java

Note: The modifications in code are based on the new APIs in JDK21 & JEP442 as mentioned at eclipse-openj9/openj9#16951. Signed-off-by: ChengJin01 <jincheng@ca.ibm.com>

keithc-ca · 2023-05-29T20:53:50Z

Jenkins compile all jdknext depends eclipse-openj9/openj9#17352

ChengJin01 · 2023-05-29T22:17:03Z

The compilation failure was detected at https://openj9-jenkins.osuosl.org/job/Build_JDKnext_x86-64_linux_Personal/66/consoleText and https://openj9-jenkins.osuosl.org/job/Build_JDKnext_s390x_linux_Personal/88/consoleText due to the missing method clearInetAddressCache as follows:

[2023-05-29T21:02:15.177Z] /home/jenkins/workspace/Build_JDKnext_x86-64_linux_Personal/build/linux-x86_64-server-release/support/j9jcl/openj9.criu/share/classes/org/eclipse/openj9/criu/CRIUSupport.java:624: error: cannot find symbol
[2023-05-29T21:02:15.177Z] 		SharedSecrets.getJavaNetInetAddressAccess().clearInetAddressCache();
[2023-05-29T21:02:15.177Z] 		                                           ^
[2023-05-29T21:02:15.177Z]   symbol:   method clearInetAddressCache() <--------------------
[2023-05-29T21:02:15.177Z]   location: interface JavaNetInetAddressAccess
[2023-05-29T21:02:15.177Z] 1 error

which was introduced recently via #604 which was not yet added to the openj9-staging branch.

@JasonFengJ9, could you help add your changes at #604 to your branch at https://github.com/JasonFengJ9/openj9-openjdk-jdk/tree/mergetmp? I will rebase with your updated code from there.

keithc-ca · 2023-05-30T13:10:41Z

@ChengJin01 It might be simpler to just cherry-pick f68f90b into your branch.

JasonFengJ9 · 2023-05-30T13:32:06Z

It might be simpler to just cherry-pick f68f90b into your branch.

Agreed, @ChengJin01 let me know if the initial merging PR rebase is still needed.

ChengJin01 · 2023-05-30T14:41:48Z

It might be simpler to just cherry-pick f68f90b into your branch.

Agreed, @ChengJin01 let me know if the initial merging PR rebase is still needed.

It doesn't help as my branch was created on top of https://github.com/JasonFengJ9/openj9-openjdk-jdk/tree/mergetmp in which case the expected changes at f68f90b don't show up in the history/annotation list for cherry-pick.

JasonFengJ9 · 2023-05-30T14:47:47Z

It doesn't help as my branch was created on top of https://github.com/JasonFengJ9/openj9-openjdk-jdk/tree/mergetmp in which case the expected changes at f68f90b don't show up in the history/annotation list for cherry-pick.

You might pull latest openj9 branch which contains the commit in question, and ensure its history is visible for cherry-pick.

Added InetAddress.clearInetAddressCache() to be invoked by CRIU post-restore hook via JavaNetInetAddressAccess(). Signed-off-by: Jason Feng <fengj@ca.ibm.com>

ChengJin01 · 2023-05-30T14:59:23Z

I've cherry-picked the changes at f68f90b#diff-bcf494d3974af1421572e5bf8d544e4949a90eacb34c4fcbc4e4668a0a89da6b from the openj9 branch with my second remote.

keithc-ca · 2023-05-30T16:10:56Z

Jenkins compile all jdknext depends eclipse-openj9/openj9#17352

Fix race condition when creating the native pointer for an EC key

Dmitry Cherepanov and others added 20 commits April 27, 2023 07:06

6995195: Static initialization deadlock in sun.java2d.loops.Blit and …

2621555

…GraphicsPrimitiveMgr Reviewed-by: serb, aivanov

8306654: Disable NMT location_printing_cheap_dead_xx tests again

06fed6c

Reviewed-by: dholmes

8306940: test/jdk/java/net/httpclient/XxxxInURI.java should call Http…

334b696

…Client::close Reviewed-by: jpai, djelinski

8306976: UTIL_REQUIRE_SPECIAL warning on grep

0c0b75b

Reviewed-by: clanger, mbaesken

8287087: C2: perform SLP reduction analysis on-demand

f7b4d16

Reviewed-by: epeter, jbhateja, thartmann

8306949: Resolve miscellaneous multiple symbol definition issues when…

4c50739

… statically linking JDK/VM natives with standard launcher Reviewed-by: alanb

8306850: Open source AWT Model related tests

c2f00cf

Reviewed-by: serb, azvegint

8205592: BigDecimal.doubleValue() is depressingly slow

a000f3f

Reviewed-by: darcy

8306959: (bf) CharBuffer.append(CharSequence,int,int) throws BufferOv…

2147e7f

…erflowException where IndexOutOfBoundsException expected Reviewed-by: alanb

8306927: Collator treats "v" and "w" as the same letter for Swedish l…

9cc96ef

…anguage locale. Reviewed-by: jlu, iris, joehw

8306952: improve generic signature of internal DCInlineTag class

b9167e3

Reviewed-by: iris

Recognize OpenJ9 flags in openjdk jcl natives

5adfae8

Copied j9cfg.h & omrcfg.h into $(SUPPORT_OUTPUTDIR)/modules_include/java.base. Signed-off-by: Jason Feng <fengj@ca.ibm.com>

8298993: (process) java/lang/ProcessBuilder/UnblockSignals.java fails

046499d

Reviewed-by: bchristi

8306711: Improve diagnosis of IntlTest framework

28e613d

Reviewed-by: naoto, lancea

Merge latest openjdk

a0d711e

Merge pull request ibmruntimes#592 from JasonFengJ9/criuflag

2c2cf00

Recognize OpenJ9 flags in openjdk jcl natives

Merge latest openj9 into openj9-staging

bcefb15

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

Update OPENJDK_TAG to merged level jdk-21+20

f777a50

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

ChengJin01 mentioned this pull request May 5, 2023

Disable FFI specific code for compilation in JDK21 eclipse-openj9/openj9#17352

Merged

ChengJin01 mentioned this pull request May 5, 2023

Merge master HEAD into openj9-staging #595

Merged

keithc-ca self-requested a review May 9, 2023 17:05

ChengJin01 mentioned this pull request May 12, 2023

[Jtreg/FFI] Disable FFI test suites for JDK21 eclipse-openj9/openj9#17399

Closed

JasonFengJ9 mentioned this pull request May 19, 2023

JDK21 requires JVM_VirtualThreadMount/JVM_VirtualThreadUnmount implementations eclipse-openj9/openj9#16984

Closed

ChengJin01 force-pushed the ffi_update_code_for_compilation_jdk21 branch from 31956ba to b30770f Compare May 25, 2023 22:39

ChengJin01 mentioned this pull request May 25, 2023

[FFI/Jtreg] Adjust the "%" check in JAVA_DOUBLE on AIX ibmruntimes/openj9-openjdk-jdk20#49

Merged

keithc-ca requested changes May 29, 2023

View reviewed changes

ChengJin01 force-pushed the ffi_update_code_for_compilation_jdk21 branch 2 times, most recently from 676c35e to e6a2173 Compare May 29, 2023 16:29

Update FFI specific code against the latest APIs in JDK21

50ee730

Note: The modifications in code are based on the new APIs in JDK21 & JEP442 as mentioned at eclipse-openj9/openj9#16951. Signed-off-by: ChengJin01 <jincheng@ca.ibm.com>

ChengJin01 force-pushed the ffi_update_code_for_compilation_jdk21 branch from e6a2173 to 50ee730 Compare May 29, 2023 16:36

CRIU restore clears InetAddress.cache

4b2d495

Added InetAddress.clearInetAddressCache() to be invoked by CRIU post-restore hook via JavaNetInetAddressAccess(). Signed-off-by: Jason Feng <fengj@ca.ibm.com>

keithc-ca approved these changes May 30, 2023

View reviewed changes

keithc-ca merged commit 1bac2ab into ibmruntimes:openj9-staging May 30, 2023

JasonFengJ9 mentioned this pull request May 31, 2023

valhalla nightly build compilation failures error: no suitable method found for makeFactory(MethodType,FunctionDescriptor) eclipse-openj9/openj9#17485

Closed

ChengJin01 mentioned this pull request Jun 15, 2023

Update the FFI specific code in JDK21 for JEP442 eclipse-openj9/openj9#17597

Merged

tajila pushed a commit to tajila/openj9-openjdk-jdk that referenced this pull request Mar 27, 2024

Merge pull request ibmruntimes#598 from ZainabF92/issue15598

cb6e1d0

Fix race condition when creating the native pointer for an EC key

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update FFI specific code for compilation in JDK21 #598

Update FFI specific code for compilation in JDK21 #598

ChengJin01 commented May 5, 2023

ChengJin01 commented May 5, 2023 •

edited

Loading

ChengJin01 commented May 5, 2023

keithc-ca commented May 29, 2023

ChengJin01 commented May 29, 2023 •

edited

Loading

keithc-ca commented May 30, 2023

JasonFengJ9 commented May 30, 2023

ChengJin01 commented May 30, 2023 •

edited

Loading

JasonFengJ9 commented May 30, 2023

ChengJin01 commented May 30, 2023 •

edited

Loading

keithc-ca commented May 30, 2023

Update FFI specific code for compilation in JDK21 #598

Update FFI specific code for compilation in JDK21 #598

Conversation

ChengJin01 commented May 5, 2023

ChengJin01 commented May 5, 2023 • edited Loading

ChengJin01 commented May 5, 2023

keithc-ca commented May 29, 2023

ChengJin01 commented May 29, 2023 • edited Loading

keithc-ca commented May 30, 2023

JasonFengJ9 commented May 30, 2023

ChengJin01 commented May 30, 2023 • edited Loading

JasonFengJ9 commented May 30, 2023

ChengJin01 commented May 30, 2023 • edited Loading

keithc-ca commented May 30, 2023

ChengJin01 commented May 5, 2023 •

edited

Loading

ChengJin01 commented May 29, 2023 •

edited

Loading

ChengJin01 commented May 30, 2023 •

edited

Loading

ChengJin01 commented May 30, 2023 •

edited

Loading