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

J. Duke duke at openjdk.org
Fri Sep 15 12:39:38 UTC 2023


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 106 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
> 
> The following file contains merge conflicts:
> 
> - test/hotspot/jtreg/compiler/rangechecks/TestRangeCheckHoistingScaledIV.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 +142:openjdk-bot-142
> $ git checkout openjdk-bot-142
> 
> # 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-142:142
> 
> 
> _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 107 commits:

 - Merge branch 'foreign-memaccess+abi' into 142
 - Automatic merge of jdk:master into master
 - 8316182: RISC-V: SA stack walking code having trouble finding sender frame when invoking LambdaForms is involved
   
   Reviewed-by: fyang
 - 8314551: More generic way to handshake GC threads with monitor deflation
   
   Reviewed-by: jsjolen, eosterlund
 - 8312165: Fix typos in java.desktop Swing
   
   Co-authored-by: Alexey Ivanov <aivanov at openjdk.org>
   Reviewed-by: aivanov
 - 8316160: Remove sun.misc.Unsafe.{shouldBeInitialized,ensureClassInitialized}
   
   Reviewed-by: rriggs, mchung, jpai
 - 8316001: GC: Make TestArrayAllocatorMallocLimit use createTestJvm
   
   Reviewed-by: ayang, tschatzl
 - 8314136: Test java/net/httpclient/CancelRequestTest.java failed: WARNING: tracker for HttpClientImpl(42) has outstanding operations
   
   Reviewed-by: jpai
 - 8315931: RISC-V: xxxMaxVectorTestsSmokeTest fails when using RVV
   
   Reviewed-by: fyang, dzhang
 - 8316178: Better diagnostic header for CodeBlobs
   
   Reviewed-by: thartmann, kvn
 - ... and 97 more: https://git.openjdk.org/panama-foreign/compare/5eaa0be2...df548e33

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

Changes: https://git.openjdk.org/panama-foreign/pull/884/files
 Webrev: https://webrevs.openjdk.org/?repo=panama-foreign&pr=884&range=01
  Stats: 50764 lines in 1703 files changed: 13735 ins; 5658 del; 31371 mod
  Patch: https://git.openjdk.org/panama-foreign/pull/884.diff
  Fetch: git fetch https://git.openjdk.org/panama-foreign.git pull/884/head:pull/884

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


More information about the panama-dev mailing list