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

8323815: Source launcher should find classes with $ in names #17526

Conversation

sormuras
Copy link
Member

@sormuras sormuras commented Jan 23, 2024

Please review this fix to make the multi-file source-code launcher find classes with $ in names, including names of packages, names of compliation units, and also names of enclosed types.

Tested tier1-3


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-8323815: Source launcher should find classes with $ in names (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17526

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 23, 2024

👋 Welcome back cstein! 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 23, 2024
@openjdk
Copy link

openjdk bot commented Jan 23, 2024

@sormuras 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 23, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 23, 2024

Webrevs

Copy link
Contributor

@lahodaj lahodaj left a comment

Choose a reason for hiding this comment

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

I think the code is OK, but I'd suggest to add a few more tests to help ensure the behavior is kept even in case the code is modified.

@sundararajana
Copy link
Member

LGTM

I tested the fix with jextract samples (jextract generates $ in names). All source mode + mixed .class + .java mode both work fine as expected.

@openjdk
Copy link

openjdk bot commented Jan 24, 2024

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

8323815: Source launcher should find classes with $ in names

Reviewed-by: jlahoda, sundar

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

  • bccd823: 8324613: Serial: Rename GenerationPool to TenuredGenerationPool
  • 8c003d8: 8321512: runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java fails on 32-bit platforms
  • 67f29b1: 8324537: Remove superfluous _FILE_OFFSET_BITS=64
  • 1c1cb04: 8324512: Serial: Remove Generation::Name
  • b65e5eb: 8324543: Remove Space::object_iterate
  • 6d2f640: 8324578: [BACKOUT] [IMPROVE] OPEN_MAX is no longer the max limit on macOS >= 10.6 for RLIMIT_NOFILE
  • c17059d: 8324334: Shenandoah: Improve end of process report
  • 96607df: 8321545: Override toString() for Format subclasses
  • edfee7f: 8323546: Cleanup jcmd docs for Compiler.perfmap and VM.cds filename parameter
  • 8b9bf75: 8323515: Create test alias "all" for all test roots
  • ... and 83 more: https://git.openjdk.org/jdk/compare/1007618f6f97fad0f66e4074b50521bdd853629e...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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 24, 2024
Copy link
Contributor

@lahodaj lahodaj left a comment

Choose a reason for hiding this comment

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

Looks reasonable.

@sormuras
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 24, 2024

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

  • c432dc0: 8322149: ConcurrentHashMap smarter presizing for copy constructor and putAll
  • fb822e4: 8324514: ClassLoaderData::print_on should print address of class loader
  • 00bb6bf: 8324220: jdk/jfr/event/io/TestSerializationMisdeclarationEvent.java had 22 failures
  • bccd823: 8324613: Serial: Rename GenerationPool to TenuredGenerationPool
  • 8c003d8: 8321512: runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java fails on 32-bit platforms
  • 67f29b1: 8324537: Remove superfluous _FILE_OFFSET_BITS=64
  • 1c1cb04: 8324512: Serial: Remove Generation::Name
  • b65e5eb: 8324543: Remove Space::object_iterate
  • 6d2f640: 8324578: [BACKOUT] [IMPROVE] OPEN_MAX is no longer the max limit on macOS >= 10.6 for RLIMIT_NOFILE
  • c17059d: 8324334: Shenandoah: Improve end of process report
  • ... and 86 more: https://git.openjdk.org/jdk/compare/1007618f6f97fad0f66e4074b50521bdd853629e...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 24, 2024

@sormuras Pushed as commit c702dca.

💡 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
4 participants