[foreign-memaccess+abi] RFR: Merge master [v2]

J.Duke duke at openjdk.java.net
Fri Mar 5 16:08:50 UTC 2021


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 95 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
> 
> The following files contains merge conflicts:
> 
> - src/hotspot/cpu/aarch64/frame_aarch64.cpp
> - src/hotspot/cpu/x86/frame_x86.cpp
> - src/hotspot/cpu/x86/javaFrameAnchor_x86.hpp
> 
> 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 +90:openjdk-bot-90
> $ git checkout openjdk-bot-90
> 
> # 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-90:90
> 
> _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 730 additional commits since the last revision:

 - Merge branch 'foreign-memaccess+abi' into openjdk-bot-90
 - 8262118: Specialize upcalls
   
   Reviewed-by: mcimadamore, vlivanov
 - Automatic merge of master into foreign-memaccess+abi
 - Automatic merge of master into foreign-memaccess+abi
 - Add a benchmark for strlen using Foreign Linker API
   
   Reviewed-by: jvernee
 - Automatic merge of master into foreign-memaccess+abi
 - Automatic merge of master into foreign-memaccess+abi
 - 8258238: Some jextract samples crash with: "updating map that does not need updating"
   
   Reviewed-by: ngasson, mcimadamore
 - Add stack walk test case that doesn't verify oops
   
   Reviewed-by: vlivanov
 - 8258516: Allow passing a target address as an argument to a native MethodHandle
   
   Reviewed-by: mcimadamore, vlivanov
 - ... and 720 more: https://git.openjdk.java.net/panama-foreign/compare/7e7bd57c...54d10516

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

Changes:
  - all: https://git.openjdk.java.net/panama-foreign/pull/467/files
  - new: https://git.openjdk.java.net/panama-foreign/pull/467/files/7e7bd57c..54d10516

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

  Stats: 3330 lines in 81 files changed: 2650 ins; 381 del; 299 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/467.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/467/head:pull/467

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


More information about the panama-dev mailing list