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

8261205: AssertionError: Cannot add metadata to an intersection type #794

Conversation

cushon
Copy link
Contributor

@cushon cushon commented Jan 25, 2022

This is a backport of JDK-8888888: AssertionError: Cannot add metadata to an intersection type

Original patch does not apply cleanly to 11u

  • I resolved a conflict where the loop in JavacParser that sets declaredUsingVar = true; was modified by JDK-8210742
  • I adjusted the changes to imports, the original patch removed an import of com.sun.tools.javac.code.Attribute.Array from TypeAnnotations.java that was still being used in 11
  • I removed the use of multi-line string literals in the test

Testing: x86_64 build, affected tests, tier1


Progress

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

Issue

  • JDK-8261205: AssertionError: Cannot add metadata to an intersection type

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 794

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 25, 2022

👋 Welcome back cushon! 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 81f39ed3e0176b75dee1c8db24041545bcc68a86 8261205: AssertionError: Cannot add metadata to an intersection type Jan 25, 2022
@openjdk
Copy link

openjdk bot commented Jan 25, 2022

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 Jan 25, 2022
@mlbridge
Copy link

mlbridge bot commented Jan 25, 2022

Webrevs

@cushon cushon force-pushed the cushon-backport-81f39ed3e0176b75dee1c8db24041545bcc68a86 branch from d1be876 to f70fe83 Compare Jan 29, 2022
Copy link
Member

@phohensee phohensee left a comment

Lgtm.

@openjdk
Copy link

openjdk bot commented Feb 1, 2022

@cushon This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8261205: AssertionError: Cannot add metadata to an intersection type

Reviewed-by: phh

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:

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. Possible candidates are the reviewers of this PR (@phohensee) but any other Committer may sponsor as well.

➡️ 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 the ready Pull request is ready to be integrated label Feb 1, 2022
@cushon
Copy link
Contributor Author

cushon commented Feb 9, 2022

/integrate

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

openjdk bot commented Feb 9, 2022

@cushon
Your change (at version f70fe83) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

phohensee commented Feb 9, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Feb 9, 2022

Going to push as commit 1db4ed1.
Since your change was applied there have been 12 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 Feb 9, 2022
@openjdk openjdk bot closed this Feb 9, 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 Feb 9, 2022
@openjdk
Copy link

openjdk bot commented Feb 9, 2022

@phohensee @cushon Pushed as commit 1db4ed1.

💡 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 integrated Pull request has been integrated
2 participants