[jdk11u-dev] Integrated: 8223050: JVMCI: findUniqueConcreteMethod() should not use Dependencies::find_unique_concrete_method() for non-virtual methods

Wed Jun 23 08:23:32 UTC 2021

On Mon, 21 Jun 2021 14:11:43 GMT, Severin Gehwolf <sgehwolf at openjdk.org> 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.
> 
> **Testing**
> 
> - [x] tier1 on Linux x86_64 (pass)
> - [x] `jtreg:test/hotspot/jtreg/compiler/jvmci/` most notably `FindUniqueConcreteMethodTest.java` and `TestResolvedJavaMethod.java`. All pass.
> 
> Thoughts?

This pull request has now been integrated.

Changeset: 8d5b37a4
Author:    Severin Gehwolf <sgehwolf at openjdk.org>
URL:       https://git.openjdk.java.net/jdk11u-dev/commit/8d5b37a4c7e0501d48c8eefa3904e63919628dc7
Stats:     42 lines in 4 files changed: 30 ins; 0 del; 12 mod

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

Reviewed-by: adinn
Backport-of: c18ffd6a79fc6cd634b410a2dd37d0026ebb2664

-------------

PR: https://git.openjdk.java.net/jdk11u-dev/pull/48