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 #448

Closed
wants to merge 52 commits into from
Closed

Merge jdk #448

wants to merge 52 commits into from

Conversation

@MrSimms
Copy link
Member

@MrSimms MrSimms commented Jun 17, 2021

Merge tag 'jdk-18+2'

Conflicts:

src/hotspot/share/opto/compile.cpp

src/hotspot/share/opto/compile.hpp

src/hotspot/share/opto/macroArrayCopy.cpp


Progress

  • Change must not contain extraneous whitespace

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 448

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

Using diff file

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

iignatev and others added 30 commits Jun 10, 2021
…cStore.java" Fails with NPE

Reviewed-by: mullan
Reviewed-by: kbarrett, ccheung
Reviewed-by: kbarrett, stuefe, tschatzl
…ut changed to a single element throws NullPointerException

Reviewed-by: darcy, jfranck
…h "IllegalStateException: This segment is already closed"

Reviewed-by: dfuchs
…failed: avoid underflow

Reviewed-by: dcubed, stefank, kbarrett
…case which is not last

Reviewed-by: vromero
Reviewed-by: dcubed
Jan Lahoda and others added 15 commits Jun 15, 2021
…d <owner is scalar replaced>'

Reviewed-by: cjplummer, zgu, dcubed
Reviewed-by: minqi, iklam, coleenp
Added tag jdk-18+2 for changeset 72b3b0a

# Conflicts:
#	src/hotspot/share/opto/compile.cpp
#	src/hotspot/share/opto/compile.hpp
#	src/hotspot/share/opto/macroArrayCopy.cpp
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jun 17, 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.

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Jun 17, 2021

/summary Merge tag 'jdk-18+2'

@openjdk
Copy link

@openjdk openjdk bot commented Jun 17, 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+2'

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 Jun 17, 2021

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

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jun 17, 2021

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Jun 17, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jun 17, 2021

Going to push as commit 85af6b5.
Since your change was applied there has been 1 commit pushed to the lworld branch:

  • 0a85431: 8267821: [lworld] Javac's handling of `primitive' modifier is unlike the handling of other restricted identifiers

Your commit was automatically rebased without conflicts.

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

@openjdk openjdk bot commented Jun 17, 2021

@MrSimms Pushed as commit 85af6b5.

💡 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_2 branch Jul 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment