[sealed-types] RFR: Merge master

J.Duke duke at openjdk.java.net
Tue Jun 2 21:28:08 UTC 2020


Hi all,

this is an _automatically_ generated pull request to notify you that there are 74 commits from the branch `master`that
can **not** be merged into the branch `sealed-types`:

Over 17 files contains merge conflicts.

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 sealed-types
$ git pull https://github.com/openjdk/amber sealed-types

# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/amber +48:openjdk-bot-48
$ git checkout openjdk-bot-48

# Merge the target branch
$ git merge sealed-types

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-48:48

_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

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

Commit messages:
 - manual merge
 - 8245714: "Bad graph detected in build_loop_late" when loads are pinned on loop limit check uncommon branch
 - 8244086: Following 8241492, strip mined loop may run extra iterations
 - 8246097: Shenandoah: limit parallelism in CLDG root handling
 - 8246100: Shenandoah: walk roots in more efficient order
 - 8246241: LambdaFormEditor should use a transform lookup key that is not a SoftReference
 - 8242281: IntStream.html#reduce doc should not mention average
 - 8239083: C1 assert(known_holder == NULL || (known_holder->is_instance_klass() && (!known_holder->is_interface() || ((ciInstanceKlass*)known_holder)->has_nonstatic_concrete_methods())), "should be non-static concrete method");
 - 8243506: SharedBaseAddress is ignored by -Xshare:dump
 - 8239477: jdk/jfr/jcmd/TestJcmdStartStopDefault.java fails -XX:+VerifyOops with "verify_oop: rsi: broken oop"
 - ... and 65 more: https://git.openjdk.java.net/amber/compare/f5534a15...2e3dd9fa

The merge commit only contains trivial merges, so no merge-specific webrevs have been generated.

Changes: https://git.openjdk.java.net/amber/pull/28/files
  Stats: 17116 lines in 372 files changed: 6310 ins; 8877 del; 1929 mod
  Patch: https://git.openjdk.java.net/amber/pull/28.diff
  Fetch: git fetch https://git.openjdk.java.net/amber pull/28/head:pull/28

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


More information about the amber-dev mailing list