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

J.Duke duke at openjdk.java.net
Fri Sep 18 14:29:00 UTC 2020


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 83 commits from the branch
> `foreign-memaccess`that can **not** be merged into the branch `foreign-abi`:
> The following files contains merge conflicts:
> 
> - src/hotspot/share/classfile/vmSymbols.hpp
> - src/hotspot/share/opto/machnode.hpp
> 
> All Committers in this [project](https://openjdk.java.net/census#Optional[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-abi $ git pull https://github.com/openjdk/panama-foreign foreign-abi
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign +58:openjdk-bot-58
> $ git checkout openjdk-bot-58
> 
> # Merge the target branch
> $ git merge foreign-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 foreign-memaccess'
> 
> 
> 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 openjdk-bot-58:58
> 
> _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 241 additional commits since the last
revision:

 - Fixes
 - Merge branch 'foreign-abi' into openjdk-bot-58
 - Automatic merge of foreign-memaccess into foreign-abi
 - 8239780: FunctionDescriptor factories and combinators should check whether return layout is null
   
   Reviewed-by: sundar
 - Automatic merge of foreign-memaccess into foreign-abi
 - Merge foreign-memaccess
 - Fix the merge message regex
 - 8248560: Specify the behaviour of the ForeignLinker returned by CSupport::getSystemLinker
   
   Reviewed-by: sundar
 - Automatic merge of foreign-memaccess into foreign-abi
 - Automatic merge of foreign-memaccess into foreign-abi
 - ... and 231 more: https://git.openjdk.java.net/panama-foreign/compare/926437ca...0651d2ab

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

Changes:
  - all: https://git.openjdk.java.net/panama-foreign/pull/344/files
  - new: https://git.openjdk.java.net/panama-foreign/pull/344/files/926437ca..0651d2ab

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

  Stats: 66825 lines in 208 files changed: 66637 ins; 92 del; 96 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/344.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/344/head:pull/344

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


More information about the panama-dev mailing list