[11u] RFR(S): 8241234: Unify monitor enter/exit runtime entries.

[Doerr, Martin]

Hi Götz,

thanks for looking at the backport.

> I don't really understand which part you took from jdk15.
I took the jvmciRuntime.cpp parts from the original change: https://hg.openjdk.java.net/jdk/jdk/rev/87c506c8be63

Right, the assertion "assert(thread->last_Java_sp(), "last_Java_sp must be set");" should not get touched by this change.
I've added it back.

Are you ok with it?

Best regards,
Martin


> -----Original Message-----
> From: Lindenmaier, Goetz <goetz.lindenmaier at sap.com>
> Sent: Donnerstag, 27. August 2020 11:21
> To: Doerr, Martin <martin.doerr at sap.com>; hotspot-runtime-
> dev at openjdk.java.net
> Cc: jdk-updates-dev at openjdk.java.net
> Subject: RE: [11u] RFR(S): 8241234: Unify monitor enter/exit runtime entries.
> 
> Hi Martin,
> 
> I had a look at your downport.
> 
> I don't really understand which part you took from jdk15.
> 
> I think you lost line
> -  assert(thread->last_Java_sp(), "last_Java_sp must be set");
> In jvmciRuntme.cpp, monitorexit().
> 
> Besides that it looks good.
> 
> I'll also post this to jdk-updates-dev.
> 
> Best regards,
>   Goetz.
> 
> -----Original Message-----
> From: hotspot-runtime-dev <hotspot-runtime-dev-retn at openjdk.java.net>
> On Behalf Of Doerr, Martin
> Sent: Montag, 17. August 2020 23:57
> To: hotspot-runtime-dev at openjdk.java.net
> Subject: [CAUTION] FW: [11u] RFR(S): 8241234: Unify monitor enter/exit
> runtime entries.
> 
> Forwarding to hotspot-runtime.
> 
> 
> Hi,
> 
> I'd like to backport https://bugs.openjdk.java.net/browse/JDK-8241234 to
> JDK11u.
> 
> Original JDK15 patch
> (https://hg.openjdk.java.net/jdk/jdk/rev/87c506c8be63) doesn't fit to
> JDK11u because the locking code has been reworked by
> https://bugs.openjdk.java.net/browse/JDK-8229844
> As mentioned by Vladimir, there's already a GraalVM version available which
> consists of 2 patches (original + addon) and which can be applied:
> https://github.com/graalvm/labs-openjdk-
> 11/commit/6c162cb15262e6aa77e36eb3a268320ef0a206a4
> https://github.com/graalvm/labs-openjdk-
> 11/commit/6a28a618cdbe595f9a3993e0eb63c01ccae1a528
> Only JVMCI part from GraalVM doesn't apply automatically. The version of
> this file from JDK15 is very simple and fits perfectly.
> 
> Please review the JDK11u backport webrev:
> http://cr.openjdk.java.net/~mdoerr/8241234_monitorenterexit_11u/webre
> v.00/
> 
> Thanks and best regards,
> Martin