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

8066694: Strange code in JavacParser.java #1852

Conversation

@turbanoff
Copy link
Contributor

@turbanoff turbanoff commented Dec 20, 2020

This code was introduced in main repository under https://bugs.openjdk.java.net/browse/JDK-8006775
I checked original commit in type-annotations/langtools repository: https://hg.openjdk.java.net/type-annotations/type-annotations/langtools/rev/71f35e4b93a5
Looks like it's not a merge problem.


Progress

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

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/1852/head:pull/1852
$ git checkout pull/1852

Update a local copy of the PR:
$ git checkout pull/1852
$ git pull https://git.openjdk.java.net/jdk pull/1852/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1852

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/1852.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 20, 2020

👋 Welcome back turbanoff! 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.

Loading

@openjdk openjdk bot added the rfr label Dec 20, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Dec 20, 2020

@turbanoff The following label will be automatically applied to this pull request:

  • compiler

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

Loading

@openjdk openjdk bot added the compiler label Dec 20, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 20, 2020

Webrevs

Loading

Copy link
Contributor

@jonathan-gibbons jonathan-gibbons left a comment

I suspect this was originally a merge issue, in the work leading up to the integration of the JSR308 work.

Loading

@turbanoff
Copy link
Contributor Author

@turbanoff turbanoff commented Dec 22, 2020

I suspect this was originally a merge issue, in the work leading up to the integration of the JSR308 work.

Do you know is history of original changes available somewhere?

Loading

@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 22, 2020

Mailing list message from Jonathan Gibbons on compiler-dev:

On 12/22/20 10:52 AM, Andrey Turbanov wrote:

It may be available somewhere, but I don't see a need to go there. The
fix looks simple enough on the merits.

-- Jon

Loading

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 19, 2021

@turbanoff This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

Loading

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Feb 16, 2021

@turbanoff This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it!

Loading

@bridgekeeper bridgekeeper bot closed this Feb 16, 2021
@turbanoff
Copy link
Contributor Author

@turbanoff turbanoff commented Apr 19, 2021

Issue is still actual

Loading

Copy link
Member

@JimLaskey JimLaskey left a comment

LOTM

Loading

@turbanoff
Copy link
Contributor Author

@turbanoff turbanoff commented Apr 19, 2021

How to reopen this PR?

Loading

@lgxbslgx
Copy link
Member

@lgxbslgx lgxbslgx commented Apr 21, 2021

/open

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Apr 21, 2021

@lgxbslgx @HostUserDetails{id=13688759, username='lgxbslgx', fullName='null'} only the pull request author can set the pull request state to "open"

Loading

@lgxbslgx
Copy link
Member

@lgxbslgx lgxbslgx commented Apr 21, 2021

@turbanoff you can type /open to reopen the PR.

Loading

@turbanoff
Copy link
Contributor Author

@turbanoff turbanoff commented Apr 21, 2021

/open

Loading

@openjdk openjdk bot reopened this Apr 21, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 21, 2021

@turbanoff @HostUserDetails{id=741251, username='turbanoff', fullName='null'} this pull request is now open

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Apr 22, 2021

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

8066694: Strange code in JavacParser.java

Reviewed-by: vromero, iris

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

  • 5db64c3: 8265268: Unify ReservedSpace reservation code in initialize and try_reserve_heap
  • 191f1fc: 8265759: Shenandoah: Avoid race for referent in assert
  • b3a319c: 8264842: IGV: different nodes sharing idx are treated as equal
  • 95f0fd6: 8265696: Move CDS sources to src/hotspot/shared/cds
  • a715b09: 8265798: Minimal build broken by JDK-8261090
  • 13d3263: 8265484: Fix up TRAPS usage in GenerateOopMap::compute_map and callers
  • a8ddbd1: 8265683: vmTestbase/nsk/jdb tests failed with "JDWP exit error AGENT_ERROR_INTERNAL(181)"
  • 7a55914: 8264196: Change link_and_cleanup_shared_classes(CATCH) to CHECK
  • b84f690: 8265793: Remove duplicate jtreg TEST.groups references for some client tests
  • 0e00598: 8265782: Bump bootjdk to jdk-17+19 on macosx-aarch64 at Oracle
  • ... and 1678 more: https://git.openjdk.java.net/jdk/compare/fa50877c2e86d1a4e00724dd29d934f52d51f42c...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. Possible candidates are the reviewers of this PR (@jonathan-gibbons, @JimLaskey, @vicente-romero-oracle, @irisclark) 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).

Loading

@openjdk openjdk bot added the ready label Apr 22, 2021
@turbanoff
Copy link
Contributor Author

@turbanoff turbanoff commented Apr 23, 2021

/integrate

Loading

@openjdk openjdk bot added the sponsor label Apr 23, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 23, 2021

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

Loading

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 21, 2021

@turbanoff This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

Loading

@liach
Copy link
Contributor

@liach liach commented Jun 5, 2021

Just curious, is there anything wrong with this pull request so that no commiter sponsors it after approval?

Loading

@JimLaskey
Copy link
Member

@JimLaskey JimLaskey commented Jun 5, 2021

/sponsor

Loading

@openjdk openjdk bot closed this Jun 5, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jun 5, 2021

@JimLaskey @turbanoff Since your change was applied there have been 2349 commits pushed to the master branch:

  • 6c838c5: 8266846: Add java.time.InstantSource
  • 7f55dc1: 8179880: Refactor javax/security shell tests to plain java tests
  • 7e41ca3: 8266957: SA has not followed JDK-8220587 and JDK-8224965
  • 6ff978a: 8267204: Expose access to underlying streams in Reporter
  • 76b54a1: 8263512: [macos_aarch64] issues with calling va_args functions from invoke_native
  • 4e6748c: 8267687: ModXNode::Ideal optimization is better than Parse::do_irem
  • 48dc72b: 8268272: Remove JDK-8264874 changes because Graal was removed.
  • 20b6312: 8268151: Vector API toShuffle optimization
  • 64ec8b3: 8212155: Race condition when posting dynamic_code_generated event leads to JVM crash
  • cd0678f: 8199318: add idempotent copy operation for Map.Entry
  • ... and 2339 more: https://git.openjdk.java.net/jdk/compare/fa50877c2e86d1a4e00724dd29d934f52d51f42c...master

Your commit was automatically rebased without conflicts.

Pushed as commit 36bff6f.

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

Loading

@turbanoff turbanoff deleted the remove_duplicate_condition_in_javacparser branch Sep 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment