[foreign-abi] RFR: Merge foreign-memaccess [v2]
J.Duke
duke at openjdk.java.net
Fri Sep 18 13:37:11 UTC 2020
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 82 commits from the branch
> `foreign-memaccess`that can **not** be merged into the branch `foreign-abi`:
> The following files contains merge conflicts:
>
> - src/hotspot/share/classfile/vmSymbols.hpp
> - src/hotspot/share/opto/machnode.hpp
>
> 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 +57:openjdk-bot-57
> $ git checkout openjdk-bot-57
>
> # 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-57:57
>
> _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 pull request now contains
84 commits:
- Fixes
- Merge branch 'foreign-abi' into openjdk-bot-57
- Merge master
- Automatic merge of jdk:master into master
- 8253342: Fix typos in String.transform
Reviewed-by: jlaskey
- 8244505: G1 pause time ratio calculation does not consider Remark/Cleanup pauses
Reviewed-by: tschatzl, sjohanss
- 8253278: Refactor/cleanup oopDesc::*_klass_addr
Reviewed-by: coleenp, stefank
- 8249451: Unconditional exceptions clearing logic in compiler code should honor Async Exceptions.
Reviewed-by: dholmes, iveresov
- 8252721: Nested classes in Swing APIs rely on default constructors
Reviewed-by: prr
- 8253274: The CycleDMImagetest brokes the system
Reviewed-by: prr
- ... and 74 more: https://git.openjdk.java.net/panama-foreign/compare/98ebdb41...75c72c13
-------------
Changes: https://git.openjdk.java.net/panama-foreign/pull/343/files
Webrev: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=343&range=01
Stats: 16090 lines in 359 files changed: 8969 ins; 6010 del; 1111 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/343.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/343/head:pull/343
PR: https://git.openjdk.java.net/panama-foreign/pull/343
More information about the panama-dev
mailing list