[11u] RFR (XS) 8265718: Build failure after JDK-8258414 11u backport

[Lindenmaier, Goetz]

Hi,

Thomas is right, the patch looks good but is not.
I compiled on linuxx86_64 dbg/fastdbg/product with

diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp
--- a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp
+++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "jfr/jfrEvents.hpp"
+#include "jfr/jni/jfrJavaSupport.hpp"
 #include "jfr/leakprofiler/chains/edgeStore.hpp"
 #include "jfr/leakprofiler/chains/objectSampleMarker.hpp"
 #include "jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp"
@@ -37,6 +38,7 @@
 #include "jfr/recorder/stacktrace/jfrStackTraceRepository.hpp"
 #include "jfr/utilities/jfrHashtable.hpp"
 #include "jfr/utilities/jfrTypes.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/thread.hpp"
 #include "utilities/growableArray.hpp"

successfully.
The code uses ThreadInVMfromNative.

Please add the interfaceSupport include and consider it reviewed.

Best regards,
 Goetz


> -----Original Message-----
> From: Lindenmaier, Goetz
> Sent: Thursday, April 22, 2021 9:20 AM
> To: 'Aleksey Shipilev' <shade at redhat.com>; jdk-updates-
> dev at openjdk.java.net
> Subject: RE: [11u] RFR (XS) 8265718: Build failure after JDK-8258414 11u
> backport
> 
> Hi Aleksey,
> 
> The patch looks good to me.
> 
> Best regards,
>   Goetz.
> 
> > -----Original Message-----
> > From: jdk-updates-dev <jdk-updates-dev-retn at openjdk.java.net> On
> > Behalf Of Aleksey Shipilev
> > Sent: Thursday, April 22, 2021 8:17 AM
> > To: jdk-updates-dev at openjdk.java.net
> > Subject: [11u] RFR (XS) 8265718: Build failure after JDK-8258414 11u
> backport
> >
> > Current jdk11u fastdebug build fails with:
> >
> > /home/shade/trunks/jdk-updates-jdk11u-
> >
> dev/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint
> > .cpp:
> >
> > In static member function 'static void
> > ObjectSampleCheckpoint::on_rotation(const ObjectSampler*)':
> > /home/shade/trunks/jdk-updates-jdk11u-
> >
> dev/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint
> > .cpp:298:14:
> >
> > error: 'JfrJavaSupport' has not been declared
> >     298 |
> > DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_native(thread);)
> >         | ^~~~~~~~~~~~~~
> > /home/shade/trunks/jdk-updates-jdk11u-
> > dev/src/hotspot/share/utilities/macros.hpp:393:26: note: in
> > definition of macro 'DEBUG_ONLY'
> >     393 | #define DEBUG_ONLY(code) code
> >         | ^~~~
> >
> > Fix:
> >
> > diff -r 31224d74aa23
> >
> src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp
> > ---
> >
> a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cp
> > p  Thu Sep 05 12:39:48
> > 2019 +0200
> > +++
> >
> b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.c
> > pp  Thu Apr 22 08:09:40
> > 2021 +0200
> > @@ -22,10 +22,11 @@
> >     *
> >     */
> >
> >    #include "precompiled.hpp"
> >    #include "jfr/jfrEvents.hpp"
> > +#include "jfr/jni/jfrJavaSupport.hpp"
> >    #include "jfr/leakprofiler/chains/edgeStore.hpp"
> >    #include "jfr/leakprofiler/chains/objectSampleMarker.hpp"
> >
> > Testing: Linux x86_64 fastdebug build
> >
> > --
> > Thanks,
> > -Aleksey