* Make sure we don't use the Truffle logger before we have the TruffleContext instance

* Avoid class init in InvokeEspressoNode specialization which can lead to deadlocks in the debugger

Author: javeleon

espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/CallFrame.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
+import com.oracle.truffle.espresso.jdwp.impl.DebuggerController;
 import com.oracle.truffle.espresso.jdwp.impl.JDWP;
 
 public final class CallFrame {
@@ -53,10 +54,11 @@ public final class CallFrame {
     private final DebugStackFrame debugStackFrame;
     private final DebugScope debugScope;
     private final JDWPContext context;
+    private final DebuggerController controller;
     private Object scope;
 
     public CallFrame(long threadId, byte typeTag, long classId, MethodRef method, long methodId, long codeIndex, Frame frame, Node currentNode, RootNode rootNode,
-                    DebugStackFrame debugStackFrame, JDWPContext context) {
+                     DebugStackFrame debugStackFrame, JDWPContext context, DebuggerController controller) {
         this.threadId = threadId;
         this.typeTag = typeTag;
         this.classId = classId;
@@ -69,10 +71,11 @@ public CallFrame(long threadId, byte typeTag, long classId, MethodRef method, lo
         this.debugStackFrame = debugStackFrame;
         this.debugScope = debugStackFrame != null ? debugStackFrame.getScope() : null;
         this.context = context;
+        this.controller = controller;
     }
 
     public CallFrame(long threadId, byte typeTag, long classId, long methodId, long codeIndex) {
-        this(threadId, typeTag, classId, null, methodId, codeIndex, null, null, null, null, null);
+        this(threadId, typeTag, classId, null, methodId, codeIndex, null, null, null, null, null, null);
     }
 
     public byte getTypeTag() {
@@ -115,7 +118,9 @@ public Object getThisValue() {
         try {
             return theScope != null ? INTEROP.readMember(theScope, "this") : null;
         } catch (UnsupportedMessageException | UnknownIdentifierException e) {
-            JDWP.LOGGER.warning(() -> "Unable to read 'this' value from method: " + getMethod() + " with currentNode: " + currentNode.getClass());
+            if (controller != null) {
+                controller.warning(() -> "Unable to read 'this' value from method: " + getMethod() + " with currentNode: " + currentNode.getClass());
+            }
             return INVALID_VALUE;
         }
     }
@@ -133,7 +138,9 @@ public void setVariable(Object value, String identifier) {
         try {
             INTEROP.writeMember(theScope, identifier, value);
         } catch (Exception e) {
-            JDWP.LOGGER.warning(() -> "Unable to write member " + identifier + " from variables");
+            if (controller != null) {
+                controller.warning(() -> "Unable to write member " + identifier + " from variables");
+            }
         }
     }
 
@@ -151,10 +158,14 @@ private Object getScope() {
             try {
                 scope = NodeLibrary.getUncached().getScope(node, frame, true);
             } catch (UnsupportedMessageException e) {
-                JDWP.LOGGER.warning(() -> "Unable to get scope for " + currentNode.getClass());
+                if (controller != null) {
+                    controller.warning(() -> "Unable to get scope for " + currentNode.getClass());
+                }
             }
         } else {
-            JDWP.LOGGER.warning(() -> "Unable to get scope for " + currentNode.getClass());
+            if (controller != null) {
+                controller.warning(() -> "Unable to get scope for " + currentNode.getClass());
+            }
         }
         return scope;
     }

espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/Ids.java

@@ -22,11 +22,12 @@
  */
 package com.oracle.truffle.espresso.jdwp.api;
 
-import com.oracle.truffle.espresso.jdwp.impl.JDWP;
+import com.oracle.truffle.espresso.jdwp.impl.DebuggerController;
 
 import java.lang.ref.WeakReference;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.function.Supplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -54,6 +55,8 @@ public final class Ids<T> {
 
     private HashMap<String, Long> innerClassIDMap = new HashMap<>(16);
 
+    private DebuggerController controller;
+
     @SuppressWarnings({"unchecked", "rawtypes"})
     public Ids(T nullObject) {
         this.nullObject = nullObject;
@@ -68,15 +71,15 @@ public Ids(T nullObject) {
      */
     public long getIdAsLong(T object) {
         if (object == null) {
-            JDWP.LOGGER.finest(() -> "Null object when getting ID");
+            log(() -> "Null object when getting ID");
             return 0;
         }
         // lookup in cache
         for (int i = 1; i < objects.length; i++) {
             // really slow lookup path
             if (objects[i].get() == object) {
                 final int index = i;
-                JDWP.LOGGER.finest(() -> "ID cache hit for object: " + object + " with ID: " + index);
+                log(() -> "ID cache hit for object: " + object + " with ID: " + index);
                 return i;
             }
         }
@@ -107,7 +110,7 @@ public long getId(Object object) {
             // really slow lookup path
             if (objects[i].get() == object) {
                 final int index = i;
-                JDWP.LOGGER.finest(() -> "ID cache hit for object: " + object + " with ID: " + index);
+                log(() -> "ID cache hit for object: " + object + " with ID: " + index);
                 return i;
             }
         }
@@ -122,16 +125,16 @@ public long getId(Object object) {
      */
     public T fromId(int id) {
         if (id == 0) {
-            JDWP.LOGGER.fine(() -> "Null object from ID: " + id);
+            log(() -> "Null object from ID: " + id);
             return nullObject;
         }
         WeakReference<T> ref = objects[id];
         T o = ref.get();
         if (o == null) {
-            JDWP.LOGGER.finest(() -> "object with ID: " + id + " was garbage collected");
+            log(() -> "object with ID: " + id + " was garbage collected");
             return null;
         } else {
-            JDWP.LOGGER.finest(() -> "returning object: " + o + " for ID: " + id);
+            log(() -> "returning object: " + o + " for ID: " + id);
             return o;
         }
     }
@@ -147,7 +150,7 @@ private synchronized long generateUniqueId(T object) {
         WeakReference<T>[] expandedArray = Arrays.copyOf(objects, objects.length + 1);
         expandedArray[objects.length] = new WeakReference<>(object);
         objects = expandedArray;
-        JDWP.LOGGER.finest(() -> "Generating new ID: " + id + " for object: " + object);
+        log(() -> "Generating new ID: " + id + " for object: " + object);
         if (object instanceof KlassRef) {
             KlassRef klass = (KlassRef) object;
             Matcher matcher = ANON_INNER_CLASS_PATTERN.matcher(klass.getNameAsString());
@@ -161,7 +164,7 @@ private synchronized long generateUniqueId(T object) {
     public void replaceObject(T original, T replacement) {
         int id = (int) getIdAsLong(original);
         objects[id] = new WeakReference<>(replacement);
-        JDWP.LOGGER.finest(() -> "Replaced ID: " + id);
+        log(() -> "Replaced ID: " + id);
     }
 
     @SuppressWarnings({"unchecked", "rawtypes"})
@@ -186,4 +189,14 @@ private void removeId(KlassRef klass) {
     public boolean checkRemoved(long refTypeId) {
         return innerClassIDMap.containsValue(refTypeId);
     }
+
+    public void injectController(DebuggerController control) {
+        this.controller = control;
+    }
+
+    private void log(Supplier<String> supplier) {
+        if (controller != null) {
+            controller.finest(supplier);
+        }
+    }
 }

espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/VMEventListenerImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -279,7 +279,7 @@ public Void call() {
                         if (holdEvents) {
                             heldEvents.add(stream);
                         } else {
-                            JDWP.LOGGER.fine(() -> "SENDING CLASS PREPARE EVENT FOR KLASS: " + klass.getNameAsString() + " WITH THREAD " + context.getThreadName(prepareThread));
+                            debuggerController.fine(() -> "SENDING CLASS PREPARE EVENT FOR KLASS: " + klass.getNameAsString() + " WITH THREAD " + context.getThreadName(prepareThread));
                             connection.queuePacket(stream);
                         }
                         return null;
@@ -320,7 +320,7 @@ public void breakpointHit(BreakpointInfo info, CallFrame frame, Object currentTh
         stream.writeLong(frame.getClassId());
         stream.writeLong(frame.getMethodId());
         stream.writeLong(frame.getCodeIndex());
-        JDWP.LOGGER.fine(() -> "Sending breakpoint hit event in thread: " + context.getThreadName(currentThread) + " with suspension policy: " + info.getSuspendPolicy());
+        debuggerController.fine(() -> "Sending breakpoint hit event in thread: " + context.getThreadName(currentThread) + " with suspension policy: " + info.getSuspendPolicy());
         if (holdEvents) {
             heldEvents.add(stream);
         } else {
@@ -492,7 +492,7 @@ public void stepCompleted(SteppingInfo info, CallFrame currentFrame) {
         if (info.isPopFrames()) {
             // send reply packet when "step" is completed
             PacketStream reply = new PacketStream().replyPacket().id(info.getRequestId());
-            JDWP.LOGGER.fine(() -> "Sending pop frames reply packet");
+            debuggerController.fine(() -> "Sending pop frames reply packet");
             if (holdEvents) {
                 heldEvents.add(reply);
             } else {
@@ -515,7 +515,7 @@ public void stepCompleted(SteppingInfo info, CallFrame currentFrame) {
             stream.writeLong(currentFrame.getMethodId());
             long codeIndex = info.getStepOutBCI() != -1 ? info.getStepOutBCI() : currentFrame.getCodeIndex();
             stream.writeLong(codeIndex);
-            JDWP.LOGGER.fine(() -> "Sending step completed event");
+            debuggerController.fine(() -> "Sending step completed event");
 
             if (holdEvents) {
                 heldEvents.add(stream);
@@ -548,7 +548,7 @@ private void sendMonitorContendedEnterEvent(MonitorEvent monitorEvent, CallFrame
         stream.writeLong(currentFrame.getMethodId());
         long codeIndex = currentFrame.getCodeIndex();
         stream.writeLong(codeIndex);
-        JDWP.LOGGER.fine(() -> "Sending monitor contended event");
+        debuggerController.fine(() -> "Sending monitor contended event");
 
         if (holdEvents) {
             heldEvents.add(stream);
@@ -590,7 +590,7 @@ private void sendMonitorContendedEnteredEvent(MonitorEvent monitorEvent, CallFra
         stream.writeLong(currentFrame.getMethodId());
         long codeIndex = currentFrame.getCodeIndex();
         stream.writeLong(codeIndex);
-        JDWP.LOGGER.fine(() -> "Sending monitor contended entered event");
+        debuggerController.fine(() -> "Sending monitor contended entered event");
 
         if (holdEvents) {
             heldEvents.add(stream);
@@ -634,7 +634,7 @@ public void sendMonitorWaitEvent(Object monitor, long timeout, RequestFilter fil
 
         // timeout
         stream.writeLong(timeout);
-        JDWP.LOGGER.fine(() -> "Sending monitor wait event");
+        debuggerController.fine(() -> "Sending monitor wait event");
 
         if (holdEvents) {
             heldEvents.add(stream);
@@ -711,7 +711,7 @@ private void sendMonitorWaitedEvent(Object monitor, boolean timedOut, RequestFil
 
         // timeout
         stream.writeBoolean(timedOut);
-        JDWP.LOGGER.fine(() -> "Sending monitor wait event");
+        debuggerController.fine(() -> "Sending monitor wait event");
 
         if (holdEvents) {
             heldEvents.add(stream);
@@ -852,7 +852,7 @@ public void threadStarted(Object thread) {
         stream.writeByte(RequestedJDWPEvents.THREAD_START);
         stream.writeInt(threadStartedRequestId);
         stream.writeLong(ids.getIdAsLong(thread));
-        JDWP.LOGGER.fine(() -> "sending thread started event for thread: " + context.getThreadName(thread));
+        debuggerController.fine(() -> "sending thread started event for thread: " + context.getThreadName(thread));
         if (holdEvents) {
             heldEvents.add(stream);
         } else {
@@ -909,26 +909,26 @@ public boolean vmDied() {
         stream.writeByte(RequestedJDWPEvents.VM_DEATH);
         stream.writeInt(0);
         // don't queue this packet, send immediately
-        connection.sendVMDied(stream);
+        connection.sendVMDied(stream, debuggerController);
         return vmDeathSuspendPolicy != SuspendStrategy.NONE;
     }
 
     @Override
     public void addClassUnloadRequestId(int id) {
         // not implemented yet
-        JDWP.LOGGER.fine(() -> "class unload events not yet implemented!");
+        debuggerController.fine(() -> "class unload events not yet implemented!");
     }
 
     @Override
     public void addThreadStartedRequestId(int id, byte suspendPolicy) {
-        JDWP.LOGGER.fine(() -> "Adding thread start listener");
+        debuggerController.fine(() -> "Adding thread start listener");
         this.threadStartedRequestId = id;
         this.threadStartSuspendPolicy = suspendPolicy;
     }
 
     @Override
     public void addThreadDiedRequestId(int id, byte suspendPolicy) {
-        JDWP.LOGGER.fine(() -> "Adding thread death listener");
+        debuggerController.fine(() -> "Adding thread death listener");
         this.threadDeathRequestId = id;
         this.threadDeathSuspendPolicy = suspendPolicy;
     }