search

ibmruntimes / openj9-openjdk-jdk

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

Merge latest openjdk #734

Closed JasonFengJ9 closed 8 months ago

JasonFengJ9 commented 8 months ago

Merge latest openjdk

Conflicts:

    src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ConstantMap.java
    test/hotspot/jtreg/compiler/c2/TestMinValueStrideLongCountedLoop.java
    test/hotspot/jtreg/compiler/rangechecks/TestArrayAccessCastIIAboveRC.java
    test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithParallel.java

Modified:

    src/java.base/share/classes/java/lang/VirtualThread.java
    src/hotspot/share/include/jvm.h

The merging conflict error:

Auto-merging test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithParallel.java
CONFLICT (rename/rename): test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithParallel.java renamed to test/hotspot/jtreg/compiler/rangechecks/TestArrayAccessCastIIAboveRC.java in HEAD and to test/hotspot/jtreg/compiler/c2/TestMinValueStrideLongCountedLoop.java in e0a264692aec6713c27ef7f49558a5a28706339c.

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

keithc-ca commented 8 months ago

~This seems to have commits that aren't (yet?) on the master branch: How did that happen?~ I missed that this targets the master branch.

JasonFengJ9 commented 8 months ago

This seems to have commits that aren't (yet?) on the master branch: How did that happen?

This PR targets the master branch, not the usual openj9-staging one.