Merge master #72
Closed
Merge master #72
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ld methods should not be in vtable Reviewed-by: lfoltan, dcubed, dholmes
…late minimumsize Reviewed-by: shade
Reviewed-by: erikj, bchristi, joehw
…T|SA_SIGINFO found:SA_RESTART|SA_SIGINFO Reviewed-by: stuefe, coleenp, dcubed
Reviewed-by: coleenp, iklam
…er.java fails Reviewed-by: cjplummer, sspitsyn
Reviewed-by: shade, erikj, ihse
Reviewed-by: shade, erikj
Reviewed-by: shade
…to access variable sized PtrQueue::_index Reviewed-by: shade
…useless_nodes missed this node") Check for nodes missed by remove_useless_nodes() only if PhaseRemoveUseless has actually been run. This makes it possible to use -XX:-UseLoopSafepoints without crashing trivially, although implicit assumptions in other parts of C2 about the existence of loop safepoints might lead to more subtle failures for more complex methods. Reviewed-by: neliasso, thartmann, kvn
Reviewed-by: pliden
Reviewed-by: ayang, eosterlund
Reviewed-by: rkennke
Reviewed-by: jiefu, thartmann
Reviewed-by: rkennke
Reviewed-by: iklam, vlivanov
Reviewed-by: kvn, shade, thartmann
Reviewed-by: redestad
Reviewed-by: herrick, almatvee
…cimalFormat Reviewed-by: bpb
…java on linux-aarch64 Reviewed-by: mikael
…ing a header file Reviewed-by: ihse
8231547: Serializable class doc should link to serialization specification Reviewed-by: rriggs, iris, chegar
…rrent code root evacuator Reviewed-by: rkennke
…e initializing cgroupv1 subsystem Reviewed-by: shade, sgehwolf, bobv
Reviewed-by: shade
Reviewed-by: dfuchs, lancea, bpb
…() on x86 Reviewed-by: kvn
…er -XX:+UseSSE Reviewed-by: kvn, iignatyev
Reviewed-by: stefank, ayang
Reviewed-by: stefank
Reviewed-by: jdv, psadhukhan
Reviewed-by: shade
Reviewed-by: neliasso, thartmann, kvn
Reviewed-by: thartmann, vlivanov
Reviewed-by: sjohanss, pliden
Reviewed-by: kizune
Reviewed-by: ayang, stefank
Reviewed-by: tschatzl, ayang
Reviewed-by: stefank
Reviewed-by: sundar
…ge_8 Reviewed-by: ihse
Reviewed-by: ayang, eosterlund, stefank
Reviewed-by: pliden, eosterlund
Reviewed-by: jvernee, kvn
…domly delay Reviewed-by: lancea
…in StubGenerator::copy_memory Reviewed-by: simonis
…a fails Reviewed-by: shade, adinn
…rong documentation Reviewed-by: weijun
Reviewed-by: simonis, kvn
|
👋 Welcome back duke! A progress list of the required criteria for merging this PR into |
openjdk
bot
added
merge-conflict
Webrevs |
|
@openjdk-bot This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration! |
|
@openjdk-bot This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi all,
this is an automatically generated pull request to notify you that there are 129 commits from the branch
masterthat can not be merged into the branchsealed-types:The following file contains merge conflicts:
All Committers in this project have access to my personal fork 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 of the openjdk/amber repository.
When you have resolved the conflicts resulting from the
git mergecommand 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:
Note: if you are using SSH to push commits to GitHub, then change the URL in the above
git pushcommand accordingly.Thanks,
J. Duke
Progress
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/amber pull/72/head:pull/72$ git checkout pull/72Update a local copy of the PR:
$ git checkout pull/72$ git pull https://git.openjdk.org/amber pull/72/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 72View PR using the GUI difftool:
$ git pr show -t 72Using diff file
Download this PR as a diff file:
https://git.openjdk.org/amber/pull/72.diff