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

Closed
wants to merge 147 commits into from
Closed

Merge jdk #286

wants to merge 147 commits into from

Conversation

MrSimms
Copy link
Member

@MrSimms MrSimms commented Dec 2, 2020

Merge tag 'jdk-16+26'

  • output.cpp: Ignore new assert for now

Progress

  • Change must not contain extraneous whitespace

Download

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

Dong Bo and others added 30 commits Nov 18, 2020
…4 used without SuperwordUseVSX

Reviewed-by: goetz, psandoz
Reviewed-by: neliasso, kvn
…e must be a long

Reviewed-by: roland, chagedorn, kvn
…en class unloading is off

Reviewed-by: rkennke
Reviewed-by: eosterlund, dholmes
Reviewed-by: stuefe, dholmes
…l/stream/SpliteratorTest.java for Xcomp testing

Reviewed-by: mcimadamore
… as expected

Reviewed-by: mcimadamore, chegar
…not work on AIX

Reviewed-by: jiefu, mbaesken
Reviewed-by: dholmes, coleenp
Reviewed-by: minqi, ccheung
Reviewed-by: vlivanov, redestad
Reviewed-by: rkennke, ihse
Co-authored-by: Chris Hegarty <chegar@openjdk.org>
Reviewed-by: chegar, dfuchs, michaelm
Reviewed-by: dholmes, coleenp, dcubed, mdoerr
kstefanj and others added 16 commits Nov 24, 2020
…ealed class or interface

Reviewed-by: alanb
…otification

8240696: (ref) Reference.clear may extend the lifetime of the referent

Use private native helper to implement Reference.clear.

Reviewed-by: pliden, rkennke, mchung
…l inlining using AVX-512 masked instructions

Reviewed-by: neliasso, kvn
… setDaemon and isDaemon

Reviewed-by: serb, rriggs, iris, mchung, smarks
…ge size to os::trace_page_sizes instead of actual page size

Reviewed-by: sjohanss, tschatzl
…llation errors

Reviewed-by: rwestberg, sgehwolf
…the presence of virus scanners

Reviewed-by: dholmes, clanger
Added tag jdk-16+26 for changeset 7aed9b6

# Conflicts:
#	.github/workflows/submit.yml
#	src/hotspot/share/c1/c1_IR.hpp
#	src/hotspot/share/ci/ciSignature.cpp
#	src/hotspot/share/ci/ciSignature.hpp
#	src/hotspot/share/ci/ciType.cpp
#	src/hotspot/share/code/compiledMethod.cpp
#	src/hotspot/share/code/pcDesc.hpp
#	src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
#	src/hotspot/share/opto/callGenerator.cpp
#	src/hotspot/share/opto/graphKit.hpp
#	src/hotspot/share/opto/macro.hpp
#	src/hotspot/share/opto/output.cpp
#	src/hotspot/share/runtime/sharedRuntime.hpp
#	src/hotspot/share/runtime/vmOperations.hpp
#	src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java
#	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 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. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

@openjdk openjdk bot commented Dec 2, 2020

@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

Merge tag 'jdk-16+26'

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 5 new commits pushed to the lworld branch:

  • 1abd037: [lworld] Missed disabling testcase that does not pack well with -XX:ForceNonTearable
  • 7a8c405: 8257446: [lworld] VM flag PrintInlineLayout doesn't work anymore
  • 41ee0c8: 8257166: [lworld] CCP fails to optimize FlatArrayCheckNode
  • c2b5f11: 8251966: [lworld] TestArrays.java fails with -XX:+ExpandSubTypeCheckAtParseTime
  • 89dde2a: 8257154: [lworld] AndLNode::Identity optimization does not handle top input

Please see this link for an up-to-date comparison between the source branch of this pull request and the lworld branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this 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.

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Dec 2, 2020

/summary Merge tag 'jdk-16+26'

@openjdk
Copy link

@openjdk openjdk bot commented Dec 2, 2020

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

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Dec 2, 2020

/integrate

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

@openjdk openjdk bot commented Dec 2, 2020

@MrSimms Since your change was applied there have been 5 commits pushed to the lworld branch:

  • 1abd037: [lworld] Missed disabling testcase that does not pack well with -XX:ForceNonTearable
  • 7a8c405: 8257446: [lworld] VM flag PrintInlineLayout doesn't work anymore
  • 41ee0c8: 8257166: [lworld] CCP fails to optimize FlatArrayCheckNode
  • c2b5f11: 8251966: [lworld] TestArrays.java fails with -XX:+ExpandSubTypeCheckAtParseTime
  • 89dde2a: 8257154: [lworld] AndLNode::Identity optimization does not handle top input

Your commit was automatically rebased without conflicts.

Pushed as commit 8efeb68.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 2, 2020

Webrevs

@MrSimms MrSimms deleted the lworld_merge_jdk_16_26 branch Feb 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment