[foreign-jextract] RFR: Merge foreign-abi [v2]
J.Duke
duke at openjdk.java.net
Fri Oct 16 14:55:58 UTC 2020
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 109 commits from the branch
> `foreign-abi`that can **not** be merged into the branch `foreign-jextract`:
> The following file contains merge conflicts:
>
> - test/jdk/TEST.groups
>
> 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 +65:openjdk-bot-65
> $ git checkout openjdk-bot-65
>
> # 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.git openjdk-bot-65:65
>
> _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
110 commits:
- Merge branch 'foreign-jextract' into openjdk-bot-65
- Merge foreign-memaccess
- Merge master
- Automatic merge of jdk:master into master
- 8254695: G1: Next mark bitmap clear not cancelled after marking abort
Reviewed-by: iwalulya, sjohanss
- 8254161: Prevent instantiation of EnumSet subclasses through deserialization
Reviewed-by: dfuchs, alanb, rriggs, smarks
- 8254814: [Vector API] Fix an AVX512 crash after JDK-8223347
Reviewed-by: vlivanov, thartmann, psandoz
- 8251535: Partial peeling at unsigned test adds incorrect loop exit check
Reviewed-by: chagedorn, neliasso, kvn
- 8254125: Assertion in cppVtables.cpp during builds on 32bit Windows
Reviewed-by: shade, ccheung
- 8254369: Node::disconnect_inputs may skip precedences
disconnect_inputs() needs to iterate precedences edges in reverse order because rm_prec(i) may backfill _in[i] with a
value afterward. also remove the predicate if (n != NULL) in set_prec because it's always true.
Reviewed-by: kvn, redestad
- ... and 100 more: https://git.openjdk.java.net/panama-foreign/compare/d8c0d0d7...c737da60
-------------
Changes: https://git.openjdk.java.net/panama-foreign/pull/383/files
Webrev: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=383&range=01
Stats: 313863 lines in 794 files changed: 303554 ins; 5431 del; 4878 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/383.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/383/head:pull/383
PR: https://git.openjdk.java.net/panama-foreign/pull/383
More information about the panama-dev
mailing list