8223050: JVMCI: findUniqueConcreteMethod() should not use Dependencies::find_unique_concrete_method() for non-virtual methods

[jerboaa]

Please review this backport of JDK-8223050 related to JVMCI. The JDK 13 patch doesn't apply cleanly. The change in assert in check_unique_method() has been left out since JDK 11u doesn't have JDK-8223171 which introduced this method. It doesn't seem needed to bring that in too. JVMCI_THROW_MSG_NULL doesn't exist in JDK 11u. I've used THROW_MSG_0 instead. Finally, test TestResolvedJavaMethod.java needed to account for this change as it would fail otherwise. Note that the test is @ignored in HEAD so hasn't been fixed there.

Testing

• tier1 on Linux x86_64 (pass)
• jtreg:test/hotspot/jtreg/compiler/jvmci/ most notably FindUniqueConcreteMethodTest.java and TestResolvedJavaMethod.java. All pass.

Thoughts?

---

Progress

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

Issue

• JDK-8223050: JVMCI: findUniqueConcreteMethod() should not use Dependencies::find_unique_concrete_method() for non-virtual methods

Reviewers

• Andrew Dinn (@adinn - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 48

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

Using diff file

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

[bridgekeeper]

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

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

[mlbridge]

Webrevs

• 00: Full (01dbff5e)

[openjdk]

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

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

8223050: JVMCI: findUniqueConcreteMethod() should not use Dependencies::find_unique_concrete_method() for non-virtual methods

Reviewed-by: adinn

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

• 3c54e03: 8251945: SIGSEGV in PackageEntry::purge_qualified_exports()
• cbe9c1b: 8213137: Remove static initialization of monitor/mutex instances
• e44258c: 8266248: Compilation failure in PLATFORM_API_MacOSX_MidiUtils.c with Xcode 12.5

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.

[mlbridge]

Mailing list message from Andrew Dinn on jdk-updates-dev:

On 21/06/2021 15:19, Severin Gehwolf wrote:

Please review this backport of JDK-8223050 related to JVMCI. The JDK
13 patch doesn't apply cleanly. The change in assert in
check_unique_method() has been left out since JDK 11u doesn't have
[JDK-8223171](https://bugs.openjdk.java.net/browse/JDK-8223171) which
introduced this method. It doesn't seem needed to bring that in too.
JVMCI_THROW_MSG_NULL doesn't exist in JDK 11u. I've used THROW_MSG_0
instead. Finally, test `TestResolvedJavaMethod.java` needed to account
for this change as it would fail otherwise. Note that the test is
`@ignored` in HEAD so hasn't been fixed there.

Yes, that all looks good to me. I have marked the PR as reviewed.

regards,

Andrew Dinn
-----------
Red Hat Distinguished Engineer
Red Hat UK Ltd
Registered in England and Wales under Company Registration No. 03798903
Directors: Michael Cunningham, Michael ("Mike") O'Neill

[jerboaa]

Thanks for the review!

[jerboaa]

/integrate

[openjdk]

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

• 3f67b07: 8267751: (test) jtreg.SkippedException has no serial VersionUID
• 46fd6d2: 8263382: java/util/logging/ParentLoggersTest.java failed with "checkLoggers: getLoggerNames() returned unexpected loggers"
• 881100f: 8233989: Create an IPv4 version of java/net/MulticastSocket/SetLoopbackMode.java
• 3c54e03: 8251945: SIGSEGV in PackageEntry::purge_qualified_exports()
• cbe9c1b: 8213137: Remove static initialization of monitor/mutex instances
• e44258c: 8266248: Compilation failure in PLATFORM_API_MacOSX_MidiUtils.c with Xcode 12.5

Your commit was automatically rebased without conflicts.

[openjdk]

@jerboaa Pushed as commit 8d5b37a.

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