8340843: [PPC64/s390x] Error: ShouldNotReachHere() in TemplateInterpreterGenerator::generate_math_entry after 8338694

[TheRealMDoerr]

JDK-8338694 introduced Interpreter::java_lang_math_tanh which needs to be handled by the interpreter. Unfortunately, SharedRuntime::dtanh does not exist, so we need to fallback to the normal interpreter entry (as before JDK-8338694).

---

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-8340843: [PPC64/s390x] Error: ShouldNotReachHere() in TemplateInterpreterGenerator::generate_math_entry after 8338694 (Bug - P1)

Reviewers

• Matthias Baesken (@MBaesken - Reviewer)
• Amit Kumar (@offamitkumar - Committer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 21168

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 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]

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

8340843: [PPC64/s390x] Error: ShouldNotReachHere() in TemplateInterpreterGenerator::generate_math_entry after 8338694

Reviewed-by: mbaesken, amitkumar

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

• 9806d21: 8340808: RISC-V: Client build fails after JDK-8339738
• 97a3933: 8339771: RISC-V: Reduce icache flushes
• b1f8d2e: 8339935: Open source several AWT focus tests - series 5
• 2e0554a: 8340710: Optimize DirectClassBuilder::build
• 2d38af6: 8340587: Optimize StackMapGenerator$Frame::checkAssignableTo
• 9bcc7b6: 8340708: Optimize StackMapGenerator::processMethod
• a37bb2e: 8340643: RISC-V: Small refactoring for sub/subw macro-assembler routines
• c0fcb25: 8340717: Remove unused function declarations from java.c/java.h of the launcher
• 0b8c9f6: 8338525: Leading and trailing code blocks by indentation
• b639661: 8340804: doc/building.md update Xcode instructions to note that full install is required

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]

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

• hotspot

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

• 01: Full - Incremental (bb63f682)
• 00: Full (676e2700)

[offamitkumar]

@TheRealMDoerr can you include change for s390x as well, please:

diff --git a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
index c16e4449045..0f35393a460 100644
--- a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
@@ -1224,6 +1224,7 @@ address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::M
     case Interpreter::java_lang_math_sin  : runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dsin);   break;
     case Interpreter::java_lang_math_cos  : runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dcos);   break;
     case Interpreter::java_lang_math_tan  : runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dtan);   break;
+    case Interpreter::java_lang_math_tanh : /* run interpreted */ break;
     case Interpreter::java_lang_math_abs  : /* run interpreted */ break;
     case Interpreter::java_lang_math_sqrt : /* runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dsqrt); not available */ break;
     case Interpreter::java_lang_math_log  : runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dlog);   break;

[TheRealMDoerr]

@offamitkumar: Please review!

[offamitkumar]

Thank you for adding the s390x changes :-)

[TheRealMDoerr]

Thanks for the reviews! Pre-submit cross build for s390x is successful.
/integrate

[openjdk]

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

• 9806d21: 8340808: RISC-V: Client build fails after JDK-8339738
• 97a3933: 8339771: RISC-V: Reduce icache flushes
• b1f8d2e: 8339935: Open source several AWT focus tests - series 5
• 2e0554a: 8340710: Optimize DirectClassBuilder::build
• 2d38af6: 8340587: Optimize StackMapGenerator$Frame::checkAssignableTo
• 9bcc7b6: 8340708: Optimize StackMapGenerator::processMethod
• a37bb2e: 8340643: RISC-V: Small refactoring for sub/subw macro-assembler routines
• c0fcb25: 8340717: Remove unused function declarations from java.c/java.h of the launcher
• 0b8c9f6: 8338525: Leading and trailing code blocks by indentation
• b639661: 8340804: doc/building.md update Xcode instructions to note that full install is required

Your commit was automatically rebased without conflicts.

[openjdk]

@TheRealMDoerr Pushed as commit 1b9898a.

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