Skip to content
This repository has been archived by the owner on Feb 2, 2023. It is now read-only.
/ jdk15u-dev Public archive

8290417: CDS cannot archive lamda proxy with useImplMethodHandle #251

Closed

Conversation

jankratochvil
Copy link
Contributor

@jankratochvil jankratochvil commented Aug 3, 2022

There was an accepted backport to OpenJDK-17.

This OpenJDK-15 backport: The first condition

       // CDS does not handle useImplMethodHandle
       if (useImplMethodHandle)
           return generateInnerClass();

was not applied cleanly as OpenJDK-15 is missing:

  • 8257241: CDS should not handle disableEagerInitialization for archived lambda proxy classes

I was considering whether to backport also 8257241 but I do not think it is right as 8257241:

  • does not fix any bug, it is only a code cleanup
  • it modifies runtime introspection and possibly performance

This OpenJDK-15 backport: Original commit errors on OpenJDK-15 with:
TEST RESULT: Error. can't find jdk.test.lib.helpers.ClassFileInstaller in test directory or libraries
as OpenJDK-15 is missing:

  • 8263412: ClassFileInstaller can't be used by classes outside of default package

This OpenJDK-15 backport: Original commit errors on OpenJDK-15 with:

      error: cannot find symbol
      symbol:   method dumpClassList(String,String,String,String)
      location: class CDSTestUtils

as OpenJDK-15 is missing:

  • 8213226: [TESTBUG] Reduce the usage of CDSTestUtils.executeAndLog()

Issue

  • JDK-8290417: CDS cannot archive lamda proxy with useImplMethodHandle

I am not yet an Author - I do not have JBS account.
I have run the testsuite on Linux x86_64 and there is no change of the results. Two new testcases are added and they are both Passing. The testcases are still Passing after backporting them to 15u-dev.

+Passed: runtime/cds/appcds/LambdaWithUseImplMethodHandle.java
+Passed: runtime/cds/appcds/dynamicArchive/DynamicLambdaWithUseImplMethodHandle.java

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-8290417: CDS cannot archive lamda proxy with useImplMethodHandle

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 251

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

Using diff file

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

jankratochvil and others added 4 commits August 3, 2022 14:44
Backport-of: 4dc421caa02caedd7061ede6a5ec44dbb6ec738e
      TEST RESULT: Error. can't find jdk.test.lib.helpers.ClassFileInstaller in test directory or libraries
    as OpenJDK-15 is missing:
      8263412: ClassFileInstaller can't be used by classes outside of default package
      error: cannot find symbol
      symbol:   method dumpClassList(String,String,String,String)
      location: class CDSTestUtils
    as OpenJDK-15 is missing:
      8213226: [TESTBUG] Reduce the usage of CDSTestUtils.executeAndLog()
@bridgekeeper
Copy link

bridgekeeper bot commented Aug 3, 2022

👋 Welcome back jankratochvil! 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 changed the title Backport 4dc421caa02caedd7061ede6a5ec44dbb6ec738e 8290417: CDS cannot archive lamda proxy with useImplMethodHandle Aug 3, 2022
@openjdk
Copy link

openjdk bot commented Aug 3, 2022

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Aug 3, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 3, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Aug 4, 2022

@jankratochvil This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8290417: CDS cannot archive lamda proxy with useImplMethodHandle

Reviewed-by: dcherepanov

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

  • ed0200a: 8280684: JfrRecorderService failes with guarantee(num_written > 0) when no space left on device.
  • e3c3e3d: 8287672: jtreg test com/sun/jndi/ldap/LdapPoolTimeoutTest.java fails intermittently in nightly run
  • 47d266b: 8257569: Failure observed with JfrVirtualMemory::initialize
  • b3aec28: 8264792: The NumberFormat for locale sq_XK formats price incorrectly.
  • 315ad27: 8268894: forged ASTs can provoke an AIOOBE at com.sun.tools.javac.jvm.ClassWriter::writePosition
  • d9631d8: 8272806: [macOS] "Apple AWT Internal Exception" when input method is changed
  • 5f78ab1: 8256538: Fix annoying awk warning in configure for java versions
  • 8c54455: 8284549: JFR: FieldTable leaks FieldInfoTable member
  • 8fcba34: 8289486: Improve XSLT XPath operators count efficiency
  • 2d66d12: 8290334: Update FreeType to 2.12.1
  • ... and 18 more: https://git.openjdk.org/jdk15u-dev/compare/31d795e2c1e1039cc890d3dfe720d7753920fa68...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 (@dimitryc) 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 Aug 4, 2022
@jankratochvil
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 4, 2022
@openjdk
Copy link

openjdk bot commented Aug 4, 2022

@jankratochvil
Your change (at version 34718e7) is now ready to be sponsored by a Committer.

@dimitryc
Copy link
Collaborator

dimitryc commented Aug 4, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 4, 2022

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

  • ed0200a: 8280684: JfrRecorderService failes with guarantee(num_written > 0) when no space left on device.
  • e3c3e3d: 8287672: jtreg test com/sun/jndi/ldap/LdapPoolTimeoutTest.java fails intermittently in nightly run
  • 47d266b: 8257569: Failure observed with JfrVirtualMemory::initialize
  • b3aec28: 8264792: The NumberFormat for locale sq_XK formats price incorrectly.
  • 315ad27: 8268894: forged ASTs can provoke an AIOOBE at com.sun.tools.javac.jvm.ClassWriter::writePosition
  • d9631d8: 8272806: [macOS] "Apple AWT Internal Exception" when input method is changed
  • 5f78ab1: 8256538: Fix annoying awk warning in configure for java versions
  • 8c54455: 8284549: JFR: FieldTable leaks FieldInfoTable member
  • 8fcba34: 8289486: Improve XSLT XPath operators count efficiency
  • 2d66d12: 8290334: Update FreeType to 2.12.1
  • ... and 18 more: https://git.openjdk.org/jdk15u-dev/compare/31d795e2c1e1039cc890d3dfe720d7753920fa68...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 4, 2022

@dimitryc @jankratochvil Pushed as commit b176776.

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants