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

8274338: com/sun/jdi/RedefineCrossEvent.java failed "assert(m != __null) failed: NULL mirror" #632

Closed
wants to merge 6 commits into from

Conversation

zhengyu123
Copy link
Contributor

@zhengyu123 zhengyu123 commented Nov 16, 2021

This patch redoes JDK-8274338 backport to openjdk 11u.

Early backport failed and was backout. The failure was due to CLD::loaded_classes_do(), now requires to hold MultiArray_lock, therefore, the closure LinkSharedClassesClosure can not trigger JavaCall while holding a lock.

[Revised]
Drop new assertion in CLD::loaded_classes_do(), only add MultiArray_lock to InstanceKlass::restore_unshareable_info(), which is the only thing matter in this patch.

Test:

  • hotspot_appcds
  • tier1

Progress

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

Issue

  • JDK-8274338: com/sun/jdi/RedefineCrossEvent.java failed "assert(m != __null) failed: NULL mirror"

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/632/head:pull/632
$ git checkout pull/632

Update a local copy of the PR:
$ git checkout pull/632
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/632/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 632

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/632.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 16, 2021

👋 Welcome back zgu! 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 172aed1a2d75756b140cb723133ac5fb67f7745e 8274338: com/sun/jdi/RedefineCrossEvent.java failed "assert(m != __null) failed: NULL mirror" Nov 16, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 16, 2021

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

@openjdk openjdk bot added backport rfr labels Nov 16, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 16, 2021

Webrevs

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 3, 2022

@zhengyu123 This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@zhengyu123
Copy link
Contributor Author

@zhengyu123 zhengyu123 commented Jan 7, 2022

@phohensee

Could you review this redo patch?

Thanks,

-Zhengyu

Copy link
Member

@phohensee phohensee left a comment

Lgtm.

@openjdk
Copy link

@openjdk openjdk bot commented Jan 7, 2022

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

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

8274338: com/sun/jdi/RedefineCrossEvent.java failed "assert(m != __null) failed: NULL mirror"

Reviewed-by: phh

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

  • 914fb55: 8279379: GHA: Print tests that are in error
  • a96e70c: 8275536: Add test to check that File::lastModified returns same time stamp as Files.getLastModifiedTime
  • 2ccf515: 8274658: ISO 4217 Amendment 170 Update
  • fb39476: 8239502: [TEST_BUG] Test javax/swing/text/FlowView/6318524/bug6318524.java never fails
  • be7343d: 8277342: vmTestbase/nsk/stress/strace/strace004.java fails with SIGSEGV in InstanceKlass::jni_id_for
  • de11e6b: 8275650: Problemlist java/io/File/createTempFile/SpecialTempFile.java for Windows 11
  • 0096d51: 8268014: Build failure on SUSE Linux Enterprise Server 11.4 (s390x) due to 'SYS_get_mempolicy' was not declared
  • d356b89: 8241423: NUMA APIs fail to work in dockers due to dependent syscalls are disabled by default
  • 9fb2989: Merge
  • 175e23f: 8210205: build fails on AIX in hotspot cpp tests (for example getstacktr001.cpp)
  • ... and 60 more: https://git.openjdk.java.net/jdk11u-dev/compare/a412974a3a9dca2e9f1abb45e2f813f608439970...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 Jan 7, 2022
@GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 12, 2022

I ran the change through our nightly tests an do not see any failures.
Ah, stop, it only grabbed the last incremental change ... rerunning tonight.

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 13, 2022

SAP nightly tests all green now.

@zhengyu123
Copy link
Contributor Author

@zhengyu123 zhengyu123 commented Jan 13, 2022

SAP nightly tests all green now.

Thanks, @GoeLin

@zhengyu123
Copy link
Contributor Author

@zhengyu123 zhengyu123 commented Jan 13, 2022

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jan 13, 2022

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

  • 5a3a17b: 8279300: [arm32] SIGILL when running GetObjectSizeIntrinsicsTest
  • f1a15a4: 8273682: Upgrade Jline to 3.20.0
  • 1c7af7e: 8256154: Some TestNG tests require default constructors
  • 5c08cfd: 8237787: rewrite vmTestbase/vm/compiler/CodeCacheInfo* from shell to java
  • c3be035: 8223142: Clean-up WS and CB.
  • 03bfa8c: 8278384: Bytecodes::result_type() for arraylength returns T_VOID instead of T_INT
  • fee3955: 8278172: java/nio/channels/FileChannel/BlockDeviceSize.java should only run on Linux
  • f7998d6: 8279077: JFR crashes on Linux ppc due to missing crash protector in signal handler
  • e1ee008: 8279225: [arm32] C1 longs comparison operation destroys argument registers
  • 7e7043e: 8276623: JDK-8275650 accidentally pushed "out" file
  • ... and 70 more: https://git.openjdk.java.net/jdk11u-dev/compare/a412974a3a9dca2e9f1abb45e2f813f608439970...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Jan 13, 2022
@openjdk openjdk bot closed this Jan 13, 2022
@openjdk openjdk bot removed ready rfr labels Jan 13, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Jan 13, 2022

@zhengyu123 Pushed as commit 40d7d03.

💡 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
backport integrated
3 participants