[foreign-jextract] RFR: Merge foreign-memaccess+abi [v2]

J.Duke duke at openjdk.java.net
Fri Dec 3 17:10:52 UTC 2021


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 109 commits from the branch `foreign-memaccess+abi`that can **not** be merged into the branch `foreign-jextract`:
> 
> The following file contains merge conflicts:
> 
> - test/jdk/tools/launcher/HelpFlagsTest.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-jextract
> $ git pull https://github.com/openjdk/panama-foreign.git foreign-jextract
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign.git +109:openjdk-bot-109
> $ git checkout openjdk-bot-109
> 
> # Merge the target branch
> $ git merge foreign-jextract
> 
> 
> 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+abi'
> 
> 
> 
> 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-109:109
> 
> 
> _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 incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains 609 additional commits since the last revision:

 - Merge branch 'foreign-jextract' into openjdk-bot-109
 - Automatic merge of foreign-memaccess+abi into foreign-jextract
 - 8277830: jextract generated code should not depend on Java layouts
   
   Reviewed-by: sundar, jvernee
 - Replace `ofAddressNative` with `ofAddress`
   
   Reviewed-by: jvernee
 - Automatic merge of foreign-memaccess+abi into foreign-jextract
 - Automatic merge of foreign-memaccess+abi into foreign-jextract
 - 8277645: TreeMaker should not call type() on pointer types too early
   
   Reviewed-by: jvernee
 - Automatic merge of foreign-memaccess+abi into foreign-jextract
 - Automatic merge of foreign-memaccess+abi into foreign-jextract
 - Automatic merge of foreign-memaccess+abi into foreign-jextract
 - ... and 599 more: https://git.openjdk.java.net/panama-foreign/compare/8a16279e...81d7b99f

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

Changes:
  - all: https://git.openjdk.java.net/panama-foreign/pull/624/files
  - new: https://git.openjdk.java.net/panama-foreign/pull/624/files/8a16279e..81d7b99f

Webrevs:
 - full: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=624&range=01
 - incr: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=624&range=00-01

  Stats: 31286 lines in 277 files changed: 31280 ins; 0 del; 6 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/624.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/624/head:pull/624

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


More information about the panama-dev mailing list