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

J.Duke duke at openjdk.java.net
Fri Oct 2 13:01:21 UTC 2020


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 101 commits from the branch `master`that
> can **not** be merged into the branch `foreign-memaccess`:
> The following files contains merge conflicts:
> 
> - src/hotspot/share/classfile/classFileParser.cpp
> - src/hotspot/share/classfile/vmSymbols.hpp
> - test/jdk/java/foreign/TestArrays.java
> - test/jdk/java/foreign/TestByteBuffer.java
> 
> 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 $ git pull https://github.com/openjdk/panama-foreign.git foreign-memaccess
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign.git +60:openjdk-bot-60
> $ git checkout openjdk-bot-60
> 
> # Merge the target branch
> $ git merge foreign-memaccess
> 
> 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-60:60
> 
> _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
102 commits:

 - Merge branch 'foreign-memaccess' into openjdk-bot-60
 - Automatic merge of jdk:master into master
 - 5078989: Null Pointer exception in SpinnerListMode
   
   Reviewed-by: serb
 - 8253891: Debug x86_32 builds fail after JDK-8239090
   
   Reviewed-by: stuefe, phh
 - 8253118: Avoid unnecessary deopts when OSR nmethods of the same level are present.
   
   Reviewed-by: kvn
 - 8249783: Simplify DerValue and DerInputStream
   
   Reviewed-by: valeriep
 - 8253747: tools/jpackage/share/AppImagePackageTest.java fails with InstalledPackageSize: 0
   
   Reviewed-by: almatvee, prr
 - 8232840: java/math/BigInteger/largeMemory/SymmetricRangeTests.java fails due to "OutOfMemoryError: Requested array size
   exceeds VM limit"
   
   Reviewed-by: alanb
 - 8253904: Revert Tokenizer improvements JDK-8224225
   
   Reviewed-by: mcimadamore
 - 8253824: Revert JDK-8253089 since VS warning C4307 has been disabled
   
   Reviewed-by: mdoerr, iklam
 - ... and 92 more: https://git.openjdk.java.net/panama-foreign/compare/b6d387e1...b3c02806

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

Changes: https://git.openjdk.java.net/panama-foreign/pull/368/files
 Webrev: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=368&range=01
  Stats: 16557 lines in 1917 files changed: 6783 ins; 3938 del; 5836 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/368.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/368/head:pull/368

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


More information about the panama-dev mailing list