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

Closed
wants to merge 101 commits into from
Closed

Merge jdk #144

wants to merge 101 commits into from

Conversation

@MrSimms
Copy link
Member

@MrSimms MrSimms commented Aug 11, 2020

Merge tag 'jdk-16+4' into lworld_merge_jdk_16_4
Added tag jdk-16+4 for changeset e2622818f0bd

Conflicts:

make/test/BuildMicrobenchmark.gmk

src/hotspot/share/opto/memnode.cpp

src/hotspot/share/opto/type.cpp

src/hotspot/share/runtime/javaCalls.cpp


Progress

  • Change must not contain extraneous whitespace

Download

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

jonathan-gibbons and others added 30 commits Jun 23, 2020
…ie nmethod

Reviewed-by: eosterlund, kvn, never
…orySegmentImpl::mismatch

Reviewed-by: psandoz, mcimadamore
8248135: Build microbenchmarks with --enable-preview

Test contributed by Chris Hegarty <chris.hegarty@oracle.com>

Reviewed-by: chegar, psandoz, redestad, ihse
…_class_in_use_this_epoch_bits()))) != 0 in ObjectSampleCheckpoint::add_to_leakp_set

Reviewed-by: dholmes, iklam, ccheung
All symbols at dump are created as permanent. Store them in a global array to avoid working SymbolTable.

Reviewed-by: iklam, ccheung
…lization

Co-authored-by: Peter Levart <peter.levart@gmail.com>
Reviewed-by: redestad, plevart
…TEXT_BLOCKS\"

Use a synthetic annotation instead of inaccessible jdk.internal.PreviewFeature in ct.sym, and avoid resolving that annotation, to prevent errors being printed for the inaccessible types.

Reviewed-by: jlaskey
… destination == entry) failed: b) MT-unsafe modification of inline cache

Fix too strong assertion by additionally considering races due to class unloading and redefinition.

Reviewed-by: eosterlund, kvn, coleenp, sspitsyn
This empty interface was left over from deleting code from before safepoint polling.

Reviewed-by: lfoltan, dholmes
…as wrong header

Wrong copyright header removed

Reviewed-by: weijun
rwestrel and others added 16 commits Jun 18, 2020
…ort::pin_and_expand

Reviewed-by: rkennke, thartmann
…al Studio in Hotspot

Reviewed-by: kbarrett, erikj
…eads after JDK-8242008

Reviewed-by: egahlin
…2 (multi-homed systems)

Fixed the test - an IPv4 group cannot be joined from an interface that has no IPv4 address configured

Reviewed-by: alanb, amlu
…Monitors support

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

Reviewed-by: kvn, neliasso
Added tag jdk-16+4 for changeset e2622818f0bd

# Conflicts:
#	make/test/BuildMicrobenchmark.gmk
#	src/hotspot/share/opto/memnode.cpp
#	src/hotspot/share/opto/type.cpp
#	src/hotspot/share/runtime/javaCalls.cpp
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 11, 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 Aug 11, 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+4'
  • 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 93cde00746cfbb9f96ffea8618aa1ce3d3f49e54.

➡️ 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 Aug 11, 2020

/summary Merge tag 'jdk-16+4'

@openjdk
Copy link

@openjdk openjdk bot commented Aug 11, 2020

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

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Aug 11, 2020

/integrate

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

@openjdk openjdk bot commented Aug 11, 2020

@MrSimms
Pushed as commit f0a8efc.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 11, 2020

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