[foreign-memaccess+abi] RFR: Merge master [v2]
J.Duke
duke at openjdk.java.net
Fri Jun 25 11:19:09 UTC 2021
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 81 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
>
> The following files contains merge conflicts:
>
> - src/hotspot/share/runtime/frame.inline.hpp
> - test/jdk/java/foreign/TestStringEncoding.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 +101:openjdk-bot-101
> $ git checkout openjdk-bot-101
>
> # 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-101:101
>
>
> _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 82 commits:
- Merge branch 'foreign-memaccess+abi' into 101
- Automatic merge of jdk:master into master
- 8265919: RunThese30M fails "assert((!(((((JfrTraceIdBits::load(value)) & ((1 << 4) << 8)) != 0))))) failed: invariant"
Reviewed-by: egahlin
- 8269092: Add OldObjectSampleEvent.allocationSize field
Reviewed-by: egahlin, jbachorik
- 8269225: JFR.stop misses the written info when the filename is only specified by JFR.start
Reviewed-by: egahlin
- 8269280: (bf) Replace StringBuffer in *Buffer.toString()
Reviewed-by: alanb, chegar, bpb
- 8268276: Base64 Decoding optimization for x86 using AVX-512
Reviewed-by: erikj, sviswanathan, kvn
- 8268855: Cleanup name handling in the Thread class and subclasses
Reviewed-by: lfoltan, coleenp
- 8269303: Remove unnecessary forward declaration of PSPromotionManager in cpCache.hpp
Reviewed-by: kbarrett
- 8269293: ObjectMonitor thread id fields should be 64 bits.
Reviewed-by: mgronlun, dcubed
- ... and 72 more: https://git.openjdk.java.net/panama-foreign/compare/7c94f63f...54aeee47
-------------
Changes: https://git.openjdk.java.net/panama-foreign/pull/563/files
Webrev: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=563&range=01
Stats: 31893 lines in 561 files changed: 15669 ins; 14969 del; 1255 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/563.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/563/head:pull/563
PR: https://git.openjdk.java.net/panama-foreign/pull/563
More information about the panama-dev
mailing list