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

Closed
wants to merge 66 commits into from
Closed

Merge jdk #547

wants to merge 66 commits into from

Conversation

MrSimms
Copy link
Member

@MrSimms MrSimms commented Sep 7, 2021

Merge tag 'jdk-18+13'

Conflicts:

src/hotspot/share/opto/escape.cpp

src/hotspot/share/opto/library_call.cpp

src/java.base/share/classes/java/lang/runtime/ObjectMethods.java

test/jdk/java/lang/runtime/ObjectMethodsTest.java


Progress

  • Change must not contain extraneous whitespace

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 547

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

Using diff file

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

Ivan Walulya and others added 30 commits Aug 25, 2021
…InfiniteLoop

Reviewed-by: chagedorn, jiefu, neliasso
Co-authored-by: Thomas Schatzl <tschatzl@openjdk.org>
Reviewed-by: tschatzl, kbarrett
…ser is wrong

Reviewed-by: joehw, rriggs, iris, lancea, scolebourne
…blic java modules

Reviewed-by: serb, dfuchs, naoto
…a timed out

Reviewed-by: cjplummer, sspitsyn
Reviewed-by: dholmes, eosterlund
Reviewed-by: dholmes, jiefu
…RuntimeException: Copy was not interrupted

Reviewed-by: dfuchs
….ClassWriter::writePosition

Reviewed-by: vromero
yminqi and others added 21 commits Aug 31, 2021
…ake a significant amount of time

Reviewed-by: tschatzl, ayang
Reviewed-by: sjohanss, tschatzl
…Types because tree.meth.type is null

Co-authored-by: Jan Lahoda <jlahoda@openjdk.org>
Co-authored-by: Vicente Romero <vromero@openjdk.org>
Reviewed-by: jlahoda
Reviewed-by: redestad, ihse, dfuchs
8273198: ProblemList java/lang/instrument/BootClassPath/BootClassPathTest.sh due to JDK-8273188

Reviewed-by: naoto
… - Debugee.prepareDebugee

Reviewed-by: sspitsyn, kevinw
…after JDK-8159979

Reviewed-by: dholmes, ayang
Added tag jdk-18+13 for changeset 02822e1

# Conflicts:
#	src/hotspot/share/opto/escape.cpp
#	src/hotspot/share/opto/library_call.cpp
#	src/java.base/share/classes/java/lang/runtime/ObjectMethods.java
#	test/jdk/java/lang/runtime/ObjectMethodsTest.java
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 7, 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 Sep 7, 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

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.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 7, 2021

Webrevs

@MrSimms MrSimms marked this pull request as draft Sep 7, 2021
@openjdk openjdk bot removed the rfr label Sep 7, 2021
@MrSimms MrSimms closed this Sep 9, 2021
@MrSimms MrSimms deleted the lworld_merge_jdk_18_13 branch Oct 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels