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

J.Duke duke at openjdk.java.net
Fri Jan 15 12:07:28 UTC 2021


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 135 commits from the branch `foreign-memaccess+abi`that can **not** be merged into the branch `foreign-jextract`:
> 
> The following file contains merge conflicts:
> 
> - make/CompileJavaModules.gmk
> 
> 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 +89:openjdk-bot-89
> $ git checkout openjdk-bot-89
> 
> # 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-89:89
> 
> _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 409 additional commits since the last revision:

 - Merge branch 'foreign-jextract' into openjdk-bot-89
 - 8259473: jextract generated code should throw exception for unfound native symbols from calls, variable access, set immediately
   
   Reviewed-by: mcimadamore, jvernee
 - Automatic merge of foreign-memaccess+abi into foreign-jextract
 - Automatic merge of foreign-memaccess+abi into foreign-jextract
 - 8259226: jextract should differentiate between clang errors vs other runtime issues
   
   Reviewed-by: mcimadamore
 - Automatic merge of foreign-memaccess+abi into foreign-jextract
 - Automatic merge of foreign-memaccess+abi into foreign-jextract
 - Merge foreign-memaccess+abi
 - 8258605: regression: jextract can not handle function prototypes as function arguments
   
   Reviewed-by: mcimadamore
 - 8258405: functional interfaces are not generated for struct fields/global variables with function pointers
   
   Reviewed-by: mcimadamore, jvernee
 - ... and 399 more: https://git.openjdk.java.net/panama-foreign/compare/e69b59e5...f704f19d

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

Changes:
  - all: https://git.openjdk.java.net/panama-foreign/pull/438/files
  - new: https://git.openjdk.java.net/panama-foreign/pull/438/files/e69b59e5..f704f19d

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

  Stats: 39174 lines in 226 files changed: 39167 ins; 0 del; 7 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/438.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/438/head:pull/438

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


More information about the panama-dev mailing list