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

J.Duke duke at openjdk.java.net
Fri Jul 10 12:22:52 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 file contains merge conflicts:
> 
> - src/hotspot/share/opto/graphKit.cpp
> 
> 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 +44:openjdk-bot-44
> $ git checkout openjdk-bot-44
> 
> # 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-44:44
> 
> _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
84 commits:

 - Merge branch 'foreign-abi' into 44
 - Automatic merge of master into foreign-memaccess
 - Automatic merge of jdk:master into master
 - 8248652: Shenandoah: SATB buffer handling may assume no forwarded objects
   
   Reviewed-by: rkennke
 - Merge
 - 8248983: Add links to definition of empty name
   
   Reviewed-by: forax, jjg, jlaskey
 - 8242529: javac defines type annotations incorrectly for record members (constructor and property accessor)
   
   Reviewed-by: psandoz, jlahoda
 - 8248426: NMT: VirtualMemoryTracker::split_reserved_region() does not properly update summary counting
   
   Reviewed-by: stuefe, minqi
 - 8249086: JDK 15 L10N resource file update - msg drop 10
   
   Reviewed-by: naoto
 - 8249037: clean up FileInstaller $test.src $cwd in vmTestbase_vm_g1classunloading tests
   
   Reviewed-by: kbarrett
 - ... and 74 more: https://git.openjdk.java.net/panama-foreign/compare/281c5345...cd7e7281

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

Changes: https://git.openjdk.java.net/panama-foreign/pull/239/files
 Webrev: https://webrevs.openjdk.java.net/panama-foreign/239/webrev.01
  Stats: 6174 lines in 453 files changed: 2702 ins; 1777 del; 1695 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/239.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/239/head:pull/239

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


More information about the panama-dev mailing list