[foreign-abi] RFR: Merge foreign-memaccess [v2]
J.Duke
duke at openjdk.java.net
Thu Sep 10 15:21:06 UTC 2020
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 2 commits from the branch
> `foreign-memaccess`that can **not** be merged into the branch `foreign-abi`:
> The following file contains merge conflicts:
>
> - src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
>
> 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-abi $ git pull https://github.com/openjdk/panama-foreign foreign-abi
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign +52:openjdk-bot-52
> $ git checkout openjdk-bot-52
>
> # Merge the target branch
> $ git merge foreign-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 foreign-memaccess'
>
>
> 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-52:52
>
> _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 229 additional commits since the last
revision:
- Merge branch 'foreign-abi' into openjdk-bot-52
- Automatic merge of foreign-memaccess into foreign-abi
- 8252872: NativeScope should take Addressable instead of MemoryAddress
Reviewed-by: sundar, jvernee
- Automatic merge of foreign-memaccess into foreign-abi
- 8248809: Consider supporting address dereference/allocation for platforms where pointers are not 64 bits
Reviewed-by: psandoz, jvernee
- 8252838: Panama foreign-abi branch fails to build
Reviewed-by: jvernee
- Automatic merge of foreign-memaccess into foreign-abi
- Automatic merge of foreign-memaccess into foreign-abi
- 8251047: GC stackwalking doesn't work when intrinsics are enabled (followup)
Reviewed-by: vlivanov
- Merge foreign-memaccess
- ... and 219 more: https://git.openjdk.java.net/panama-foreign/compare/266fe530...125b591c
-------------
Changes:
- all: https://git.openjdk.java.net/panama-foreign/pull/319/files
- new: https://git.openjdk.java.net/panama-foreign/pull/319/files/266fe530..125b591c
Webrevs:
- full: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=319&range=01
- incr: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=319&range=00-01
Stats: 66617 lines in 204 files changed: 66426 ins; 92 del; 99 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/319.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/319/head:pull/319
PR: https://git.openjdk.java.net/panama-foreign/pull/319
More information about the panama-dev
mailing list