[foreign-memaccess+abi] RFR: Merge master [v2]
J.Duke
duke at openjdk.java.net
Fri Jun 4 11:18:56 UTC 2021
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 45 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
>
> The following file contains merge conflicts:
>
> - test/jdk/java/foreign/TestUpcall.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 +98:openjdk-bot-98
> $ git checkout openjdk-bot-98
>
> # 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-98:98
>
>
> _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 789 additional commits since the last revision:
- Merge branch 'foreign-memaccess+abi' into 98
- Merge master
- 8267989: Exceptions thrown during upcalls should be handled
8268031: VarHandle combinator check for exceptions is too strict
Reviewed-by: mcimadamore
- Automatic merge of master into foreign-memaccess+abi
- 8267240: Bounded arena allocator doesn't work if bounded size > BLOCK_SIZE
Reviewed-by: jvernee
- Remove printf and vprintf tests
Reviewed-by: mcimadamore
- Automatic merge of master into foreign-memaccess+abi
- 8266911: On Windows the system lookup should load ucrtbase if possible
Reviewed-by: mcimadamore
- 8266916: Simplify logic for creating libSysLookup
Reviewed-by: sundar
- 8266814: Improve library loading with SymbolLookup abstraction
Reviewed-by: jvernee, sundar
- ... and 779 more: https://git.openjdk.java.net/panama-foreign/compare/36320414...ad831c30
-------------
Changes:
- all: https://git.openjdk.java.net/panama-foreign/pull/549/files
- new: https://git.openjdk.java.net/panama-foreign/pull/549/files/36320414..ad831c30
Webrevs:
- full: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=549&range=01
- incr: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=549&range=00-01
Stats: 1706 lines in 59 files changed: 937 ins; 639 del; 130 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/549.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/549/head:pull/549
PR: https://git.openjdk.java.net/panama-foreign/pull/549
More information about the panama-dev
mailing list