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

8324736: Invalid end positions for EMPTY_STATEMENT #17595

Closed
wants to merge 2 commits into from

Conversation

archiecobbs
Copy link
Contributor

@archiecobbs archiecobbs commented Jan 26, 2024

In the fix for JDK-8305671, an EMPTY_STATEMENT representing a lone semicolon was being created with the wrong source code position. The bug was that the starting position needed to be captured prior to advancing to the next token, not after.


Progress

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

Issue

  • JDK-8324736: Invalid end positions for EMPTY_STATEMENT (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/17595/head:pull/17595
$ git checkout pull/17595

Update a local copy of the PR:
$ git checkout pull/17595
$ git pull https://git.openjdk.org/jdk.git pull/17595/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17595

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/17595.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 26, 2024

👋 Welcome back acobbs! 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 added the rfr Pull request is ready for review label Jan 26, 2024
@openjdk
Copy link

openjdk bot commented Jan 26, 2024

@archiecobbs 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.

@openjdk openjdk bot added the compiler compiler-dev@openjdk.org label Jan 26, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 26, 2024

Webrevs

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 23, 2024

@archiecobbs 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!

@archiecobbs
Copy link
Contributor Author

/pingbot

@openjdk
Copy link

openjdk bot commented Feb 24, 2024

@archiecobbs Unknown command pingbot - for a list of valid commands use /help.

Copy link
Contributor

@vicente-romero-oracle vicente-romero-oracle left a comment

Choose a reason for hiding this comment

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

lgtm

@openjdk
Copy link

openjdk bot commented Feb 24, 2024

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

8324736: Invalid end positions for EMPTY_STATEMENT

Reviewed-by: vromero

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

  • c342188: 8328074: Add jcheck whitespace checking for assembly files
  • 3c70f26: 8328112: Remove CardTable::_guard_region
  • 48717d6: 8326333: jshell completion on arrays is incomplete
  • ece4124: 8328247: Remove redundant dir for tests converted from applet to main
  • d32ce65: 8327651: Rename DictionaryEntry members related to protection domain
  • 0719419: 8328236: module_entry in CDS map file has stale value
  • 0204aac: 8328115: Convert java/awt/font/TextLayout/TestJustification.html applet test to main
  • 9bc1b06: 8328242: Add a log area to the PassFailJFrame
  • 65a84c2: 8328006: refactor large anonymous inner class in HtmlDocletWriter
  • 044f4ed: 8326979: (jdeps) improve the error message for FindException caused by InvalidModuleDescriptorException
  • ... and 296 more: https://git.openjdk.org/jdk/compare/63f6a563a3987d74ef673718d5209cc7c469751c...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 (@vicente-romero-oracle) 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 24, 2024
@archiecobbs
Copy link
Contributor Author

/integrate

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

openjdk bot commented Feb 24, 2024

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

@archiecobbs
Copy link
Contributor Author

@vicente-romero-oracle any interest in sponsoring this so we can wrap it up? Thanks.

@vicente-romero-oracle
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Mar 21, 2024

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

  • f7f291c: 8328301: Convert Applet test ManualHTMLDataFlavorTest.java to main program
  • 771f6a2: 8327704: Update nsk/jdi tests to use driver instead of othervm
  • 4210e50: 8320362: Load anchor certificates from Keychain keystore
  • ab183e4: 8328642: Convert applet test MouseDraggedOutCauseScrollingTest.html to main
  • ab28045: 8328316: Finisher cannot emit if stream is sequential and integrator returned false
  • ba05c6d: 8328368: Convert java/awt/image/multiresolution/MultiDisplayTest/MultiDisplayTest.java applet test to main
  • fa823bd: 8328540: test javax/swing/JSplitPane/4885629/bug4885629.java fails on windows hidpi
  • e81374e: 8328560: java/awt/event/MouseEvent/ClickDuringKeypress/ClickDuringKeypress.java imports Applet
  • cc5cda5: 8328005: Convert java/awt/im/JTextFieldTest.java applet test to main
  • ef2bd57: 8328558: Convert javax/swing/JCheckBox/8032667/bug8032667.java applet test to main
  • ... and 377 more: https://git.openjdk.org/jdk/compare/63f6a563a3987d74ef673718d5209cc7c469751c...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 21, 2024
@openjdk openjdk bot closed this Mar 21, 2024
@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 Mar 21, 2024
@openjdk
Copy link

openjdk bot commented Mar 21, 2024

@vicente-romero-oracle @archiecobbs Pushed as commit 46809b3.

💡 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
compiler compiler-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants