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

8276177: nsk/jvmti/RedefineClasses/StressRedefineWithoutBytecodeCorruption failed with "assert(def_ik->is_being_redefined()) failed: should be being redefined to get here" #693

Closed

Conversation

zhengyu123
Copy link
Contributor

@zhengyu123 zhengyu123 commented Dec 7, 2021

I would like to backport this patch for parity with Oracle 11.0.15.

The original patch does not apply cleanly, due to context differences. The patch is small and straightforward, can be handled manually.

Test:

  • Affected test passed with patch.

Progress

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

Issue

  • JDK-8276177: nsk/jvmti/RedefineClasses/StressRedefineWithoutBytecodeCorruption failed with "assert(def_ik->is_being_redefined()) failed: should be being redefined to get here"

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 693

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 7, 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 a907b2b144f2af27392eb7c2f9656fbb1a759618 8276177: nsk/jvmti/RedefineClasses/StressRedefineWithoutBytecodeCorruption failed with "assert(def_ik->is_being_redefined()) failed: should be being redefined to get here" Dec 7, 2021
@openjdk
Copy link

openjdk bot commented Dec 7, 2021

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 Dec 7, 2021
@mlbridge
Copy link

mlbridge bot commented Dec 7, 2021

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

LGTM. Thanks for backporting!

@openjdk
Copy link

openjdk bot commented Dec 9, 2021

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

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

8276177: nsk/jvmti/RedefineClasses/StressRedefineWithoutBytecodeCorruption failed with "assert(def_ik->is_being_redefined()) failed: should be being redefined to get here"

Reviewed-by: mdoerr

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

  • 8878ffc: 8273366: [testbug] javax/swing/UIDefaults/6302464/bug6302464.java fails on macOS12
  • 554498d: 8199079: Test javax/swing/UIDefaults/6302464/bug6302464.java is unstable
  • 9b96ac9: Merge
  • f5664ea: 8251329: (zipfs) Files.walkFileTree walks infinitely if zip has dir named "." inside
  • 8fe5d59: 8276774: Cookie stored in CookieHandler not sent if user headers contain cookie
  • eb2a92f: 8256373: [Windows/HiDPI] The Frame#setBounds does not work in a minimized state
  • d0445aa: 8274523: java/lang/management/MemoryMXBean/MemoryTest.java test should handle Shenandoah

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 Dec 9, 2021
@zhengyu123
Copy link
Contributor Author

zhengyu123 commented Dec 22, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Dec 22, 2021

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

  • cd8ea37: 8273638: javax/swing/JTable/4235420/bug4235420.java fails in GTK L&F
  • fc54784: 8258554: javax/swing/JTable/4235420/bug4235420.java fails in GTK L&F
  • bf7c965: 8277385: Zero: Enable CompactStrings support
  • bd97b56: 8278116: runtime/modules/LoadUnloadModuleStress.java has duplicate -Xmx
  • d3c2dc0: 8278115: gc/stress/gclocker/TestGCLockerWithSerial.java has duplicate -Xmx
  • ec89f1b: 8274736: Concurrent read/close of SSLSockets causes SSLSessions to be invalidated unnecessarily
  • b07b90f: 8278309: [windows] use of uninitialized OSThread::_state
  • 86c2995: 8202142: jfr/event/io/TestInstrumentation is unstable
  • 4b68145: Merge
  • d665a4e: 8277529: SIGSEGV in C2 CompilerThread Node::rematerialize() compiling Packet::readUnsignedTrint
  • ... and 27 more: https://git.openjdk.java.net/jdk11u-dev/compare/38bfb43c851452457ebbd6ada7b8c23581f673cb...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 22, 2021

@zhengyu123 Pushed as commit 2893731.

💡 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 Pull request has been integrated
2 participants