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

J.Duke duke at openjdk.java.net
Fri Nov 26 14:36:57 UTC 2021


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 84 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
> 
> Over 60 files contains merge conflicts.
> 
> 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 +107:openjdk-bot-107
> $ git checkout openjdk-bot-107
> 
> # 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-107:107
> 
> 
> _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 85 commits:

 - Merge branch 'foreign-memaccess+abi' into openjdk-bot-107
   All test passes - but the call arranger tests
 - Automatic merge of jdk:master into master
 - 8277139: Improve code readability in PredecessorValidator (c1_IR.cpp)
   
   Reviewed-by: thartmann, chagedorn
 - 8275330: C2:  assert(n->is_Root() || n->is_Region() || n->is_Phi() || n->is_MachMerge() || def_block->dominates(block)) failed: uses must be dominated by definitions
   
   Reviewed-by: thartmann, chagedorn
 - 8277417: C1 LIR instruction for load-klass
   
   Reviewed-by: iveresov, mdoerr, ngasson, aph
 - 8277508: need to check has_predicated_vectors before calling scalable_predicate_reg_slots
   
   Reviewed-by: njian, thartmann, ngasson
 - 8277659: [TESTBUG] Microbenchmark ThreadOnSpinWaitProducerConsumer.java hangs
   
   Reviewed-by: njian, ngasson
 - 8277165: jdeps --multi-release --print-module-deps fails if module-info.class in different versioned directories
   8277166: Data race in jdeps VersionHelper
   8277123: jdeps does not report some exceptions correctly
   
   Reviewed-by: jvernee, alanb
 - 8277504: Use String.stripTrailing instead of hand-crafted method in SwingUtilities2
   
   Reviewed-by: pbansal, serb
 - 8277825: Remove unused ReferenceProcessorPhaseTimes::_sub_phases_total_time_ms
   
   Reviewed-by: tschatzl
 - ... and 75 more: https://git.openjdk.java.net/panama-foreign/compare/77dbcdb8...ea95bf47

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

Changes: https://git.openjdk.java.net/panama-foreign/pull/618/files
 Webrev: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=618&range=01
  Stats: 10424 lines in 359 files changed: 8116 ins; 1134 del; 1174 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/618.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/618/head:pull/618

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


More information about the panama-dev mailing list