[concise-method-declarations] RFR: Merge master [v2]

J.Duke duke at openjdk.java.net
Fri Sep 18 13:36:19 UTC 2020


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 76 commits from the branch `master`that
> can **not** be merged into the branch `concise-method-declarations`:
> The following file contains merge conflicts:
> 
> - .jcheck/conf
> 
> All Committers in this [project](https://openjdk.java.net/census#Optional[amber]) have access to my [personal
> fork](https://github.com/openjdk-bot/amber) 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/amber](https://github.com/openjdk/amber) repository.  # Ensure target branch is up to date $ git checkout
> concise-method-declarations $ git pull https://github.com/openjdk/amber concise-method-declarations
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/amber +62:openjdk-bot-62
> $ git checkout openjdk-bot-62
> 
> # Merge the target branch
> $ git merge concise-method-declarations
> 
> 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/amber openjdk-bot-62:62
> 
> _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
77 commits:

 - manual merge
 - 8253313: xmlstream.hpp missing from vmIntrinsics.cpp
   
   Reviewed-by: mikael
 - 8253271: vm_version_x86.hpp should not include globals_extension.hpp
   
   Reviewed-by: dholmes
 - 8243066: Move VM_INTRINSICS_DO into its own vmIntrinsics.hpp file
   
   Reviewed-by: iklam, vlivanov
 - 8253262: Allocate in DumpRegion is not thread safe
   
   Reviewed-by: ccheung
 - 8252041: G1: Fix incorrect uses of HeapRegionManager::max_length
   
   Reviewed-by: sjohanss, kbarrett
 - 8253285: Some java/util/StringJoiner tests do not explicitly specify required -XX:+CompactStrings
   
   Reviewed-by: rriggs, jlaskey
 - 8251397: NPE on ClassValue.ClassValueMap.cacheArray
   
   Add release fence to ClassValueMap constructor.
   
   * Release fence guarantees that cacheArray field will published
   with a non-null value.
   * Without this fix, CacheValueMap.cacheArray can sometimes be
   seen as null.
   
   Reviewed-by: shade, psandoz
 - 8252996: Thread safety problem in java.net.ProxySelector
   
   Reviewed-by: alanb
 - 8252593: [TESTBUG] serviceability/jvmti/GetLocalVariable/GetLocalWithoutSuspendTest.java failed with
   JVMTI_ERROR_INVALID_SLOT
   
   Reviewed-by: sspitsyn, cjplummer
 - ... and 67 more: https://git.openjdk.java.net/amber/compare/d54b0596...02995ec3

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

Changes: https://git.openjdk.java.net/amber/pull/46/files
 Webrev: https://webrevs.openjdk.java.net/?repo=amber&pr=46&range=01
  Stats: 18136 lines in 428 files changed: 9369 ins; 6605 del; 2162 mod
  Patch: https://git.openjdk.java.net/amber/pull/46.diff
  Fetch: git fetch https://git.openjdk.java.net/amber pull/46/head:pull/46

PR: https://git.openjdk.java.net/amber/pull/46


More information about the amber-dev mailing list