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

8261937: LambdaForClassInBaseArchive: SimpleApp$$Lambda$1 missing #2897

Conversation

@calvinccheung
Copy link
Member

@calvinccheung calvinccheung commented Mar 9, 2021

Please review this simple test fix to handle the situation if other lambda proxy classes loaded prior to the one from the test.

The fix passed mach5 tier1 and 2 testing.

Thanks!
Calvin


Progress

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

Issue

  • JDK-8261937: LambdaForClassInBaseArchive: SimpleApp$$Lambda$1 missing

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2897/head:pull/2897
$ git checkout pull/2897

@calvinccheung
Copy link
Member Author

@calvinccheung calvinccheung commented Mar 9, 2021

/label remove hotspot
/label add hotspot-runtime

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 9, 2021

👋 Welcome back ccheung! 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 openjdk bot commented Mar 9, 2021

@calvinccheung The hotspot label was not set.

@openjdk
Copy link

@openjdk openjdk bot commented Mar 9, 2021

@calvinccheung
The hotspot-runtime label was successfully added.

@calvinccheung calvinccheung marked this pull request as ready for review Mar 9, 2021
@openjdk openjdk bot added the rfr label Mar 9, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 9, 2021

Webrevs

@iklam
iklam approved these changes Mar 9, 2021
Copy link
Member

@iklam iklam left a comment

Looks good. I think this qualifies as a trivial change.

@openjdk
Copy link

@openjdk openjdk bot commented Mar 9, 2021

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

8261937: LambdaForClassInBaseArchive: SimpleApp$$Lambda$1 missing

Reviewed-by: iklam, dcubed

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

  • 2218e72: 8262486: Merge trivial JDWP agent changes from the loom repo to the jdk repo
  • 86fac95: 8263142: Delete unused entry points in libawt/libawt_xawt/libawt_headless
  • b7f0b3f: 8252173: Use handles instead of jobjects in modules.cpp
  • a6e34b3: 8262829: Native crash in Win32PrintServiceLookup.getAllPrinterNames()
  • fbe40e8: 8252399: Update mapMulti documentation to use type test pattern instead of instanceof once JEP 375 exits preview
  • 0f2402d: 8263190: Update java.io, java.math, and java.text to use instanceof pattern variable
  • 4f0a12e: 8262323: do not special case JVMCI in tiered compilation policy
  • 3022baa: 8263167: IGV: build fails with "taskdef AutoUpdate cannot be found"
  • 0bc4562: 8263068: Rename safefetch.hpp to safefetch.inline.hpp
  • 5bfc5fd: 8263051: Modernize the code in the java.awt.color package
  • ... and 44 more: https://git.openjdk.java.net/jdk/compare/02fbcb52b8ec8d6d5d865fcf2c340cfc02cbbbba...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 label Mar 9, 2021
@calvinccheung
Copy link
Member Author

@calvinccheung calvinccheung commented Mar 9, 2021

@dcubed-ojdk @iklam Thanks for your review.
I've updated the fix slightly to look for digits after the second $.

@calvinccheung
Copy link
Member Author

@calvinccheung calvinccheung commented Mar 9, 2021

/integrate

@openjdk openjdk bot closed this Mar 9, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Mar 9, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 9, 2021

@calvinccheung Since your change was applied there have been 54 commits pushed to the master branch:

  • 2218e72: 8262486: Merge trivial JDWP agent changes from the loom repo to the jdk repo
  • 86fac95: 8263142: Delete unused entry points in libawt/libawt_xawt/libawt_headless
  • b7f0b3f: 8252173: Use handles instead of jobjects in modules.cpp
  • a6e34b3: 8262829: Native crash in Win32PrintServiceLookup.getAllPrinterNames()
  • fbe40e8: 8252399: Update mapMulti documentation to use type test pattern instead of instanceof once JEP 375 exits preview
  • 0f2402d: 8263190: Update java.io, java.math, and java.text to use instanceof pattern variable
  • 4f0a12e: 8262323: do not special case JVMCI in tiered compilation policy
  • 3022baa: 8263167: IGV: build fails with "taskdef AutoUpdate cannot be found"
  • 0bc4562: 8263068: Rename safefetch.hpp to safefetch.inline.hpp
  • 5bfc5fd: 8263051: Modernize the code in the java.awt.color package
  • ... and 44 more: https://git.openjdk.java.net/jdk/compare/02fbcb52b8ec8d6d5d865fcf2c340cfc02cbbbba...master

Your commit was automatically rebased without conflicts.

Pushed as commit 3212f80.

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

@calvinccheung calvinccheung deleted the calvinccheung:8261937-LambdaForClassInBaseArchive branch Mar 9, 2021
@@ -75,7 +75,7 @@ private static void doTestCustomBase(String baseArchiveName, String topArchiveNa
appClass, "lambda")
.assertNormalExit(out -> {
out.shouldHaveExitValue(0)
.shouldContain("Archiving hidden SimpleApp$$Lambda$1");
.shouldMatch("Archiving hidden SimpleApp[$][$]Lambda[$][\\d+]*");

This comment has been minimized.

@dcubed-ojdk

dcubed-ojdk Mar 9, 2021
Member

That a zero-or-more digit match or a one-or-more digit match?
I think the pattern should require 1 or more digits.

This comment has been minimized.

@calvinccheung

calvinccheung Mar 9, 2021
Author Member

The \\d+ means one or more digits.

This comment has been minimized.

@dcubed-ojdk

dcubed-ojdk Mar 9, 2021
Member

Thanks for clarifying (for my tired brain).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants