Navigation Menu

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

8266082: AssertionError in Annotate.fromAnnotations with -Xdoclint #675

Closed
wants to merge 1 commit into from

Conversation

apavlyutkin
Copy link
Contributor

@apavlyutkin apavlyutkin commented Sep 15, 2022

Hi! Here is backport of JDK-8266082 that fixes javac crash on unallowed annotation usage when running with -Xdoclint option. Original patch applied cleanly

Verification (amd64/20.04LTS): tools/doclint/CrashInAnnotateTest.java (new test)
Regression(amd64/20.04LTS): test/langtools


Progress

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

Issue

  • JDK-8266082: AssertionError in Annotate.fromAnnotations with -Xdoclint

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev pull/675/head:pull/675
$ git checkout pull/675

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 675

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/675.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 15, 2022

👋 Welcome back apavlyutkin! 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 0b8a0e2b58dbdd5c9553e502212d32c033a5efb5 8266082: AssertionError in Annotate.fromAnnotations with -Xdoclint Sep 15, 2022
@openjdk
Copy link

openjdk bot commented Sep 15, 2022

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

@openjdk
Copy link

openjdk bot commented Sep 15, 2022

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

8266082: AssertionError in Annotate.fromAnnotations with -Xdoclint

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

  • 0241495: 8274160: java/awt/Window/ShapedAndTranslucentWindows/Common.java delay is too high
  • c5a9e68: 8274032: Remove jtreg tag manual=yesno for java/awt/print/PrinterJob/ImagePrinting/ImageTypes.java & show test UI
  • baf3b5c: 8270609: [TESTBUG] java/awt/print/Dialog/DialogCopies.java does not show instruction
  • 28df1d9: 8273043: [TEST_BUG] Automate NimbusJTreeSelTextColor.java
  • fec638f: 7188098: TEST_BUG: closed/javax/sound/midi/Synthesizer/Receiver/bug6186488.java fails
  • ed29cbb: 8271015: Split cds/SharedBaseAddress.java test into smaller parts
  • eb1c5cb: 8269029: compiler/codegen/TestCharVect2.java fails for client VMs
  • 2434530: 8277576: ProblemList runtime/ErrorHandling/CreateCoredumpOnCrash.java on macosx-X64
  • 160dac0: 8290209: jcup.md missing additional text
  • fe980c2: 8290207: Missing notice in dom.md
  • ... and 4 more: https://git.openjdk.org/jdk17u-dev/compare/a18e936beef85ad2602f70cef4c2bef216099f56...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 15, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 15, 2022

Webrevs

@GoeLin
Copy link
Member

GoeLin commented Sep 16, 2022

Hi Alex,
please add to your fix request comment

  • Why you want to backport this
  • Your evaluation of the risk of introducing a regression in 17
  • Did you run the enclosed test?

@apavlyutkin
Copy link
Contributor Author

Hi Alex, please add to your fix request comment

  • Why you want to backport this
  • Your evaluation of the risk of introducing a regression in 17
  • Did you run the enclosed test?

Done

@GoeLin
Copy link
Member

GoeLin commented Sep 19, 2022

Thanks for the process stuff.

@apavlyutkin
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Sep 19, 2022
@openjdk
Copy link

openjdk bot commented Sep 19, 2022

@apavlyutkin
Your change (at version 1d192eb) is now ready to be sponsored by a Committer.

@yan-too
Copy link

yan-too commented Sep 19, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Sep 19, 2022

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

  • 0241495: 8274160: java/awt/Window/ShapedAndTranslucentWindows/Common.java delay is too high
  • c5a9e68: 8274032: Remove jtreg tag manual=yesno for java/awt/print/PrinterJob/ImagePrinting/ImageTypes.java & show test UI
  • baf3b5c: 8270609: [TESTBUG] java/awt/print/Dialog/DialogCopies.java does not show instruction
  • 28df1d9: 8273043: [TEST_BUG] Automate NimbusJTreeSelTextColor.java
  • fec638f: 7188098: TEST_BUG: closed/javax/sound/midi/Synthesizer/Receiver/bug6186488.java fails
  • ed29cbb: 8271015: Split cds/SharedBaseAddress.java test into smaller parts
  • eb1c5cb: 8269029: compiler/codegen/TestCharVect2.java fails for client VMs
  • 2434530: 8277576: ProblemList runtime/ErrorHandling/CreateCoredumpOnCrash.java on macosx-X64
  • 160dac0: 8290209: jcup.md missing additional text
  • fe980c2: 8290207: Missing notice in dom.md
  • ... and 4 more: https://git.openjdk.org/jdk17u-dev/compare/a18e936beef85ad2602f70cef4c2bef216099f56...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 19, 2022
@openjdk openjdk bot closed this Sep 19, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Sep 19, 2022
@openjdk
Copy link

openjdk bot commented Sep 19, 2022

@yan-too @apavlyutkin Pushed as commit ba6898b.

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

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
3 participants