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

Closed
wants to merge 77 commits into from
Closed

Merge jdk #173

wants to merge 77 commits into from

Conversation

MrSimms
Copy link
Member

@MrSimms MrSimms commented Sep 2, 2020

Merge tag 'jdk-16+9' into lworld_merge_jdk_16_9
Added tag jdk-16+9 for changeset c075a286cc7d

Conflicts:

src/hotspot/share/opto/type.cpp

src/hotspot/share/prims/jvmtiImpl.cpp

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java


Progress

  • Change must not contain extraneous whitespace

Download

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

Jerry Zhou and others added 30 commits Jul 17, 2020
Reviewed-by: kvn, chagedorn
…va to handle TimeZones

This fix updates the test LoggerDateFormatterTest.java to be able to handle different TimeZones

Reviewed-by: alanb, dfuchs, xuelei
…ule case

Ensuring rule cases are copied correctly by TreeCopier.

Reviewed-by: vromero
…ontainer metrics

Reviewed-by: aph, dholmes, bobv
Fix stale site and uncommon trap processing in LogParser

Reviewed-by: vlivanov, kvn
Reviewed-by: kvn, epavlova
Reviewed-by: kbarrett, tschatzl, dholmes
…fails with Method "javasoft.sqe.tests.api.java.security.SignatureSpi.JCKSignatureSpi.clear" doesn't exist

Reviewed-by: kvn
Reviewed-by: kvn, chagedorn
Push changes from JDK-8248817 that were accidentally excluded from the commit.

Reviewed-by: kbarrett, dholmes
After 8231111 we have -1 for missing metrics, thus the fix of 8236617 is obsolete

Reviewed-by: mbaesken
…eady have a current thread variable

Add current thread OR remove unneeded HandleMark

Reviewed-by: kvn, dholmes
Mandy Chung and others added 16 commits Aug 4, 2020
…a given proxy interface is hidden

Reviewed-by: alanb
…un twice

Add the StandardCopyOption.REPLACE_EXISTING option when calling Files.copy().

Reviewed-by: iklam
Add missing EnableJVMCI flag check. Refactoring compiler print statistic code.

Reviewed-by: thartmann
…rely on java ELF file support

Reviewed-by: sspitsyn, ysuenaga
… hostnames starting from digits

Reviewed-by: dholmes, cjplummer, sspitsyn
Use -Xss200k to limit the stack size, avoid running with -Xcomp, and, in one test, reduce iterations.

Reviewed-by: dholmes, lfoltan
Reviewed-by: mgronlun, dholmes, kbarrett
Added tag jdk-16+9 for changeset c075a286cc7d

# Conflicts:
#	src/hotspot/share/opto/type.cpp
#	src/hotspot/share/prims/jvmtiImpl.cpp
#	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
@bridgekeeper
Copy link

bridgekeeper bot commented Sep 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.

@openjdk
Copy link

openjdk bot commented Sep 2, 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+9'
  • 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.

Since the source branch of this PR was last updated there have been 3 commits pushed to the lworld branch:

  • 0d8d8e3: 8252650: [lworld] Merge of jdk-16+8 breaks debug build GC gc/TestObjectAlignment.java
  • aada81b: 8252651: [lworld] Clear the instance klass mirror for inline type
  • 86c76d3: 8252633: [lworld] Multiple compiler test failures after merging jdk-16+7

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge lworld into your branch, and then specify the current head hash when integrating, like this: /integrate 0d8d8e3cc0818880f06997526f6c0b50c617315d.

➡️ 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 commented Sep 2, 2020

/summary Merge tag 'jdk-16+9'

@openjdk
Copy link

openjdk bot commented Sep 2, 2020

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

@mlbridge
Copy link

mlbridge bot commented Sep 2, 2020

Webrevs

@MrSimms
Copy link
Member Author

MrSimms commented Sep 2, 2020

/integrate

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

openjdk bot commented Sep 2, 2020

@MrSimms The following commits have been pushed to lworld since your change was applied:

  • 0d8d8e3: 8252650: [lworld] Merge of jdk-16+8 breaks debug build GC gc/TestObjectAlignment.java
  • aada81b: 8252651: [lworld] Clear the instance klass mirror for inline type
  • 86c76d3: 8252633: [lworld] Multiple compiler test failures after merging jdk-16+7

Your commit was automatically rebased without conflicts.

Pushed as commit 31cc75a.

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