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

Closed
wants to merge 84 commits into from
Closed

Merge jdk #272

wants to merge 84 commits into from

Conversation

@MrSimms
Copy link
Member

@MrSimms MrSimms commented Nov 20, 2020

Merge tag 'jdk-16+25'


Progress

  • Change must not contain extraneous whitespace

Testing

Linux x64 Windows x64 macOS x64
Build (1/5 failed) (2/2 running) ✔️ (2/2 passed)
Build / test (1/1 running)
Test (tier1) (9/9 running)

Failed test task

Download

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

shipilev and others added 30 commits Nov 11, 2020
8248188: Add IntrinsicCandidate and API for Base64 decoding, add Power64LE intrinsic implementation.

This patch set encompasses the following commits:

Adds a new intrinsic candidate to the java.lang.Base64 class - decodeBlock(), and provides a flexible API for the intrinsic. The API is similar to the existing encodeBlock intrinsic.

Adds the code in HotSpot to check and martial the new intrinsic's arguments to the arch-specific intrinsic implementation.

Adds a Power64LE-specific implementation of the decodeBlock intrinsic.

Adds a JMH microbenchmark for both Base64 encoding and encoding.

Enhances the JTReg hotspot intrinsic "TestBase64.java" regression test to more fully test both decoding and encoding.

Reviewed-by: rriggs, mdoerr, kvn
…ces functionality

Reviewed-by: ayang, iignatyev, iklam
…of trip-counted integer loops

Reviewed-by: chagedorn, thartmann
Reviewed-by: thartmann, chagedorn
Reviewed-by: thartmann, chagedorn
…n Shenandoah root verifier

Reviewed-by: rkennke, shade
… that are in a named module

Reviewed-by: alanb, chegar
Reviewed-by: ccheung, stuefe, iklam
…olled loop

Reviewed-by: chagedorn, thartmann
Reviewed-by: redestad, coleenp
magicus and others added 16 commits Nov 17, 2020
Reviewed-by: ayang, stefank
Reviewed-by: kvn, dcubed, vlivanov, erikj
…turned on

Co-authored-by: Huang Wang <wanghuang3@huawei.com>
Reviewed-by: vlivanov
…rchive regions

Change the handling of Open Archive areas, instead of assuming that everything in there is live always, a root containing references to all live root objects is provided. Adapt G1 to handle Open Archive regions as any other old region apart from never compacting or evacuating them.

Co-authored-by: Ioi Lam <iklam@openjdk.org>
Reviewed-by: kbarrett, sjohanss, redestad
… Path returns '.'

Reviewed-by: dfuchs, alanb
…e with Shenandoah

Reviewed-by: thartmann, rkennke
Added tag jdk-16+25 for changeset 655bb61

# Conflicts:
#	.github/workflows/submit.yml
#	src/hotspot/cpu/x86/jniFastGetField_x86_64.cpp
#	src/hotspot/cpu/x86/templateTable_x86.cpp
#	src/hotspot/share/code/nmethod.cpp
#	src/hotspot/share/oops/method.hpp
#	src/hotspot/share/opto/callnode.cpp
#	src/hotspot/share/opto/matcher.cpp
#	src/hotspot/share/opto/matcher.hpp
#	src/hotspot/share/runtime/arguments.cpp
#	src/hotspot/share/runtime/sharedRuntime.cpp
#	src/hotspot/share/runtime/sharedRuntime.hpp
#	src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
#	src/java.base/share/classes/java/util/Objects.java
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 20, 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 Nov 20, 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+25'

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 no new commits pushed to the lworld branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 20, 2020

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Nov 20, 2020

/summary Merge tag 'jdk-16+25'

@openjdk
Copy link

@openjdk openjdk bot commented Nov 20, 2020

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

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Nov 20, 2020

/integrate

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

@openjdk openjdk bot commented Nov 20, 2020

@MrSimms Pushed as commit 0e48aeb.

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

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