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

Closed
wants to merge 91 commits into from
Closed

Merge jdk #162

wants to merge 91 commits into from

Conversation

MrSimms
Copy link
Member

@MrSimms MrSimms commented Aug 24, 2020

Merge tag 'jdk-16+5'

Conflicts:

src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp

src/hotspot/share/memory/metaspaceShared.cpp

src/hotspot/share/opto/cfgnode.cpp

src/hotspot/share/opto/memnode.cpp

src/hotspot/share/opto/subnode.cpp

src/hotspot/share/opto/subnode.hpp


Progress

  • Change must not contain extraneous whitespace

Download

$ git fetch https://git.openjdk.java.net/valhalla pull/162/head:pull/162
$ git checkout pull/162

mrserb and others added 30 commits Jun 22, 2020
…tonTest/EnqueueWithDialogButtonTest.java fails on mac

Reviewed-by: jdv
Fix live limit assert in node construction to be ignored during code generation in Compile::Code_Gen().

Reviewed-by: kvn, neliasso
…tion.java fails when -XX:+IgnoreUnrecognizedVMOptions is set

Use createJavaProcessBuilder() to prevent JTreg flags from being passed to the new process created by the test

Reviewed-by: lfoltan, dholmes
Reviewed-by: kvn, never
…failed - No child processes"

Reviewed-by: herrick, asemenyuk
…age for classpath

Define_shared_package only needs to be called once for each package in a jar specified in the shared class path.

Reviewed-by: iklam, dholmes, minqi
… convert \"$unix_path\" to Windows path

Reviewed-by: ihse
….java fails with String is not properly drawn

Reviewed-by: serb, pbansal
iignatev and others added 15 commits Jul 2, 2020
…ava NoSuchObjectException no such object in table

Reviewed-by: phh
…LockTest.java possible deadlock

Reviewed-by: phh
…due to inf. loop in AARCH64CurrentFrameGuess.run()

Reviewed-by: cjplummer, aph
Documentation added in the module-info of java.naming

Reviewed-by: chegar, aefimov, mullan
Added tag jdk-16+5 for changeset 143e258f64af

# Conflicts:
#	src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
#	src/hotspot/share/memory/metaspaceShared.cpp
#	src/hotspot/share/opto/cfgnode.cpp
#	src/hotspot/share/opto/memnode.cpp
#	src/hotspot/share/opto/subnode.cpp
#	src/hotspot/share/opto/subnode.hpp
@bridgekeeper
Copy link

bridgekeeper bot commented Aug 24, 2020

👋 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.

@MrSimms
Copy link
Member Author

MrSimms commented Aug 24, 2020

/summary Merge tag 'jdk-16+5'

@openjdk
Copy link

openjdk bot commented Aug 24, 2020

@MrSimms Setting summary to Merge tag 'jdk-16+5'

@openjdk
Copy link

openjdk bot commented Aug 24, 2020

@MrSimms This change now passes all automated pre-integration checks, type /integrate in a new comment to proceed. After integration, the commit message will be:

Merge jdk

Merge tag 'jdk-16+5'
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

There are currently no new commits on the lworld branch since the last update of the source branch of this PR. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you would like to avoid potential automatic rebasing, specify the current head hash when integrating, like this: /integrate c75f0f146a58e0f55b7ee69aec40ec3403c9da8a.

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

@MrSimms
Copy link
Member Author

MrSimms commented Aug 24, 2020

/integrate

@openjdk openjdk bot closed this Aug 24, 2020
@openjdk openjdk bot added integrated and removed ready labels Aug 24, 2020
@openjdk
Copy link

openjdk bot commented Aug 24, 2020

@MrSimms
Pushed as commit cd5c75f.

@openjdk openjdk bot removed the rfr label Aug 24, 2020
@MrSimms MrSimms deleted the lworld_merge_jdk_16_5 branch Aug 24, 2020
@mlbridge
Copy link

mlbridge bot commented Aug 24, 2020

Webrevs

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment