Merge master #27
Merged
Merge master #27
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
…regroundTest.java fails Reviewed-by: pbansal
…ava fails Reviewed-by: serb
…Win7 Reviewed-by: psadhukhan
Reviewed-by: psadhukhan
Reviewed-by: psadhukhan, jdv
Reviewed-by: psadhukhan, pbansal
Reviewed-by: psadhukhan
Reviewed-by: psadhukhan
Reviewed-by: psadhukhan
… to ProblemList twice Reviewed-by: psadhukhan
…manual Reviewed-by: psadhukhan
…d on loop limit check uncommon branch Reviewed-by: thartmann
Reviewed-by: adinn
…Warnings() that allow version strings Reviewed-by: dholmes, cjplummer
Reviewed-by: sspitsyn, stefank, coleenp
Reviewed-by: sspitsyn, sundar
Reviewed-by: dcubed
Disable warning for gcc/clang. Reviewed-by: ihse, iklam
Co-authored-by: Mark Kralj-Taylor <kralj.mark@gmail.com> Reviewed-by: dfuchs, rriggs, dcubed, vtewari
…s when passed invalid parameters This fix updates the spec for DatagramSocket's constructors to inform the user of the Exceptions thrown when an invalid argument is passed. Reviewed-by: dfuchs
Reiplement memory scope using StampedLock Reviewed-by: psandoz
Make test more robust by not relying on implicit endianness-related assumption Reviewed-by: chegar
…ult file systems Rework non-default file system paths of BodySubscriber::ofFile and BodyHandler::ofFile and fix BodyHandler::ofFileDownload to throw consistently for non-default file system paths Reviewed-by: dfuchs, chegar
…ses returned by HostsFileNameService Reviewed-by: dfuchs, alanb, vtewari
Reviewed-by: erikj, mgronlun
Reviewed-by: mgronlun
Reviewed-by: mgronlun
…his_class is not Class_info structure 8245432: Lookup::defineHiddenClass should throw UnsupportedClassVersionError if bytes are of an unsupported major or minor version 8245596: Clarify Lookup::defineHiddenClass spec @throws IAE if the bytes has ACC_MODULE flag set Reviewed-by: alanb, dholmes
Reviewed-by: mgronlun
8225056: VM support for sealed classes 8227044: javax.lang.model for sealed classes 8227045: Preview APIs support for sealed classes 8227047: Javadoc for sealed types 8245854: JVM TI Specification for sealed classes Co-authored-by: Harold Seigel <harold.seigel@oracle.com> Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com> Reviewed-by: mcimadamore, forax, darcy, dholmes, jlahoda, lfoltan, mchung, sspitsyn, vromero
In SuperWord::find_align_to_ref(), only discard unalignable memory ops if memory references should be aligned on this platform. Reviewed-by: roland, thartmann
Add support for AsyncDeflateIdleMonitors (default true); the async deflation work is performed by the ServiceThread. Co-authored-by: Carsten Varming <varming@gmail.com> Reviewed-by: dcubed, rehn, rkennke, cvarming, coleenp, acorn, dholmes, eosterlund
… enabled Reviewed-by: dholmes, kvn
If module-info.class is broken, mark the corresponding ModuleSymbol as erroneous. Reviewed-by: jjg
…es.enter(Modules.java:244) Do not clean trees after last round of annotation processing, if the trees won't be re-entered again. Reviewed-by: vromero
Use the memory input instead of the control input to find the membar. Reviewed-by: kvn, neliasso
Removed LIR_OpBranch::type after the only remaining usage was removed with the SPARC port removal. Reviewed-by: kvn, mdoerr
…Oops with "verify_oop: rsi: broken oop" Use T_ADDRESS instead of T_OBJECT to load metadata. Reviewed-by: kvn
Reviewed-by: stuefe, ccheung
…_klass() && (!known_holder->is_interface() || ((ciInstanceKlass*)known_holder)->has_nonstatic_concrete_methods())), "should be non-static concrete method"); Remove unnecessary preparation to profile the holder of a static method called by a method handle in C1. Reviewed-by: thartmann, kvn
Remove mention of average function in apiNote of IntStream::reduce(int, IntBinaryOperator) Reviewed-by: psandoz, jlaskey, lancea, dfuchs
…ot a SoftReference Reviewed-by: psandoz, mchung
Reviewed-by: zgu
Reviewed-by: zgu
Reviewed-by: mdoerr, thartmann
|
👋 Welcome back duke! A progress list of the required criteria for merging this PR into |
openjdk
bot
added
merge-conflict
|
@openjdk-bot This change is no longer ready for integration - check the PR body for details. |
openjdk
bot
added
ready
openjdk
bot
added
merge-conflict
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 74 commits from the branch
masterthat can not be merged into the branchenhanced-enums:The following files 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
Error
Download
$ git fetch https://git.openjdk.java.net/amber pull/27/head:pull/27$ git checkout pull/27