Merge master #71
Closed
Merge master #71
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
…ERRUPT after calling RawMonitorEnter Reviewed-by: alanb, dholmes, sspitsyn
Reviewed-by: kvn, redestad
Reviewed-by: jdv, aivanov
Reviewed-by: kvn
Reviewed-by: asemenyuk, almatvee, kizune
…sing jtreg tags Reviewed-by: naoto
…ess test failed Reviewed-by: chegar, dfuchs
Reviewed-by: redestad, cjplummer, dholmes, stuefe
…escription.java timed out Reviewed-by: sspitsyn, cjplummer
Reviewed-by: aivanov
Reviewed-by: redestad, mr, mchung, iris, serb
Reviewed-by: simonis
Reviewed-by: serb
…jectInOldGen Reviewed-by: shade
Reviewed-by: prr
Reviewed-by: prr
Reviewed-by: ngasson, aph
Reviewed-by: prr
…a2d.loops.Blit.Blit Reviewed-by: prr
…of Swing Reviewed-by: prr, psadhukhan
Reviewed-by: shade
Reviewed-by: coleenp, gziemski, dholmes
Reviewed-by: tschatzl, ayang
Reviewed-by: rriggs, shade, alanb
…ified as such Reviewed-by: prr
… fails Reviewed-by: shade, rkennke
Reviewed-by: shurailine, serb
Reviewed-by: azeemj, kizune, prr
Co-authored-by: Erik Österlund <eosterlund@openjdk.org> Reviewed-by: eosterlund, rehn, coleenp
…NO_KEEPALIVE Reviewed-by: shade
…inalizer Reviewed-by: eosterlund
…86_32 Reviewed-by: shade
Reviewed-by: zgu, dcubed
8248188: Add IntrinsicCandidate and API for Base64 decoding, add Power64LE intrinsic implementation. This patch set encompasses the following commits: Adds a new intrinsic candidate to the java.lang.Base64 class - decodeBlock(), and provides a flexible API for the intrinsic. The API is similar to the existing encodeBlock intrinsic. Adds the code in HotSpot to check and martial the new intrinsic's arguments to the arch-specific intrinsic implementation. Adds a Power64LE-specific implementation of the decodeBlock intrinsic. Adds a JMH microbenchmark for both Base64 encoding and encoding. Enhances the JTReg hotspot intrinsic "TestBase64.java" regression test to more fully test both decoding and encoding. Reviewed-by: rriggs, mdoerr, kvn
Reviewed-by: ihse, kbarrett
Reviewed-by: shade, iignatyev
Reviewed-by: dholmes
Reviewed-by: clanger, ihse
Reviewed-by: sspitsyn
…ces functionality Reviewed-by: ayang, iignatyev, iklam
…of trip-counted integer loops Reviewed-by: chagedorn, thartmann
Reviewed-by: thartmann, chagedorn
Reviewed-by: thartmann, chagedorn
Reviewed-by: tschatzl, dcubed
Reviewed-by: iklam, minqi
Reviewed-by: erikj, psandoz, alanb
…ops.java failed Reviewed-by: jdv
…sponseAPDU Reviewed-by: xuelei
…G 7.1 Reviewed-by: lancea, iignatyev
…n Shenandoah root verifier Reviewed-by: rkennke, shade
|
👋 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 87 commits from the branch
masterthat can not be merged into the branchrecords-2: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/71/head:pull/71$ git checkout pull/71Update a local copy of the PR:
$ git checkout pull/71$ git pull https://git.openjdk.org/amber pull/71/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 71View PR using the GUI difftool:
$ git pr show -t 71Using diff file
Download this PR as a diff file:
https://git.openjdk.org/amber/pull/71.diff