8301095: [s390x] TestDwarf.java fails

[offamitkumar]

TestDwarf.java fails on s390 due to incorrect returned frame. for dereference_null crash, the (return) pc was selected from gpr14 (in accordance with z-ABI) but correct (return) pc was present at "return_pc" offset. This PR introduces an additional check for the frame type detection.
Special Thanks to @RealLucy

---

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-8301095: [s390x] TestDwarf.java fails

Reviewers

• Lutz Schmidt (@RealLucy - Reviewer)
• Tyler Steele (@backwaterred - Committer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/12306/head:pull/12306
$ git checkout pull/12306

Update a local copy of the PR:
$ git checkout pull/12306
$ git pull https://git.openjdk.org/jdk pull/12306/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12306

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/12306.diff

[bridgekeeper]

👋 Welcome back offamitkumar! 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]

@offamitkumar The following label will be automatically applied to this pull request:

• hotspot-runtime

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 pull request command.

[mlbridge]

Webrevs

• 03: Full (476acfe6)
• 02: Full - Incremental (9dd8e10c)
• 01: Full - Incremental (1e828b82)
• 00: Full (e93919ab)

[offamitkumar]

Hi @RealLucy, Thanks for review.

I've made some changes accordingly.

[RealLucy]

LGTM

[openjdk]

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

8301095: [s390x] TestDwarf.java fails

Reviewed-by: lucy, tsteele

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

• 9c80b8a: 8299683: [S390X] Problems with -XX:+VerifyStack
• 8e9b726: 8301599: Serial: Refactor nested closures in DefNewGeneration
• 7730506: 8299162: Refactor shared trampoline emission logic
• 522fa13: 8301580: Error recovery does not clear returnResult
• 7ac2079: 8301025: ClassCastException in switch with generic record
• 371a0c4: 8301465: Remove unnecessary nmethod arming in Full GC of Serial/Parallel
• 716f1df: 8301478: Replace NULL with nullptr in os/bsd
• ab528ce: 4934362: see also refers to self
• 8f195ff: 8298952: All nodes should have type(n) == Value(n) after IGVN
• e88fd8c: 8301768: G1: Remove unimplemented HeapRegionRemSet::split_card
• ... and 3 more: https://git.openjdk.org/jdk/compare/b4cb6c8e8b4bb10d47fd4839c7abf13a552323f6...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@RealLucy, @backwaterred) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

[offamitkumar]

/integrate

[openjdk]

@offamitkumar
Your change (at version 476acfe) is now ready to be sponsored by a Committer.

[backwaterred]

These changes LGTM also.

/sponsor

[RealLucy]

@offamitkumar I'm sorry, we're not there yet. HotSpot changes require two reviews before they can be integrated. Reviewers for s390 PRs are a scarce resource. I've already pinged @TheRealMDoerr to help with this PR.

[openjdk]

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

• 9c80b8a: 8299683: [S390X] Problems with -XX:+VerifyStack
• 8e9b726: 8301599: Serial: Refactor nested closures in DefNewGeneration
• 7730506: 8299162: Refactor shared trampoline emission logic
• 522fa13: 8301580: Error recovery does not clear returnResult
• 7ac2079: 8301025: ClassCastException in switch with generic record
• 371a0c4: 8301465: Remove unnecessary nmethod arming in Full GC of Serial/Parallel
• 716f1df: 8301478: Replace NULL with nullptr in os/bsd
• ab528ce: 4934362: see also refers to self
• 8f195ff: 8298952: All nodes should have type(n) == Value(n) after IGVN
• e88fd8c: 8301768: G1: Remove unimplemented HeapRegionRemSet::split_card
• ... and 3 more: https://git.openjdk.org/jdk/compare/b4cb6c8e8b4bb10d47fd4839c7abf13a552323f6...master

Your commit was automatically rebased without conflicts.

[openjdk]

@backwaterred @offamitkumar Pushed as commit 7ae447f.

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

[backwaterred]

Sorry for stepping on your toes @RealLucy. I am happy to receive any feedback from Martin as well.

While I don't normally review s390 changes, I felt familiar enough with these changes to give it a +1.

[RealLucy]

Ahhh, no problem at all. I didn't feel any pain.