Skip to content

8318811: Compiler directives parser swallows a character after line comments #1717

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

satyenme
Copy link

@satyenme satyenme commented Apr 25, 2025

Backporting JDK-8318811: Compiler directives parser swallows a character after line comments. Fixes JSON::skip_line_comment() to match specification and "return the first token after the line comment without consuming it" by using peek instead of next. Adds test. Ran GHA Sanity Checks, local Tier 1 and 2, and new test/hotspot/jtreg/compiler/compilercontrol/parser/DirectiveParserTest.java tests. Patch is clean.


Progress

  • Change must not contain extraneous whitespace
  • JDK-8318811 needs maintainer approval
  • Commit message must refer to an issue

Issue

  • JDK-8318811: Compiler directives parser swallows a character after line comments (Bug - P4 - Requested)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1717

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 25, 2025

👋 Welcome back ssubramaniam! 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
Copy link

openjdk bot commented Apr 25, 2025

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk openjdk bot changed the title Backport 141dae8b76d41accfa02a0250a1c24364cbf6f25 8318811: Compiler directives parser swallows a character after line comments Apr 25, 2025
@openjdk
Copy link

openjdk bot commented Apr 25, 2025

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

@openjdk
Copy link

openjdk bot commented Apr 25, 2025

⚠️ @satyenme 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.

@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 25, 2025
@mlbridge
Copy link

mlbridge bot commented Apr 25, 2025

Webrevs

@satyenme
Copy link
Author

/approval request for backport. Fixes JSON::skip_line_comment() to match specification and "return the first token after the line comment without consuming it" by using peek instead of next.

Risk: Low-Medium. Tip change was merged in October 2023 and adds a test to confirm correct functionality. It's possible that consumers depend on the current, buggy implementation of JSON::skip_line_comment().

Testing:

  • GHA Sanity Checks
  • Tier 1 and 2 tests locally

@openjdk
Copy link

openjdk bot commented Apr 25, 2025

@satyenme
8318811: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Apr 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approval backport clean rfr Pull request is ready for review
Development

Successfully merging this pull request may close these issues.

1 participant