[foreign-abi] [Rev 02] RFR: Merge foreign-memaccess

J.Duke duke at openjdk.java.net
Fri May 15 12:02:19 UTC 2020

> Hi all,
> this is an _automatically_ generated pull request to notify you that there are 112 commits from the branch
> `foreign-memaccess`that can **not** be merged into the branch `foreign-abi`:
> The following file contains merge conflicts:
> - src/java.base/share/classes/java/lang/System.java
> All Committers in this [project](https://openjdk.java.net/census#Optional[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 foreign-abi
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign +37:openjdk-bot-37
> $ git checkout openjdk-bot-37
> # 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 openjdk-bot-37:37
> _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
143 commits:

 - Remove whitespaces
 - Merge branch 'foreign-abi' into openjdk-bot-37
 - Automatic merge of foreign-memaccess into foreign-abi
 - 8244938: Crash in foreign ABI CallArranger class when a test native function returns a nested struct
   Reviewed-by: jvernee
 - Automatic merge of foreign-memaccess into foreign-abi
 - 8244720: Check MethodType and FunctionDescritpor used when linking
   Reviewed-by: mcimadamore
 - Automatic merge of foreign-memaccess into foreign-abi
 - Automatic merge of foreign-memaccess into foreign-abi
 - Automatic merge of foreign-memaccess into foreign-abi
 - Automatic merge of foreign-memaccess into foreign-abi
 - ... and 133 more: https://git.openjdk.java.net/panama-foreign/compare/39ab6186...d09d2ec0


This pull request has now been integrated.

Changeset: 9192f4c6
Author:    J. Duke <duke at openjdk.org>
Committer: Maurizio Cimadamore <mcimadamore at openjdk.org>
URL:       https://git.openjdk.java.net/panama-foreign/commit/9192f4c6
Stats:     13381 lines in 402 files changed: 3501 ins; 7812 del; 2068 mod

Merge foreign-memaccess


Changes: https://git.openjdk.java.net/panama-foreign/pull/168/files
 Webrev: https://webrevs.openjdk.java.net/panama-foreign/168/webrev.02
  Stats: 59721 lines in 106 files changed: 59638 ins; 58 del; 25 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/168.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/168/head:pull/168

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

More information about the panama-dev mailing list