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

8252919: JDK built with --enable-cds=no fails with NoClassDefFoundError #96

Closed
wants to merge 1 commit into from

Conversation

mlchung
Copy link
Member

@mlchung mlchung commented Sep 9, 2020

jlink --generate-jli-classes plugin should retain the original holder classes if the default_jli_trace.txt
file does not exist.

Before JDK-8252725, JavaLangInvokeAccess::generateXXXHolderClassesBytes methods are invoked
unconditionally and therefore the holder classes are "regenerated" when default_jli_trace.txt
does not exist. JDK-8252725 does not handle this case properly and results in an image missing
the holder classes when the specified trace file does not exist.

The fix is very simple. Retains the original holder classes when the file does not exist.


Progress

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

Issue

  • JDK-8252919: JDK built with --enable-cds=no fails with NoClassDefFoundError: DirectMethodHandle$Holder ⚠️ Title mismatch between PR and JBS.

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 9, 2020

👋 Welcome back mchung! 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 Sep 9, 2020
@openjdk
Copy link

openjdk bot commented Sep 9, 2020

@mlchung The following label will be automatically applied to this pull request: core-libs.

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 (add|remove) "label" command.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Sep 9, 2020
@mlbridge
Copy link

mlbridge bot commented Sep 9, 2020

Webrevs

@yminqi
Copy link
Contributor

yminqi commented Sep 9, 2020

Looks good!

yminqi
yminqi approved these changes Sep 9, 2020
@openjdk
Copy link

openjdk bot commented Sep 9, 2020

@mlchung This change now passes all automated pre-integration checks. In addition to the automated checks, the change must also fulfill all project specific requirements

After integration, the commit message will be:

8252919: JDK built with --enable-cds=no fails with NoClassDefFoundError

Reviewed-by: minqi, sundar, alanb, redestad
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

Since the source branch of this PR was last updated there have been 9 commits pushed to the master branch:

  • 418e4a2: 8252830: Correct missing javadoc comments in java.rmi module
  • 41d29b7: 8252774: remove jdk.test.lib.FileInstaller action from graalunit tests
  • 5b30a83: 8252778: remove jdk.test.lib.FileInstaller action from compiler/c2/stemmer test
  • 8db3335: 8247928: Refactor G1ConcurrentMarkThread for mark abort
  • 7ccf435: 8252846: Fix ppc/s390 after "8231441: AArch64: Initial SVE backend su…
  • d236cf4: 8252995: Non-PCH builds broken by JDK-8250961
  • 6a00534: 8250961: Move Universe::update_heap_info_at_gc to CollectedHeap
  • f78f780: 8252889: Obsolete -XX:+InsertMemBarAfterArraycopy
  • f933961: 8252980: comment only changes extracted from JDK-8247281

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 418e4a259c8ba02c5d7a3cc0124f9e8980dc9c8e.

➡️ 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 Sep 9, 2020
Copy link
Member

@sundararajana sundararajana 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

cl4es
cl4es approved these changes Sep 10, 2020
@mlchung
Copy link
Member Author

mlchung commented Sep 10, 2020

/integrate

@openjdk openjdk bot closed this Sep 10, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 10, 2020
@openjdk
Copy link

openjdk bot commented Sep 10, 2020

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

  • 418e4a2: 8252830: Correct missing javadoc comments in java.rmi module
  • 41d29b7: 8252774: remove jdk.test.lib.FileInstaller action from graalunit tests
  • 5b30a83: 8252778: remove jdk.test.lib.FileInstaller action from compiler/c2/stemmer test
  • 8db3335: 8247928: Refactor G1ConcurrentMarkThread for mark abort
  • 7ccf435: 8252846: Fix ppc/s390 after "8231441: AArch64: Initial SVE backend su…
  • d236cf4: 8252995: Non-PCH builds broken by JDK-8250961
  • 6a00534: 8250961: Move Universe::update_heap_info_at_gc to CollectedHeap
  • f78f780: 8252889: Obsolete -XX:+InsertMemBarAfterArraycopy
  • f933961: 8252980: comment only changes extracted from JDK-8247281

Your commit was automatically rebased without conflicts.

Pushed as commit 44a74da.

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

@mlchung mlchung deleted the jlink-plugin branch Feb 16, 2021
lewurm added a commit to lewurm/openjdk that referenced this pull request Oct 6, 2021
Restore looks like this now:
```
  0x0000000106e4dfcc:   movk    x9, #0x5e4, lsl openjdk#16
  0x0000000106e4dfd0:   movk    x9, #0x1, lsl openjdk#32
  0x0000000106e4dfd4:   blr x9
  0x0000000106e4dfd8:   ldp x2, x3, [sp, openjdk#16]
  0x0000000106e4dfdc:   ldp x4, x5, [sp, openjdk#32]
  0x0000000106e4dfe0:   ldp x6, x7, [sp, openjdk#48]
  0x0000000106e4dfe4:   ldp x8, x9, [sp, openjdk#64]
  0x0000000106e4dfe8:   ldp x10, x11, [sp, openjdk#80]
  0x0000000106e4dfec:   ldp x12, x13, [sp, openjdk#96]
  0x0000000106e4dff0:   ldp x14, x15, [sp, openjdk#112]
  0x0000000106e4dff4:   ldp x16, x17, [sp, openjdk#128]
  0x0000000106e4dff8:   ldp x0, x1, [sp], openjdk#144
  0x0000000106e4dffc:   ldp xzr, x19, [sp], openjdk#16
  0x0000000106e4e000:   ldp x22, x23, [sp, openjdk#16]
  0x0000000106e4e004:   ldp x24, x25, [sp, openjdk#32]
  0x0000000106e4e008:   ldp x26, x27, [sp, openjdk#48]
  0x0000000106e4e00c:   ldp x28, x29, [sp, openjdk#64]
  0x0000000106e4e010:   ldp x30, xzr, [sp, openjdk#80]
  0x0000000106e4e014:   ldp x20, x21, [sp], openjdk#96
  0x0000000106e4e018:   ldur    x12, [x29, #-24]
  0x0000000106e4e01c:   ldr x22, [x12, openjdk#16]
  0x0000000106e4e020:   add x22, x22, #0x30
  0x0000000106e4e024:   ldr x8, [x28, openjdk#8]
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
5 participants