[foreign-preview] RFR: Merge master [v2]

J.Duke duke at openjdk.java.net
Fri Feb 18 11:46:55 UTC 2022


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 91 commits from the branch `master`that can **not** be merged into the branch `foreign-preview`:
> 
> The following file contains merge conflicts:
> 
> - src/java.base/share/classes/jdk/internal/foreign/SystemLookup.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-preview
> $ git pull https://github.com/openjdk/panama-foreign.git foreign-preview
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign.git +114:openjdk-bot-114
> $ git checkout openjdk-bot-114
> 
> # Merge the target branch
> $ git merge foreign-preview
> 
> 
> 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-114:114
> 
> 
> _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 665 additional commits since the last revision:

 - Merge branch 'foreign-preview' into openjdk-bot-114
 - 8281595: ASM-ify scope acquire/release for down call parameters
   8281387: Some downcall shapes show unexpected allocations
   
   Co-authored-by: Maurizio Cimadamore <mcimadamore at openjdk.org>
   Reviewed-by: mcimadamore
 - Automatic merge of master into foreign-preview
 - 8281334: MemorySegment.ofBuffer does not keep byte buffer alive
   
   Reviewed-by: jvernee, psandoz
 - 8281228: Preview branch's CLinker.downcallHandle crashes inside asm
   
   Reviewed-by: sundar, jvernee
 - Automatic merge of master into foreign-preview
 - 8280596: ScopedMemoryAccess_closeScope: remove exception parameter
   
   Reviewed-by: mcimadamore
 - 8281147: Other tests that use the foreign API are missing --enable-preview
   
   Reviewed-by: mcimadamore
 - 8278414: Replace binding recipe customization using MH combinators with bytecode spinning
   
   Reviewed-by: mcimadamore
 - 8276647: Remove C2 trivial call intrinsification support
   
   Reviewed-by: mcimadamore
 - ... and 655 more: https://git.openjdk.java.net/panama-foreign/compare/cd3b60d5...125bce2b

-------------

Changes:
  - all: https://git.openjdk.java.net/panama-foreign/pull/645/files
  - new: https://git.openjdk.java.net/panama-foreign/pull/645/files/cd3b60d5..125bce2b

Webrevs:
 - full: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=645&range=01
 - incr: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=645&range=00-01

  Stats: 46291 lines in 428 files changed: 33974 ins; 10369 del; 1948 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/645.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/645/head:pull/645

PR: https://git.openjdk.java.net/panama-foreign/pull/645


More information about the panama-dev mailing list