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

Closed
wants to merge 75 commits into from
Closed

Merge jdk #175

wants to merge 75 commits into from

Conversation

MrSimms
Copy link
Member

@MrSimms MrSimms commented Sep 2, 2020

Merge tag 'jdk-16+11' into lworld_merge_jdk_16_11
Added tag jdk-16+11 for changeset 5c18d696c7ce

Conflicts:

src/hotspot/share/opto/live.cpp

src/hotspot/share/runtime/synchronizer.cpp


Progress

  • Change must not contain extraneous whitespace

Download

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

Mandy Chung and others added 30 commits Aug 5, 2020
…s::DefaultsLookupMode to enum class

Use C++11 scoped enumeration declarations for several different Klass and LinkInfo enumerations.

Reviewed-by: coleenp, hseigel, kbarrett
…he jvm libraries

Reviewed-by: sspitsyn, amenkov
…code and inflate

Reviewed-by: dcubed, coleenp
Reviewed-by: coleenp, dholmes, kbarrett
Move the oop and handle releasing it in the service thread.  Remove Universe::oops_do from callers.

Co-authored-by: Erik Osterlund <erik.osterlund@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: dholmes, zgu, eosterlund, cjplummer
…s very infrequently

TransportImpl is modified to make sure the CLOSED state is recorded before the channel is closed. The tests are modified to enable their retry mechanism on windows, similar to what was done previously for macOS.

Reviewed-by: prappo, chegar
SocketTube is fixed to cater for errors caused by pausing/resuming events on an asynchronously closed connection, from within the selector's manager thread. Http2Connection and Stream are fixed to prevent sending a DataFrame on a stream after Reset has been sent.

Reviewed-by: chegar
…trinsic"

Do not run intrinsics/sha/sanity tests with AOTed java.base

Reviewed-by: vlivanov
Move recent timestamp of most recent whole heap liveness analysis into CollectedHeap, removing the duplicates in all collectors

Reviewed-by: kbarrett, ayang, stefank
…eout

SO_RCVBUF was previously set to match the SO_SNDBUF, however the kernel value for SO_RCVBUF is much larger. This mismatch caused the test to fail, and the fix removes this issue.

Reviewed-by: alanb, dfuchs
…xpected IndexOutOfBoundsExceptions

Reviewed-by: bpb
Make test method really trivial, adjust trivial logic, make logic independent of background compilation.

Reviewed-by: iignatyev, thartmann, kvn
Improved existing scalar rotate operations, added support for vector rotate operations using new AVX512 instructions.

Reviewed-by: vlivanov, kvn
Patric Hedlin and others added 16 commits Aug 10, 2020
Move PhaseChaitin verify_base_ptrs() and verify() from live.cpp to chaitin.cpp

Reviewed-by: chagedorn, kvn
…ssertion poison page

Reviewed-by: stuefe, dcubed
Icrease test timout to 6 min

Reviewed-by: iignatyev
…nvalid

Added bailout in combine_spilled_intervals() to avoid an overlap between two intervals

Reviewed-by: kvn, thartmann
… intermittently with javax.naming.ServiceUnavailableException

Reviewed-by: dfuchs
…ion on closed channel

This fix addresses an issue where an AsynchronousCloseException was being thrown instead of a ChannelClosedException when SocketChannel.write() is called on a closed SocketChannel.

Reviewed-by: alanb, chegar, dfuchs
Release OopStorage oops for threadObj for exiting threads outside the service lock region that is marked as safe for safepoint.

Reviewed-by: zgu, dholmes, kbarrett
…hRanges.java test fails on Alpine Linux with debug build

Reviewed-by: dholmes, stuefe, dsamersoff
Reviewed-by: herrick, almatvee
Added tag jdk-16+11 for changeset 5c18d696c7ce

# Conflicts:
#	src/hotspot/share/opto/live.cpp
#	src/hotspot/share/runtime/synchronizer.cpp
@bridgekeeper
Copy link

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

@openjdk
Copy link

openjdk bot commented Sep 2, 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+11'
  • 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 c5eda14eeabd0738e1ac27e253158c017b2fae12.

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

@mlbridge
Copy link

mlbridge bot commented Sep 2, 2020

Webrevs

@MrSimms
Copy link
Member Author

MrSimms commented Sep 2, 2020

/summary Merge tag 'jdk-16+11'

@openjdk
Copy link

openjdk bot commented Sep 2, 2020

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

@MrSimms
Copy link
Member Author

MrSimms commented Sep 2, 2020

/integrate

@openjdk openjdk bot closed this Sep 2, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Sep 2, 2020
@openjdk
Copy link

openjdk bot commented Sep 2, 2020

@MrSimms
Pushed as commit e02fece.

@MrSimms MrSimms deleted the lworld_merge_jdk_16_11 branch Sep 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment