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

8274658: ISO 4217 Amendment 170 Update #9

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Dec 20, 2021

I backport this for parity with 17.0.3-oracle

I had to resolve the BugIDs in the test because
https://bugs.openjdk.java.net/browse/JDK-8264792
is not backported.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17u-dev pull/9/head:pull/9
$ git checkout pull/9

Update a local copy of the PR:
$ git checkout pull/9
$ git pull https://git.openjdk.java.net/jdk17u-dev pull/9/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9

View PR using the GUI difftool:
$ git pr show -t 9

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17u-dev/pull/9.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 20, 2021

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title Backport f2404d60de2b58c590bf885f5cce50c289073673 8274658: ISO 4217 Amendment 170 Update Dec 20, 2021
@openjdk
Copy link

openjdk bot commented Dec 20, 2021

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Dec 20, 2021
@mlbridge
Copy link

mlbridge bot commented Dec 20, 2021

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Dec 23, 2021

/clean
I consider this a cosmetic resolve according to https://wiki.openjdk.java.net/display/JDKUpdates/JDK+17u

@openjdk openjdk bot added the clean label Dec 23, 2021
@openjdk
Copy link

openjdk bot commented Dec 23, 2021

@GoeLin This backport pull request is now marked as clean

@openjdk
Copy link

openjdk bot commented Dec 23, 2021

@GoeLin 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:

8274658: ISO 4217 Amendment 170 Update

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 12 new commits pushed to the master branch:

  • 9d0bfe1: 8265150: AsyncGetCallTrace crashes on ResourceMark
  • 93234a4: 8276177: nsk/jvmti/RedefineClasses/StressRedefineWithoutBytecodeCorruption failed with "assert(def_ik->is_being_redefined()) failed: should be being redefined to get here"
  • c9ebb93: 8275650: Problemlist java/io/File/createTempFile/SpecialTempFile.java for Windows 11
  • 2cac565: 8273704: DrawStringWithInfiniteXform.java failed : drawString with InfiniteXform transform takes long time
  • 83f1749: 8273162: AbstractSplittableWithBrineGenerator does not create a random salt
  • 515d412: 8273351: bad tag in jdk.random module-info.java
  • 311bb85: 8247980: Exclusive execution of java/util/stream tests slows down tier1
  • 79d97c4: 8272327: Shenandoah: Avoid enqueuing duplicate string candidates
  • 13d3046: 8278115: gc/stress/gclocker/TestGCLockerWithSerial.java has duplicate -Xmx
  • 6634879: 8278116: runtime/modules/LoadUnloadModuleStress.java has duplicate -Xmx
  • ... and 2 more: https://git.openjdk.java.net/jdk17u-dev/compare/5ea8f4835da08623c5c03983aab10382db2b95a5...master

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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 23, 2021
@GoeLin
Copy link
Member Author

GoeLin commented Dec 28, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Dec 28, 2021

Going to push as commit 4a38659.
Since your change was applied there have been 15 commits pushed to the master branch:

  • 5287dae: 8274795: AArch64: avoid spilling and restoring r18 in macro assembler
  • d8a22d6: 8277777: [Vector API] assert(r->is_XMMRegister()) failed: must be in x86_32.ad
  • 81cd594: 8276314: [JVMCI] check alignment of call displacement during code installation
  • 9d0bfe1: 8265150: AsyncGetCallTrace crashes on ResourceMark
  • 93234a4: 8276177: nsk/jvmti/RedefineClasses/StressRedefineWithoutBytecodeCorruption failed with "assert(def_ik->is_being_redefined()) failed: should be being redefined to get here"
  • c9ebb93: 8275650: Problemlist java/io/File/createTempFile/SpecialTempFile.java for Windows 11
  • 2cac565: 8273704: DrawStringWithInfiniteXform.java failed : drawString with InfiniteXform transform takes long time
  • 83f1749: 8273162: AbstractSplittableWithBrineGenerator does not create a random salt
  • 515d412: 8273351: bad tag in jdk.random module-info.java
  • 311bb85: 8247980: Exclusive execution of java/util/stream tests slows down tier1
  • ... and 5 more: https://git.openjdk.java.net/jdk17u-dev/compare/5ea8f4835da08623c5c03983aab10382db2b95a5...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 28, 2021
@openjdk openjdk bot closed this Dec 28, 2021
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 28, 2021
@openjdk
Copy link

openjdk bot commented Dec 28, 2021

@GoeLin Pushed as commit 4a38659.

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

@GoeLin GoeLin deleted the goetz_backport_8274658 branch December 28, 2021 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant