[foreign-abi] RFR: Merge foreign-memaccess

J.Duke duke at openjdk.java.net
Fri Nov 13 13:28:21 UTC 2020


Hi all,

this is an _automatically_ generated pull request to notify you that there are 94 commits from the branch `foreign-memaccess`that can **not** be merged into the branch `foreign-abi`:

The following files contains merge conflicts:

- src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
- src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
- src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MemoryScope.java

All Committers in this [project](https://openjdk.java.net/census#panama) have access to my [personal fork](https://github.com/openjdk-bot/panama-foreign) 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/panama-foreign](https://github.com/openjdk/panama-foreign) repository.

# Ensure target branch is up to date
$ git checkout foreign-abi
$ git pull https://github.com/openjdk/panama-foreign.git foreign-abi

# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/panama-foreign.git +74:openjdk-bot-74
$ git checkout openjdk-bot-74

# Merge the target branch
$ git merge foreign-abi

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 foreign-memaccess'


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/panama-foreign.git openjdk-bot-74:74

_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

-------------

Commit messages:
 - Merge master
 - Automatic merge of jdk:master into master
 - 8256011: Shenandoah: Don't resurrect finalizably reachable objects
 - 8255964: Add all details to jstack log in jtreg timeout handler
 - 8253525: Implement getInstanceSize/sizeOf intrinsics
 - 8254887: C2: assert(cl->trip_count() > 0) failed: peeling a fully unrolled loop
 - 8256290: javac/lambda/T8031967.java fails with StackOverflowError on x86_32
 - 8256220: C1: x86_32 fails with -XX:UseSSE=1 after JDK-8210764 due to mishandled lir_neg
 - 8255973: Add more logging to debug JDK-8255917
 - 8253820: Save test images and dumps with timestamps from client sanity suite
 - ... and 84 more: https://git.openjdk.java.net/panama-foreign/compare/4ff38697...b8762787

The webrev contains the conflicts with foreign-abi:
 - merge conflicts: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=394&range=00.conflicts

Changes: https://git.openjdk.java.net/panama-foreign/pull/394/files
  Stats: 65154 lines in 807 files changed: 35021 ins; 20388 del; 9745 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/394.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/394/head:pull/394

PR: https://git.openjdk.java.net/panama-foreign/pull/394


More information about the panama-dev mailing list