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

J.Duke duke at openjdk.java.net
Thu Sep 3 08:58:33 UTC 2020


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 80 commits from the branch
> `foreign-abi`that can **not** be merged into the branch `foreign-jextract`:
> The following file contains merge conflicts:
> 
> - README.md
> 
> 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-jextract $ git pull https://github.com/openjdk/panama-foreign foreign-jextract
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign +50:openjdk-bot-50
> $ git checkout openjdk-bot-50
> 
> # 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-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 openjdk-bot-50:50
> 
> _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 299 additional commits since the last
revision:

 - Merge branch 'foreign-jextract' into 50
 - 8252465: jextract generates wrong layout and varhandle when different structs have same named field
   
   Reviewed-by: mcimadamore
 - updating samples. changed constants class to use package constructor
   
   Reviewed-by: jvernee
 - Fix some tests failing jextract on Windows
   
   Reviewed-by: sundar
 - 8252302: jextract should compile generated java code with -parameters and -g:lines option
   
   Reviewed-by: jvernee
 - 8252247: regenerate jdk.internal.clang.libclang sources using jextract
   
   Reviewed-by: jvernee
 - Automatic merge of foreign-abi into foreign-jextract
 - Automatic merge of foreign-abi into foreign-jextract
 - Automatic merge of foreign-abi into foreign-jextract
 - Automatic merge of foreign-abi into foreign-jextract
 - ... and 289 more: https://git.openjdk.java.net/panama-foreign/compare/1e9639a9...65ff1424

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

Changes:
  - all: https://git.openjdk.java.net/panama-foreign/pull/298/files
  - new: https://git.openjdk.java.net/panama-foreign/pull/298/files/1e9639a9..65ff1424

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

  Stats: 34671 lines in 184 files changed: 34665 ins; 0 del; 6 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/298.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/298/head:pull/298

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


More information about the panama-dev mailing list