Skip to content

8322883: [BACKOUT] 8225377: type annotations are not visible to javac plugins across compilation boundaries#2102

Closed
GoeLin wants to merge 3 commits intoopenjdk:masterfrom
GoeLin:goetz_backport_8322883
Closed

8322883: [BACKOUT] 8225377: type annotations are not visible to javac plugins across compilation boundaries#2102
GoeLin wants to merge 3 commits intoopenjdk:masterfrom
GoeLin:goetz_backport_8322883

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 4, 2024

This is a backout needed as the change is too intrusive for a backport.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • JDK-8322883 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8322883: [BACKOUT] 8225377: type annotations are not visible to javac plugins across compilation boundaries (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2102

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 4, 2024

👋 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 18e97aa217087ff7af13a0147eaf091df3cb20eb 8322883: [BACKOUT] 8225377: type annotations are not visible to javac plugins across compilation boundaries Jan 4, 2024
@openjdk
Copy link

openjdk bot commented Jan 4, 2024

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Jan 4, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 4, 2024

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Jan 5, 2024

GHA failure: test job never ran. Restarting tests by merging head.

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So this backs out these two?

For extra safety, I would have tried to just git revert both from jdk17u-dev. This would prove mechanically that the revert is clean. Not sure if that is how you did it.

@GoeLin
Copy link
Member Author

GoeLin commented Jan 6, 2024

Yes, it backs out the two changes. I patched the 21u change. I first tried git revert, but later I figured I used the older change, which did not succeed.
The second change fixes within the newly added code.

@openjdk openjdk bot added approval Requires approval; will be removed when approval is received and removed approval Requires approval; will be removed when approval is received labels Jan 6, 2024
Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK then!

Minor: I think the @bug line here is not restored to original:
3a2bf8e?diff=unified&w=0#diff-4dd7943869aeaa2236b89ff67fdedbf28bc58667354307dc7cb717c5f667c496L26-R26

@openjdk
Copy link

openjdk bot commented Jan 8, 2024

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@GoeLin
Copy link
Member Author

GoeLin commented Jan 8, 2024

Thanks for the review, I fixed the @bug.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Jan 8, 2024
@openjdk
Copy link

openjdk bot commented Jan 8, 2024

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

8322883: [BACKOUT] 8225377: type annotations are not visible to javac plugins across compilation boundaries

Reviewed-by: shade

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

  • 1f95796: 8321599: Data loss in AVX3 Base64 decoding
  • 2470cac: 8316693: Simplify at-requires checkDockerSupport()
  • f59ca35: 8303605: Memory leaks in Metaspace gtests
  • f001819: 8322985: [BACKOUT] 8318562: Computational test more than 2x slower when AVX instructions are used
  • dff69b7: 8278028: [test-library] Warnings cleanup of the test library
  • b89db38: 8315731: Open source several Swing Text related tests
  • 0e2ca18: 8320921: GHA: Parallelize hotspot_compiler test jobs
  • 6340b66: 8293547: Add relaxed add_and_fetch for macos aarch64 atomics

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Jan 8, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Jan 10, 2024

/backport 8320001

@openjdk
Copy link

openjdk bot commented Jan 10, 2024

@GoeLin The target repository 8320001 is not a valid target for backports.
List of valid target repositories: openjdk/jdk, openjdk/jdk11u, openjdk/jdk11u-dev, openjdk/jdk17u, openjdk/jdk17u-dev, openjdk/jdk21u, openjdk/jdk21u-dev, openjdk/jdk22, openjdk/jdk22u, openjdk/jdk7u, openjdk/jdk8u, openjdk/jdk8u-dev, openjdk/jfx, openjdk/jfx21u, openjdk/lilliput-jdk17u, openjdk/lilliput-jdk21u, openjdk/shenandoah-jdk21u, openjdk/shenandoah-jdk8u.
Supplying the organization/group prefix is optional.

@GoeLin
Copy link
Member Author

GoeLin commented Jan 10, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Jan 10, 2024

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 10, 2024

@GoeLin Pushed as commit ea6fc21.

💡 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_8322883 branch January 10, 2024 09:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants

Comments