RFR: Merge jdk:master [v2]

J.Duke duke at openjdk.java.net
Sat Nov 21 18:16:30 UTC 2020

> Hi all,
> this is an _automatically_ generated pull request to notify you that there are 33 commits from the branch `jdk:master`that can **not** be merged into the branch `master`:
> The following file contains merge conflicts:
> - .jcheck/conf
> All Committers in this [project](https://openjdk.java.net/census#lanai) have access to my [personal fork](https://github.com/openjdk-bot/lanai) and can therefore help resolve these merge conflicts (you may want to coordinate who should do this).
> The following paragraphs will give an example on how to solve these merge conflicts and push the resulting merge commit to this pull request.
> The below commands should be run in a local clone of your [personal fork](https://wiki.openjdk.java.net/display/skara#Skara-Personalforks) of the [openjdk/lanai](https://github.com/openjdk/lanai) repository.
> # Ensure target branch is up to date
> $ git checkout master
> $ git pull https://github.com/openjdk/lanai.git master
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/lanai.git +6:openjdk-bot-6
> $ git checkout openjdk-bot-6
> # Merge the target branch
> $ git merge master
> When you have resolved the conflicts resulting from the `git merge` command above, run the following commands to create a merge commit:
> $ git add paths/to/files/with/conflicts
> $ git commit -m 'Merge jdk:master'
> When you have created the merge commit, run the following command to push the merge commit to this pull request:
> $ git push https://github.com/openjdk-bot/lanai.git openjdk-bot-6:6
> _Note_: if you are using SSH to push commits to GitHub, then change the URL in the above `git push` command accordingly.
> Thanks,
> J. Duke

J. Duke has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 34 commits:

 - Merge jdk:master
 - 8255934: JConsole 14 and greater fails to connect to older JVM
   Reviewed-by: cjplummer, sspitsyn
 - 8256806: Shenandoah: optimize shenandoah/jni/TestPinnedGarbage.java test
   Reviewed-by: rkennke
 - 8256073: Improve vector rematerialization support
   Reviewed-by: thartmann, kvn
 - 8255367: C2: Deoptimization during vector box construction is broken
   Reviewed-by: thartmann, kvn
 - 8256061: RegisterSaver::save_live_registers() omits upper halves of ZMM0-15 registers
   Reviewed-by: kvn
 - 8256056: Deoptimization stub doesn't save vector registers on x86
   Reviewed-by: redestad, kvn
 - 8256058: Improve vector register handling in RegisterMap::pd_location() on x86
   Reviewed-by: kvn
 - 8256183: InputStream.skipNBytes is missing @since 12
   Reviewed-by: dfuchs, lancea, bpb
 - 8256507: Add a micro benchmark for JDK-8153005
   Reviewed-by: shade
 - ... and 24 more: https://git.openjdk.java.net/lanai/compare/41ebd234...f7609297


Changes: https://git.openjdk.java.net/lanai/pull/131/files
 Webrev: https://webrevs.openjdk.java.net/?repo=lanai&pr=131&range=01
  Stats: 1549 lines in 81 files changed: 857 ins; 407 del; 285 mod
  Patch: https://git.openjdk.java.net/lanai/pull/131.diff
  Fetch: git fetch https://git.openjdk.java.net/lanai pull/131/head:pull/131

PR: https://git.openjdk.java.net/lanai/pull/131

More information about the lanai-dev mailing list