search

ibmruntimes / openj9-openjdk-jdk

Extensions for OpenJDK for Eclipse OpenJ9
GNU General Public License v2.0
17 stars 73 forks source link

Merge master HEAD into openj9-staging #739

Closed JasonFengJ9 closed 7 months ago

JasonFengJ9 commented 7 months ago

Merge master HEAD into openj9-staging

Conflicts:

    test/hotspot/jtreg/serviceability/jvmti/vthread/BreakpointInYieldTest/libBreakpointInYieldTest.cpp
    test/hotspot/jtreg/serviceability/jvmti/vthread/NullAsCurrentThreadTest/libNullAsCurrentThreadTest.cpp
    test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/libVThreadTest.cpp
    test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadUnsupportedTest/libVThreadUnsupportedTest.cpp
    test/jdk/jni/nullCaller/CallHelper.hpp

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