add address

Author: roberttoyonaga

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorEnterEvent.java

@@ -16,23 +16,23 @@
 public class JavaMonitorEnterEvent {
 
     @Uninterruptible(reason = "Accesses a JFR buffer.")
-    public static void emit(Object obj, org.graalvm.nativeimage.IsolateThread previousOwner, long addr, long startTicks) {
-        emit(obj, com.oracle.svm.core.jfr.SubstrateJVM.get().getThreadId(previousOwner), addr, startTicks);
+    public static void emit(Object obj, org.graalvm.nativeimage.IsolateThread previousOwner,long startTicks) {
+        emit(obj, com.oracle.svm.core.jfr.SubstrateJVM.get().getThreadId(previousOwner), startTicks);
     }
     @Uninterruptible(reason = "Accesses a JFR buffer.")
-    public static void emit(Object obj, long previousOwner, long addr, long startTicks) {
+    public static void emit(Object obj, long previousOwner, long startTicks) {
         if (SubstrateJVM.isRecording() && SubstrateJVM.get().isEnabled(JfrEvent.JavaMonitorEnter)) {
             JfrNativeEventWriterData data = StackValue.get(JfrNativeEventWriterData.class);
             JfrNativeEventWriterDataAccess.initializeThreadLocalNativeBuffer(data);
 
-            if (emit0(data, obj, previousOwner, addr, startTicks, SubstrateJVM.get().isLarge(JfrEvent.JavaMonitorEnter)) == com.oracle.svm.core.jfr.JfrEventWriteStatus.RetryLarge) {
+            if (emit0(data, obj, previousOwner, startTicks, SubstrateJVM.get().isLarge(JfrEvent.JavaMonitorEnter)) == com.oracle.svm.core.jfr.JfrEventWriteStatus.RetryLarge) {
                 SubstrateJVM.get().setLarge(JfrEvent.JavaMonitorEnter, true);
-                emit0(data, obj, previousOwner, addr, startTicks, true);
+                emit0(data, obj, previousOwner, startTicks, true);
             }
         }
     }
         @Uninterruptible(reason = "Accesses a JFR buffer.")
-        private static com.oracle.svm.core.jfr.JfrEventWriteStatus emit0(JfrNativeEventWriterData data, Object obj, long previousOwner, long addr, long startTicks, boolean isLarge){
+        private static com.oracle.svm.core.jfr.JfrEventWriteStatus emit0(JfrNativeEventWriterData data, Object obj, long previousOwner, long startTicks, boolean isLarge){
             JfrNativeEventWriter.beginEvent(data, JfrEvent.JavaMonitorEnter, isLarge);
 
             JfrNativeEventWriter.putLong(data, startTicks);
@@ -41,7 +41,7 @@ private static com.oracle.svm.core.jfr.JfrEventWriteStatus emit0(JfrNativeEventW
             JfrNativeEventWriter.putLong(data, SubstrateJVM.get().getStackTraceId(JfrEvent.ThreadStart.getId(), 0));
             JfrNativeEventWriter.putClass(data, obj.getClass());
             JfrNativeEventWriter.putLong(data, previousOwner);
-            JfrNativeEventWriter.putLong(data, addr);
+            JfrNativeEventWriter.putLong(data, org.graalvm.compiler.word.Word.objectToUntrackedPointer(obj).rawValue());
 
             return  JfrNativeEventWriter.endEvent(data, isLarge);
         }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MultiThreadedMonitorSupport.java

@@ -37,8 +37,10 @@
 import org.graalvm.compiler.core.common.SuppressFBWarnings;
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.compiler.word.BarrieredAccess;
+import org.graalvm.compiler.word.Word;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
+import org.graalvm.nativeimage.CurrentIsolate;
 
 import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.WeakIdentityHashMap;
@@ -265,7 +267,7 @@ public void monitorEnter(Object obj) {
         // prevent recursive manipulation of the monitorOwners lock
         if (monitorOwnersLock.isHeldByCurrentThread()) return;
         Long prevOwner;
-        long currentOwnerId = com.oracle.svm.core.jfr.SubstrateJVM.get().getThreadId(org.graalvm.nativeimage.CurrentIsolate.getCurrentThread());
+        long currentOwnerId = com.oracle.svm.core.jfr.SubstrateJVM.get().getThreadId(CurrentIsolate.getCurrentThread());
 
         monitorOwnersLock.lock();
         try {
@@ -275,8 +277,7 @@ public void monitorEnter(Object obj) {
             monitorOwnersLock.unlock();
         }
         if ( prevOwner==null ) prevOwner = 0L;
-        JavaMonitorEnterEvent.emit(obj,prevOwner,0, startTicks);//not able to get address because its implemented in native code in Hotspot
-
+        JavaMonitorEnterEvent.emit(obj,prevOwner, startTicks);
     }
 
     @SubstrateForeignCallTarget(stubCallingConvention = false)