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

Closed
wants to merge 67 commits into from
Closed

Merge jdk #183

wants to merge 67 commits into from

Conversation

@MrSimms
Copy link
Member

@MrSimms MrSimms commented Sep 10, 2020

Merge tag 'jdk-16+15'


Progress

  • Change must not contain extraneous whitespace

Download

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

stefank and others added 30 commits Sep 2, 2020
Reviewed-by: eosterlund, pliden
…equires instead of @ignore

Use @requires os.maxMemory in order to run the test only if memory requirements are satisfied as opposed to ignoring it

Reviewed-by: coffeys
…trickyRecursion() must throw an error anyway!"

Run test separately with both -Xint and -Xcomp to ensure thread stacks are similarly sized.

Reviewed-by: dholmes, coleenp
Co-authored-by: Joshua Zhu <joshua.zhu@arm.com>
Co-authored-by: Yang Zhang <yang.zhang@arm.com>
Reviewed-by: adinn, pli, ihse, vlivanov, eosterlund
…ption when supplied non strings

Reviewed-by: lancea, naoto
Reviewed-by: aph, vlivanov, adinn
…ler/optimizations tests

Reviewed-by: thartmann
Reviewed-by: erikj, jvernee, ehelin
Updated CheckGraalIntrinsics.java test

Reviewed-by: dcubed
…er/HugeCapacity.java tests shouldn't be @Ignore-d

Remove @ignore since @requires os.maxMemory is enough to ensure tests will not be executed if memory requirements are not satisfied

Reviewed-by: coffeys
Cleanup code for jlink classes generation, move parsing file work to java.lang.invoke and add a new API in interface JavaLangInvokeAccess to generate holder classes, remove old APIs. The new API is used both by JLI and CDS.

Reviewed-by: mchung, sundar
Reviewed-by: dcubed, dholmes, pchilanomate, rehn, sspitsyn
iklam and others added 15 commits Sep 8, 2020
Reviewed-by: ccheung, coleenp
…on within a gc

Reviewed-by: tschatzl, sjohanss
…s/dynamicArchive/methodHandles

Reviewed-by: iklam
…ue to OOM conditions

Reviewed-by: cjplummer, lmesnik
The comment is wrong. The 'us' in 'cpu.cfs_quota_us' stands for
microseconds, which is read verbatim. Similarly for cgroups v2
all units in 'cpu.max' are in microseconds.

Reviewed-by: shade, hseigel
…ptions potentially producing false positive test results

Reviewed-by: jlahoda
Added tag jdk-16+15 for changeset 4333942

# Conflicts:
#	.jcheck/conf
#	src/hotspot/share/opto/matcher.cpp
#	src/hotspot/share/opto/type.cpp
#	src/hotspot/share/prims/methodHandles.cpp
#	src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 10, 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 Sep 10, 2020

@MrSimms This change now passes all automated pre-integration checks. In addition to the automated checks, the change must also fulfill all project specific requirements

After integration, the commit message will be:

Merge jdk

Merge tag 'jdk-16+15'
  • 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 803d0d34cc2ac0d793da38225174f54f1e1fbe98.

➡️ To integrate this PR with the above commit message to the lworld branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Sep 10, 2020
@MrSimms MrSimms marked this pull request as ready for review Sep 10, 2020
@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Sep 10, 2020

/summary Merge tag 'jdk-16+15'

@openjdk openjdk bot added the rfr label Sep 10, 2020
@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Sep 10, 2020

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Sep 10, 2020

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

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

@openjdk openjdk bot commented Sep 10, 2020

@MrSimms Pushed as commit 819efc1.

💡 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_15 branch Sep 10, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 10, 2020

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment