[foreign-memaccess+abi] RFR: Merge master [v2]
J.Duke
duke at openjdk.java.net
Fri Dec 3 16:43:21 UTC 2021
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 108 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
>
> The following files contains merge conflicts:
>
> - src/hotspot/cpu/x86/universalUpcallHandler_x86_64.cpp
> - src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/FunctionDescriptor.java
> - src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/abi/CallingSequenceBuilder.java
> - test/jdk/java/foreign/TestUpcall.java
> - test/jdk/java/foreign/callarranger/TestSysVCallArranger.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-memaccess+abi
> $ git pull https://github.com/openjdk/panama-foreign.git foreign-memaccess+abi
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign.git +108:openjdk-bot-108
> $ git checkout openjdk-bot-108
>
> # Merge the target branch
> $ git merge foreign-memaccess+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 master'
>
>
>
> 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-108:108
>
>
> _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 854 additional commits since the last revision:
- Merge branch 'foreign-memaccess+abi' into openjdk-bot-108
- 8277945: Use snippets in jdk.incubator.foreign API documentation
Reviewed-by: psandoz, mcimadamore, sundar
- Merge master
- 8277657: OptimizedEntryBlob should extend RuntimeBlob directly
Reviewed-by: mcimadamore
- Merge master
- Add missing include for Linux
Reviewed-by: mcimadamore
- 8275647: Enable multi-register return values for optimized upcall stubs
Reviewed-by: mcimadamore, ngasson
- 8276987: Optimized upcall stub should be printed with -XX:+PrintStubCode
Reviewed-by: jvernee
- Merge master
- 8275646: Implement optimized upcall stubs on AArch64
Reviewed-by: jvernee
- ... and 844 more: https://git.openjdk.java.net/panama-foreign/compare/79cda8ef...5283f510
-------------
Changes:
- all: https://git.openjdk.java.net/panama-foreign/pull/623/files
- new: https://git.openjdk.java.net/panama-foreign/pull/623/files/79cda8ef..5283f510
Webrevs:
- full: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=623&range=01
- incr: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=623&range=00-01
Stats: 29649 lines in 127 files changed: 26538 ins; 2110 del; 1001 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/623.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/623/head:pull/623
PR: https://git.openjdk.java.net/panama-foreign/pull/623
More information about the panama-dev
mailing list