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

J. Duke duke at openjdk.org
Fri Sep 29 16:49:09 UTC 2023


> 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-memaccess+abi`:
> 
> The following files contains merge conflicts:
> 
> - src/java.base/share/classes/java/lang/foreign/AddressLayout.java
> - src/java.base/share/classes/java/lang/foreign/Linker.java
> - src/java.base/share/classes/java/lang/foreign/MemorySegment.java
> - src/java.base/share/classes/java/lang/foreign/SymbolLookup.java
> 
> All Committers in this [project](https://openjdk.org/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.org/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 +144:openjdk-bot-144
> $ git checkout openjdk-bot-144
> 
> # 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-144:144
> 
> 
> _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 910 additional commits since the last revision:

 - Merge branch 'foreign-memaccess+abi' into openjdk-bot-144
 - 8317050: Scope should reflect lifetime of underying resource
   
   Reviewed-by: jvernee
 - Rename max alignment constants for heap segments
   
   Reviewed-by: jvernee
 - Fix visibility issues
   
   Reviewed-by: mcimadamore
 - Modernize code
   
   Reviewed-by: mcimadamore
 - Tweak support for restricted methods
   
   Reviewed-by: jvernee, pminborg
 - Reintroduce suppression
   
   Reviewed-by: mcimadamore
 - Fix typos
   
   Reviewed-by: mcimadamore
 - Remove redundant supression
   
   Reviewed-by: mcimadamore
 - Fix the use of final and static
   
   Reviewed-by: mcimadamore
 - ... and 900 more: https://git.openjdk.org/panama-foreign/compare/cb2f0167...48b24617

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

Changes:
  - all: https://git.openjdk.org/panama-foreign/pull/899/files
  - new: https://git.openjdk.org/panama-foreign/pull/899/files/cb2f0167..48b24617

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

  Stats: 7975 lines in 291 files changed: 5635 ins; 1238 del; 1102 mod
  Patch: https://git.openjdk.org/panama-foreign/pull/899.diff
  Fetch: git fetch https://git.openjdk.org/panama-foreign.git pull/899/head:pull/899

PR: https://git.openjdk.org/panama-foreign/pull/899


More information about the panama-dev mailing list