[foreign-jextract] RFR: Merge foreign-memaccess+abi [v2]
J.Duke
duke at openjdk.java.net
Wed Mar 24 12:24:34 UTC 2021
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there is 1 commit from the branch `foreign-memaccess+abi`that can **not** be merged into the branch `foreign-jextract`:
>
> The following file contains merge conflicts:
>
> - src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemorySegment.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 +91:openjdk-bot-91
> $ git checkout openjdk-bot-91
>
> # 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-91:91
>
> _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 449 additional commits since the last revision:
- Merge branch 'foreign-jextract' into 91
- Automatic merge of foreign-memaccess+abi into foreign-jextract
- Automatic merge of foreign-memaccess+abi into foreign-jextract
- 8261511: jextract fails to handle name clashes between unrelated constants
Reviewed-by: mcimadamore
- 8261906: Improve jextract support for virtual functions
Reviewed-by: jvernee
- Automatic merge of foreign-memaccess+abi into foreign-jextract
- 8262851: jextract crashes with "Cannot compute size of a layout which is, or depends on a sequence layout with unspecified size"
Reviewed-by: mcimadamore
- 8263019: libclang binding has to be refreshed after recent jextract update
Reviewed-by: mcimadamore
- 8262825: jextract crashes when Java type names like String are used as identifiers in C header
Reviewed-by: mcimadamore
- 8262733: jextract generates clashing names which results in compilation error with javac
Reviewed-by: mcimadamore
- ... and 439 more: https://git.openjdk.java.net/panama-foreign/compare/4192f7b1...5e960bac
-------------
Changes:
- all: https://git.openjdk.java.net/panama-foreign/pull/473/files
- new: https://git.openjdk.java.net/panama-foreign/pull/473/files/4192f7b1..5e960bac
Webrevs:
- full: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=473&range=01
- incr: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=473&range=00-01
Stats: 37303 lines in 247 files changed: 37297 ins; 0 del; 6 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/473.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/473/head:pull/473
PR: https://git.openjdk.java.net/panama-foreign/pull/473
More information about the panama-dev
mailing list