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

Closed
wants to merge 87 commits into from
Closed

Merge jdk #176

wants to merge 87 commits into from

Conversation

MrSimms
Copy link
Member

@MrSimms MrSimms commented Sep 3, 2020

Merge tag 'jdk-16+12' into lworld_merge_jdk_16_12
Added tag jdk-16+12 for changeset fc8e62b399bd

Conflicts:

src/hotspot/share/memory/dynamicArchive.cpp

src/hotspot/share/memory/heapInspection.cpp

src/hotspot/share/memory/metaspaceClosure.hpp

src/hotspot/share/memory/metaspaceShared.cpp

src/hotspot/share/oops/markWord.hpp

src/hotspot/share/opto/memnode.cpp


Progress

  • Change must not contain extraneous whitespace

Download

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

Prasadrao Koppula and others added 30 commits Jun 11, 2020
Reviewed-by: serb, kizune, kcr, cjplummer
…ode in documentation

Reviewed-by: jdv, pbansal
… on Fedora 32

Reviewed-by: prr, psadhukhan
OOME seems to have happened in older version and does not show up in modern VM, hence the test OverloadCompileQueueTest.java gets un-quarantined.

Reviewed-by: iignatyev
…ffset() return a non 0 value for sub images

Reviewed-by: jdv, serb
…ultiply

Co-authored-by: Monica Beckwith <monica.beckwith@microsoft.com>
Co-authored-by: Ludovic Henry <luhenry@microsoft.com>
Reviewed-by: aph
…int.java failed OutOfMemoryError

Removed allocation of large arrays to avoid OOME.

Reviewed-by: kvn, chagedorn
Limit the counter value to max_jint.

Reviewed-by: kvn, vlivanov, chagedorn
Refactor, using NOINLINE and (new) ATTRIBUTE_FLATTEN for control.

Reviewed-by: tschatzl, sjohanss
…n the network correctly

This fix updates `java/net/DatagramSocket/SendReceiveMaxSize.java` and `java/net/DatagramSocket/SendReceiveMaxSize.java` to check (on all platforms) that the sending/receiving of large datagrams across a network are sent, fragmented, and re-assembled correctly

Reviewed-by: alanb, dfuchs
Removed HandleMark from BiasedLocking::preserve_marks() method

Reviewed-by: hseigel, coleenp, dcubed, tschatzl, dholmes
evwhelan and others added 16 commits Aug 18, 2020
…ckReadResolveMethodTest.java uses @ignore w/o bug-id

Reviewed-by: jjg
…tpClient fails due to unavailability of underlying resources required by SSLContext

This fix updates jdk.internal.net.http.HttpClientImpl to throw an UncheckedIOException instead of InternalError.

Reviewed-by: chegar, dfuchs
Copy unit-test page from wiki, merge jtreg names page into hotspot-style.md

Reviewed-by: kvn, iignatyev
Replaced usages of LinkedList with ArrayList in http.websocket.BuilderImpl

Reviewed-by: chegar, dfuchs
…for nsk/stress/stack. Specify at least 448k

Increase the -Xss stack size for some tests, mark other tests as not runnable on AArch64.

Reviewed-by: gziemski, lfoltan
Added tag jdk-16+12 for changeset fc8e62b399bd

# Conflicts:
#	src/hotspot/share/memory/dynamicArchive.cpp
#	src/hotspot/share/memory/heapInspection.cpp
#	src/hotspot/share/memory/metaspaceClosure.hpp
#	src/hotspot/share/memory/metaspaceShared.cpp
#	src/hotspot/share/oops/markWord.hpp
#	src/hotspot/share/opto/memnode.cpp
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 3, 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 openjdk bot commented Sep 3, 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+12'
  • 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 e02fecec24c03ffa588cb5fbc8528e2aabf2f47c.

➡️ 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 MrSimms commented Sep 3, 2020

/summary Merge tag 'jdk-16+12'

@openjdk
Copy link

@openjdk openjdk bot commented Sep 3, 2020

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

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Sep 3, 2020

/integrate

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

@openjdk openjdk bot commented Sep 3, 2020

@MrSimms
Pushed as commit 321ea1d.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 3, 2020

Webrevs

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