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

8290731: Clean up CDS handling of LambdaForm Species classes #9577

Closed

Conversation

iklam
Copy link
Member

@iklam iklam commented Jul 20, 2022

Please see the JBS issue for the reasons for this small clean up.

The main change is in LambdaFormInvokers::regenerate_holder_classes() -- do not regenerate the Species_XXX classes. However, mark them as "generated" to be compatible with JVMTI.

I renamed Klass::is_regenerated() to Klass::is_generated_shared_class() for clarity.

I also updated the test case to be clear what it's trying to do -- Species_IL should be loaded from base archive and Species_JL should be loaded from the dynamic archive.


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-8290731: Clean up CDS handling of LambdaForm Species classes

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9577

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 20, 2022

👋 Welcome back iklam! 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 Jul 20, 2022

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

  • hotspot

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 hotspot hotspot-dev@openjdk.org label Jul 20, 2022
@iklam
Copy link
Member Author

iklam commented Jul 20, 2022

/label remove hotspot
/label add hotspot-runtime

@openjdk openjdk bot removed the hotspot hotspot-dev@openjdk.org label Jul 20, 2022
@openjdk
Copy link

openjdk bot commented Jul 20, 2022

@iklam
The hotspot label was successfully removed.

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Jul 20, 2022
@openjdk
Copy link

openjdk bot commented Jul 20, 2022

@iklam
The hotspot-runtime label was successfully added.

@iklam iklam marked this pull request as ready for review July 20, 2022 21:04
@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 20, 2022
@mlbridge
Copy link

mlbridge bot commented Jul 20, 2022

Webrevs

@@ -28,9 +28,15 @@

public class CDSLambdaInvoker {
public static void main(String args[]) throws Throwable {
// The following calls trigger the generation of new Species classes
// that are not included in the base archive (or the default modules image.
Copy link
Member

Choose a reason for hiding this comment

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

Extra open parenthesis?

Copy link
Member

@calvinccheung calvinccheung left a comment

Choose a reason for hiding this comment

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

Looks good. One small nit.

@openjdk
Copy link

openjdk bot commented Jul 21, 2022

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

8290731: Clean up CDS handling of LambdaForm Species classes

Reviewed-by: ccheung

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

  • 15f4b30: 8290115: ArrayCopyObject JMH has wrong package
  • 4c1cd66: 8288368: simplify code in ValueTaglet, remove redundant code
  • 6346c33: 8290826: validate-source failures after JDK-8290016
  • 604a115: 8290016: IGV: Fix graph panning when mouse dragged outside of window
  • 59e495e: 8290704: x86: TemplateTable::_new should not call eden_allocate() without contiguous allocs enabled
  • 799a2c8: 8276561: URL$DefaultFactory::PREFIX should be static final
  • 52cc6cd: 8288723: Avoid redundant ConcurrentHashMap.get call in java.time
  • 3582fd9: 8290359: Ensure that all directory streams are closed in jdk.link
  • 53fc495: 8290316: Ensure that all directory streams are closed in java.base
  • db1e44c: 8290353: ModuleReader::list specification should suggest closing the returned stream
  • ... and 62 more: https://git.openjdk.org/jdk/compare/5a96a5db13992118ec384207edfb04136f339253...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 Jul 21, 2022
@iklam
Copy link
Member Author

iklam commented Jul 21, 2022

Thanks @calvinccheung for the review.
Passed tiers 1 - 4.
/integrate

@openjdk
Copy link

openjdk bot commented Jul 21, 2022

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

  • 0dda3c1: 8289275: Remove incorrect __declspec(dllimport) attributes from pointers in jdk.crypto.cryptoki
  • 620c8a0: 8289643: File descriptor leak with ProcessBuilder.startPipeline
  • 7ec0132: 8286844: com/sun/jdi/RedefineCrossEvent.java failed with 1 threads completed while VM suspended
  • 80bd8c3: 8290504: Close streams returned by ModuleReader::list
  • 15f4b30: 8290115: ArrayCopyObject JMH has wrong package
  • 4c1cd66: 8288368: simplify code in ValueTaglet, remove redundant code
  • 6346c33: 8290826: validate-source failures after JDK-8290016
  • 604a115: 8290016: IGV: Fix graph panning when mouse dragged outside of window
  • 59e495e: 8290704: x86: TemplateTable::_new should not call eden_allocate() without contiguous allocs enabled
  • 799a2c8: 8276561: URL$DefaultFactory::PREFIX should be static final
  • ... and 66 more: https://git.openjdk.org/jdk/compare/5a96a5db13992118ec384207edfb04136f339253...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 21, 2022

@iklam Pushed as commit 66f59c2.

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

Successfully merging this pull request may close these issues.

2 participants