-
Notifications
You must be signed in to change notification settings - Fork 77
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge master HEAD into openj9-staging #608
Conversation
Reviewed-by: prr, serb
…sing policy Reviewed-by: vromero
Reviewed-by: mkartashev, prr
Reviewed-by: dcubed
Reviewed-by: mullan
…xpected event: ThreadStartEvent in thread resume008-thread0" Reviewed-by: dcubed
…de_generated_while_holding_locks Reviewed-by: sspitsyn, cjplummer
Reviewed-by: xuelei
…pace usage Reviewed-by: redestad, smarks
Reviewed-by: vromero
…a.c with GCC8 Reviewed-by: alanb
…st.c Reviewed-by: alanb
Reviewed-by: psandoz, pminborg
….RuntimeException: values differ by more than 1GB Reviewed-by: jpai, rriggs
Reviewed-by: amitkumar, jsjolen, fparain
Reviewed-by: mullan
Reviewed-by: lancea, naoto
…tual test thread factory Reviewed-by: sspitsyn
Reviewed-by: cjplummer, amenkov, sspitsyn
8308468: ProblemList containers/docker/TestMemoryAwareness.java on linux-x64 8308470: ProblemList javax/management/remote/mandatory/connection/BrokenConnectionTest.java on linux-all 8308471: ProblemList javax/management/remote/mandatory/loading/MissingClassTest.java on windows-x64 w/ loom 8308472: ProblemList javax/management/remote/mandatory/loading/RMIDownloadTest.java on windows-x64 w/ loom 8308473: ProblemList java/lang/instrument/NativeMethodPrefixAgent.java with loom Reviewed-by: lmesnik
8300545: Compiler Implementation for Record Patterns Co-authored-by: Aggelos Biboudis <abimpoudis@openjdk.org> Reviewed-by: vromero, mcimadamore
Reviewed-by: lmesnik, alanb
Reviewed-by: dholmes, lmesnik
…Preview) 8307444: java.lang.AssertionError when using unnamed patterns 8307482: Compiler should accept var _ in nested patterns in switch case 8307007: Implementation for javax.lang.model for unnamed variables (Preview) 8308312: Compiler should fail when a local variable declaration does not include an Identifier and does not have an initializer 8308309: Compiler should accept mixed masked and unmasked variables in lambda parameters Co-authored-by: Jan Lahoda <jlahoda@openjdk.org> Co-authored-by: Aggelos Biboudis <abimpoudis@openjdk.org> Reviewed-by: vromero, darcy
Reviewed-by: stsypanov, jpai
…mode on selected platforms Co-authored-by: Adam Sotona <asotona@openjdk.org> Reviewed-by: erikj, vromero, bpb
Reviewed-by: dfuchs, naoto, djelinski, jpai, michaelm
…s due to a bug in determining the main thread id Reviewed-by: amenkov, sspitsyn
Reviewed-by: jjg, darcy
Reviewed-by: naoto, prr
src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/CallArranger.java
Outdated
Show resolved
Hide resolved
src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/sysv/SysVPPC64leLinker.java
Show resolved
Hide resolved
src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java
Outdated
Show resolved
Hide resolved
src/java.base/share/classes/jdk/internal/foreign/abi/s390x/sysv/SysVS390xLinker.java
Outdated
Show resolved
Hide resolved
I think this is ready to be merged, but
Once all four changes ready, we will want to merge them concurrently so openj9 remains compatible with jdk21 and this repo. |
JDK21 PR |
private static boolean loadLibraryOnlyIfPresentInitialized; | ||
private static void initLoadLibraryOnlyIfPresent() { | ||
loadLibraryOnlyIfPresent = ClassLoaderHelper.loadLibraryOnlyIfPresent(); | ||
loadLibraryOnlyIfPresentInitialized = true; | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see any problems during a build; please explain how to reproduce the problem this is intended to address or revert this change.
This is a MacOS-specific issue openj9-openjdk-jdk/src/java.base/macosx/classes/jdk/internal/loader/ClassLoaderHelper.java Lines 35 to 37 in 24faa78
openj9-openjdk-jdk/src/java.base/unix/classes/jdk/internal/loader/ClassLoaderHelper.java Line 33 in 24faa78
openj9-openjdk-jdk/src/java.base/windows/classes/jdk/internal/loader/ClassLoaderHelper.java Line 32 in 24faa78
openj9-openjdk-jdk/src/java.base/aix/classes/jdk/internal/loader/ClassLoaderHelper.java Line 39 in 4e23dcd
|
Ok, I understand now. I thought we might limit the patch to the macOS version of |
Please update the patch to |
Added a comment, please have another look. |
Please update the comment in |
Conflicts: src/java.base/share/classes/java/lang/Thread.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/layout/ValueLayouts.java src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c test/jdk/TEST.ROOT test/jdk/java/foreign/LibraryLookupTest.java test/jdk/java/foreign/NativeTestHelper.java test/jdk/java/foreign/SafeFunctionAccessTest.java test/jdk/java/foreign/StdLibTest.java test/jdk/java/foreign/TestClassLoaderFindNative.java test/jdk/java/foreign/TestDowncallScope.java test/jdk/java/foreign/TestDowncallStack.java test/jdk/java/foreign/TestFunctionDescriptor.java test/jdk/java/foreign/TestHeapAlignment.java test/jdk/java/foreign/TestMatrix.java test/jdk/java/foreign/TestNULLAddress.java test/jdk/java/foreign/TestNative.java test/jdk/java/foreign/TestNulls.java test/jdk/java/foreign/TestScopedOperations.java test/jdk/java/foreign/TestSegments.java test/jdk/java/foreign/TestStringEncoding.java test/jdk/java/foreign/TestUpcallAsync.java test/jdk/java/foreign/TestUpcallException.java test/jdk/java/foreign/TestUpcallHighArity.java test/jdk/java/foreign/TestUpcallScope.java test/jdk/java/foreign/TestUpcallStack.java test/jdk/java/foreign/TestUpcallStructScope.java test/jdk/java/foreign/TestValueLayouts.java test/jdk/java/foreign/TestVarArgs.java test/jdk/java/foreign/enablenativeaccess/TestEnableNativeAccess.java test/jdk/java/foreign/handles/Driver.java test/jdk/java/foreign/loaderLookup/TestLoaderLookup.java test/jdk/java/foreign/loaderLookup/TestLoaderLookupJNI.java test/jdk/java/lang/Thread/virtual/HoldsLock.java Added protected ByteOrder linkerByteOrder() for following classes: src/java.base/share/classes/jdk/internal/foreign/abi/s390x/sysv/SysVS390xLinker.java src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/sysv/SysVPPC64leLinker.java src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/aix/AixPPC64Linker.java src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/CallArranger.java Modified src/java.base/share/classes/jdk/internal/loader/NativeLibraries.java to lazily initialize loadLibraryOnlyIfPresent Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Updated |
Jenkins compile aix,alinux64,amac,win jdknext depends eclipse-openj9/openj9#17514 |
Merge master HEAD into openj9-staging
Resolved conflicts:
Added
protected ByteOrder linkerByteOrder()
for following classes:Modified
src/java.base/share/classes/jdk/internal/loader/NativeLibraries.java
to lazily initializeloadLibraryOnlyIfPresent
, otherwise the following error might occur.or
This was caused by OpenJ9 jclcinit.c:initializeRequiredClasses() J9VMCONSTANTPOOL_JDKINTERNALLOADERNATIVELIBRARIES
Depends on
Signed-off-by: Jason Feng fengj@ca.ibm.com