Skip to content

Conversation

@TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Oct 4, 2022

Backport of JDK-8293998. Version from 17u-dev applies cleanly, but I've replaced nullptr by NULL because 11u-dev uses an older C++ standard.


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-8293998: [PPC64] JfrGetCallTrace: assert(_pc != nullptr) failed: must have PC

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1390

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 4, 2022

👋 Welcome back mdoerr! 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 90cc8ac9398ff300f6d74383ea84fd82552f1c5d 8293998: [PPC64] JfrGetCallTrace: assert(_pc != nullptr) failed: must have PC Oct 4, 2022
@openjdk
Copy link

openjdk bot commented Oct 4, 2022

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Oct 4, 2022
@mlbridge
Copy link

mlbridge bot commented Oct 4, 2022

Webrevs

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm.

@openjdk
Copy link

openjdk bot commented Oct 4, 2022

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

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

8293998: [PPC64] JfrGetCallTrace: assert(_pc != nullptr) failed: must have PC

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

  • 0013d84: 8233565: [TESTBUG] NullModalityDialogTest.java fails on MacOS
  • b8bc720: 8282857: Create a regression test for JDK-4702690
  • f8e71f8: 8294578: [PPC64] C2: Missing is_oop information when using disjoint compressed oops mode
  • 905baaf: 8290451: Incorrect result when switching to C2 OSR compilation from C1

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 Oct 4, 2022
@GoeLin
Copy link
Member

GoeLin commented Oct 5, 2022

What is the build error in the Pre-submit tests? I have not seen that before.

@TheRealMDoerr
Copy link
Contributor Author

Thanks for the review!
Interesting error in the Pre-submit tests. But I have luck. My change only touches PPC64 files which don't have an effect on MacOS x64. My PR is based on 49b85e8.

@TheRealMDoerr
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 7, 2022

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

  • 0013d84: 8233565: [TESTBUG] NullModalityDialogTest.java fails on MacOS
  • b8bc720: 8282857: Create a regression test for JDK-4702690
  • f8e71f8: 8294578: [PPC64] C2: Missing is_oop information when using disjoint compressed oops mode
  • 905baaf: 8290451: Incorrect result when switching to C2 OSR compilation from C1

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 7, 2022

@TheRealMDoerr Pushed as commit 9014a18.

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

@TheRealMDoerr TheRealMDoerr deleted the 8293998_PPC64_JFR_last_Java_pc branch October 7, 2022 23:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants