[GR-10068] Add more diagnostics for crashes.

PullRequest: graal/1821

Author: Christian Wimmer

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/MonitorSupport.java

@@ -33,6 +33,7 @@
 
 import org.graalvm.compiler.core.common.SuppressFBWarnings;
 import org.graalvm.compiler.word.BarrieredAccess;
+import org.graalvm.compiler.word.Word;
 import org.graalvm.nativeimage.Feature;
 import org.graalvm.nativeimage.ImageSingletons;
 
@@ -98,8 +99,10 @@ public static void monitorEnter(Object obj) {
             return;
         }
 
+        ReentrantLock lockObject = null;
         try {
-            ImageSingletons.lookup(MonitorSupport.class).getOrCreateMonitor(obj, true).lock();
+            lockObject = ImageSingletons.lookup(MonitorSupport.class).getOrCreateMonitor(obj, true);
+            lockObject.lock();
         } catch (Throwable ex) {
             /*
              * The foreign call from snippets to this method does not have an exception edge. So we
@@ -112,7 +115,7 @@ public static void monitorEnter(Object obj) {
              * Finally, it would not be clear whether the monitor is locked or unlocked in case of
              * an exception.
              */
-            VMError.shouldNotReachHere(ex);
+            throw shouldNotReachHere("monitorEnter", obj, lockObject, ex);
         }
     }
 
@@ -130,8 +133,10 @@ public static void monitorExit(Object obj) {
             return;
         }
 
+        ReentrantLock lockObject = null;
         try {
-            ImageSingletons.lookup(MonitorSupport.class).getOrCreateMonitor(obj, true).unlock();
+            lockObject = ImageSingletons.lookup(MonitorSupport.class).getOrCreateMonitor(obj, true);
+            lockObject.unlock();
         } catch (Throwable ex) {
             /*
              * The foreign call from snippets to this method does not have an exception edge. So we
@@ -141,10 +146,46 @@ public static void monitorExit(Object obj) {
              * the Java Virtual Machine Specification, but it ensures that we never need to throw an
              * IllegalMonitorStateException.
              */
-            VMError.shouldNotReachHere(ex);
+            throw shouldNotReachHere("monitorExit", obj, lockObject, ex);
         }
     }
 
+    private static RuntimeException shouldNotReachHere(String label, Object obj, ReentrantLock lockObject, Throwable ex) {
+        StringBuilder msg = new StringBuilder();
+        msg.append("Unexpected exception in MonitorSupport.").append(label);
+
+        if (obj != null) {
+            msg.append("  object: ");
+            appendObject(msg, obj);
+        }
+        if (lockObject != null) {
+            msg.append("  lock: ");
+            appendObject(msg, lockObject);
+
+            Target_java_util_concurrent_locks_ReentrantLock lockObjectTarget = KnownIntrinsics.unsafeCast(lockObject, Target_java_util_concurrent_locks_ReentrantLock.class);
+            Target_java_util_concurrent_locks_AbstractOwnableSynchronizer sync = KnownIntrinsics.unsafeCast(lockObjectTarget.sync, Target_java_util_concurrent_locks_AbstractOwnableSynchronizer.class);
+
+            if (sync != null) {
+                msg.append("  sync: ");
+                appendObject(msg, sync);
+
+                Thread thread = sync.getExclusiveOwnerThread();
+                if (thread == null) {
+                    msg.append("  no exclusiveOwnerThread");
+                } else {
+                    msg.append("  exclusiveOwnerThread: ");
+                    appendObject(msg, thread);
+                }
+            }
+        }
+        msg.append("  raw exception: ");
+        throw VMError.shouldNotReachHere(msg.toString(), ex);
+    }
+
+    private static void appendObject(StringBuilder msg, Object obj) {
+        msg.append(obj.getClass().getName()).append("@").append(Long.toHexString(Word.objectToUntrackedPointer(obj).rawValue()));
+    }
+
     /**
      * This is a highly unsafe method that patches the existing lock of an object so that the object
      * appears as if it has been locked from a different thread. It is only safe to call when the

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateUtil.java

@@ -67,6 +67,7 @@
 import com.oracle.svm.core.stack.JavaStackWalker;
 import com.oracle.svm.core.stack.StackFrameVisitor;
 import com.oracle.svm.core.stack.ThreadStackPrinter;
+import com.oracle.svm.core.thread.JavaThreads;
 import com.oracle.svm.core.thread.VMOperationControl;
 import com.oracle.svm.core.thread.VMThreads;
 import com.oracle.svm.core.threadlocal.VMThreadLocalInfos;
@@ -379,7 +380,8 @@ private static void dumpVMThreads(Log log) {
         log.string("VMThreads info:").newline();
         log.indent(true);
         for (IsolateThread vmThread = VMThreads.firstThread(); vmThread != VMThreads.nullThread(); vmThread = VMThreads.nextThread(vmThread)) {
-            log.string("VMThread ").zhex(vmThread.rawValue()).spaces(2).string(VMThreads.StatusSupport.getStatusString(vmThread)).newline();
+            log.string("VMThread ").zhex(vmThread.rawValue()).spaces(2).string(VMThreads.StatusSupport.getStatusString(vmThread))
+                            .spaces(2).object(JavaThreads.singleton().fromVMThread(vmThread)).newline();
         }
         log.indent(false);
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/Deoptimizer.java

@@ -1023,7 +1023,7 @@ private static void printDeoptimizedFrame(Log log, Pointer sp, DeoptimizedFrame
                 }
                 log.string("  return address ").hex(targetFrame.returnAddress.returnAddress).newline();
 
-                if (Options.TraceDeoptimizationDetails.getValue()) {
+                if (printOnlyTopFrames || Options.TraceDeoptimizationDetails.getValue()) {
                     printVirtualFrame(log, targetFrame);
                 }
 
@@ -1050,7 +1050,7 @@ private static void printVirtualFrame(Log log, VirtualFrame virtualFrame) {
         log.string("            bci: ").signed(frameInfo.getBci());
         log.string("  deoptMethodOffset: ").signed(frameInfo.getDeoptMethodOffset());
         log.string("  deoptMethod: ").hex(frameInfo.getDeoptMethodAddress());
-        log.string("  return address: ").hex(virtualFrame.returnAddress.returnAddress);
+        log.string("  return address: ").hex(virtualFrame.returnAddress.returnAddress).string("  offset: ").signed(virtualFrame.returnAddress.offset);
 
         for (int i = 0; i < frameInfo.getValueInfos().length; i++) {
             JavaConstant con = virtualFrame.getConstant(i);
@@ -1071,6 +1071,7 @@ private static void printVirtualFrame(Log log, VirtualFrame virtualFrame) {
                 } else {
                     log.string("  value: ").string(con.toValueString());
                 }
+                log.string("  offset: ").signed(virtualFrame.values[i].offset);
             }
         }
         log.newline();