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

Closed
wants to merge 79 commits into from
Closed

Merge jdk #339

wants to merge 79 commits into from

Conversation

MrSimms
Copy link
Member

@MrSimms MrSimms commented Feb 18, 2021

Merge tag 'jdk-17+10'

Conflicts:

src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp

src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp

src/hotspot/share/memory/archiveBuilder.cpp

src/hotspot/share/oops/instanceKlass.hpp

src/hotspot/share/oops/typeArrayKlass.hpp

src/hotspot/share/runtime/sharedRuntime.cpp

test/hotspot/jtreg/ProblemList.txt


Progress

  • Change must not contain extraneous whitespace

Download

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

tstuefe and others added 30 commits Feb 10, 2021
Reviewed-by: asemenyuk, almatvee, herrick
Reviewed-by: jdv, serb
Reviewed-by: dholmes, stuefe, alanb
Reviewed-by: dfuchs, alanb, chegar
…atch on number of elements

Reviewed-by: kvn, thartmann
…ate in SuperWord::co_locate_pack

Reviewed-by: roland, kvn, thartmann
…ge_sizes

Reviewed-by: kvn, stuefe, thartmann
…xtension comments

Reviewed-by: wetmore, xuelei
…prop[boo] = >foo<' missing from stdout/stderr"

Reviewed-by: sspitsyn, cjplummer
…gencyDump.cpp write_repository_files

Reviewed-by: stuefe, mgronlun
…cause unnecessary full gc

8260045: Parallel GC: Waiting on ExpandHeap_lock may cause "expansion storm"

Loop to retry allocation if expand succeeds.  Treat space available after obtaining expand lock as expand success.

Reviewed-by: tschatzl, iwalulya, sjohanss
Pankaj Bansal and others added 16 commits Feb 15, 2021
…nelImpl_receive0

Reviewed-by: clanger, dfuchs, bpb
…Preconditions.java outOfBoundsMessage

Reviewed-by: clanger
Reviewed-by: tschatzl, kbarrett
Add filters to color and hide parts of the graph based on node categories or
estimated execution frequency, and simplify remaining filters.

Co-authored-by: Christian Hagedorn <chagedorn@openjdk.org>
Reviewed-by: vlivanov, chagedorn, thartmann
…gSur patch versions after JDK-8253702

Reviewed-by: rriggs
Added tag jdk-17+10 for changeset e7e20d4

# Conflicts:
#	src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp
#	src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
#	src/hotspot/share/memory/archiveBuilder.cpp
#	src/hotspot/share/oops/instanceKlass.hpp
#	src/hotspot/share/oops/typeArrayKlass.hpp
#	src/hotspot/share/runtime/sharedRuntime.cpp
#	test/hotspot/jtreg/ProblemList.txt
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Feb 18, 2021

👋 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 Feb 18, 2021

@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-17+10'

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 Feb 18, 2021

Webrevs

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Feb 18, 2021

/summary Merge tag 'jdk-17+10'

@openjdk
Copy link

@openjdk openjdk bot commented Feb 18, 2021

@MrSimms Setting summary to Merge tag 'jdk-17+10'

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Feb 18, 2021

/integrate

@openjdk openjdk bot closed this Feb 18, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Feb 18, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Feb 18, 2021

@MrSimms Pushed as commit e31335f.

💡 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_17_10 branch Feb 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment