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

8307331: Correctly update line maps when class redefine rewrites bytecodes #1324

Closed
wants to merge 1 commit into from

Conversation

adinn
Copy link
Contributor

@adinn adinn commented May 5, 2023

This is a clean backport of a fix for a potential crasher bug which can happen when debugging a program.


Progress

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

Issue

  • JDK-8307331: Correctly update line maps when class redefine rewrites bytecodes

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1324

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 5, 2023

👋 Welcome back adinn! 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 f94f957734355fe112e861d1f2f0b49df20f6b66 8307331: Correctly update line maps when class redefine rewrites bytecodes May 5, 2023
@openjdk
Copy link

openjdk bot commented May 5, 2023

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

@openjdk
Copy link

openjdk bot commented May 5, 2023

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

8307331: Correctly update line maps when class redefine rewrites bytecodes

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 5, 2023
@mlbridge
Copy link

mlbridge bot commented May 5, 2023

Webrevs

@GoeLin
Copy link
Member

GoeLin commented May 8, 2023

Hi Andrew,
please check the broken Pre-submit test and supply the proper comment in the JBS issue.
Thanks.

@adinn
Copy link
Contributor Author

adinn commented May 9, 2023

Ho Goetz,

The test failure was a network glitch when wget failed to download https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.8-bin.zip

@adinn
Copy link
Contributor Author

adinn commented May 10, 2023

/integrate

@openjdk
Copy link

openjdk bot commented May 10, 2023

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

  • b9eca2d: 8305993: Add handleSocketErrorWithMessage to extend nio Net.c exception message
  • 6a84974: 8305690: [X86] Do not emit two REX prefixes in Assembler::prefix
  • 3a0aff2: 8299570: [JVMCI] Insufficient error handling when CodeBuffer is exhausted
  • 86aca8b: 8302508: Add timestamp to the output TraceCompilerThreads
  • b5e6753: 8297450: ScaledTextFieldBorderTest.java fails when run with -show parameter
  • fafd082: 8289509: Improve test coverage for XPath Axes: descendant, descendant-or-self, following, following-sibling
  • 2aaf3c5: 8296084: javax/swing/JSpinner/4788637/bug4788637.java fails intermittently on a VM
  • aee7ab6: 8292990: Improve test coverage for XPath Axes: parent
  • 20fea6c: 8244976: vmTestbase/nsk/jdi/Event/request/request001.java doesn' initialize eName
  • 05f1562: 8286398: Address possibly lossy conversions in jdk.internal.le
  • ... and 8 more: https://git.openjdk.org/jdk17u-dev/compare/79aa7b15dbc54de891838ae2d4ca63838028c157...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 10, 2023

@adinn Pushed as commit d4467a7.

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