Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge jdk #509

Closed
wants to merge 467 commits into from
Closed

Merge jdk #509

wants to merge 467 commits into from

Conversation

@MrSimms
Copy link
Member

@MrSimms MrSimms commented Jul 30, 2021

Merge tag 'jdk-18+7'


Progress

  • Change must not contain extraneous whitespace

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/valhalla pull/509/head:pull/509
$ git checkout pull/509

Update a local copy of the PR:
$ git checkout pull/509
$ git pull https://git.openjdk.java.net/valhalla pull/509/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 509

View PR using the GUI difftool:
$ git pr show -t 509

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/valhalla/pull/509.diff

Hamlin Li and others added 30 commits Jul 1, 2021
…entry block

Replace UnsafeGetRaw with UnsafeGetObject when setting up OSR entry block, and rename Unsafe{Get,Put}Object to Unsafe{Get,Put}

Reviewed-by: thartmann, dlong, mdoerr
…t exit on cancelling print dialog

Reviewed-by: aghaisas, serb
Co-authored-by: Maurizio Cimadamore <mcimadamore@openjdk.org>
Reviewed-by: kvn, iveresov
…ailed: no node with a side effect

Reviewed-by: kvn, iveresov, neliasso
…after JDK-8191998

Reviewed-by: kvn, iveresov, vlivanov
…ze keys and disallow null for keys and values

Reviewed-by: chegar, dfuchs, michaelm
Reviewed-by: joehw, prappo, iris
…ption.java timed out

Reviewed-by: pliden, lkorinth
Reviewed-by: sadayapalam, jlahoda
…AndMH/Test.java crash with small heap (-Xmx50m)

Reviewed-by: dholmes
…ernal VM JavaThreads

Reviewed-by: sspitsyn, pchilanomate, dcubed, coleenp, kvn
…cation control projection

Reviewed-by: rbackman, kvn
…r once for each caller

Reviewed-by: lancea, alanb, dfuchs
…se) failed: bad AD file"

Reviewed-by: kvn, dlong
Reviewed-by: iignatyev, egahlin
Fernando Guallini and others added 15 commits Jul 21, 2021
…ication of protocol and cipher support

Reviewed-by: xuelei, rhalade
Reviewed-by: minqi, ccheung
…ption.java failed with "OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects"

Reviewed-by: kbarrett
…on of the current release

Reviewed-by: alanb
Added tag jdk-18+7 for changeset 024c402

# Conflicts:
#	src/hotspot/share/code/codeBlob.cpp
#	src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
#	src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
#	src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java
@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Jul 30, 2021

/summary Merge tag 'jdk-18+7'

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jul 30, 2021

👋 Welcome back dsimms! A progress list of the required criteria for merging this PR into lworld will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

@openjdk openjdk bot commented Jul 30, 2021

@MrSimms This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

Merge jdk

Merge tag 'jdk-18+7'

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the lworld branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the lworld branch, type /integrate in a new comment.

@openjdk
Copy link

@openjdk openjdk bot commented Jul 30, 2021

@MrSimms Setting summary to Merge tag 'jdk-18+7'

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jul 30, 2021

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Jul 30, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jul 30, 2021

Going to push as commit 0e3418d.

@openjdk openjdk bot closed this Jul 30, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Jul 30, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jul 30, 2021

@MrSimms Pushed as commit 0e3418d.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@MrSimms MrSimms deleted the lworld_merge_jdk_18_6 branch Oct 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment