[GR-44212] [GR-44279] Assorted fixes for Espresso.

PullRequest: graal/13827

Author: gilles-duboscq

espresso/mx.espresso/suite.py

@@ -186,6 +186,9 @@
                 "truffle:TRUFFLE_API",
                 "truffle:TRUFFLE_NFI",
             ],
+            "requires": [
+                "java.logging",
+            ],
             "annotationProcessors": ["truffle:TRUFFLE_DSL_PROCESSOR"],
             "javaCompliance" : "17+",
             "checkstyle": "com.oracle.truffle.espresso.jdwp",

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

@@ -114,8 +114,15 @@ public RootNode getRootNode() {
 
     public Object getThisValue() {
         Object theScope = getScope();
+        if (theScope == null) {
+            return null;
+        }
         try {
-            return theScope != null ? INTEROP.readMember(theScope, "this") : null;
+            // See com.oracle.truffle.espresso.EspressoScope.createVariables
+            if (INTEROP.isMemberReadable(theScope, "this")) {
+                return INTEROP.readMember(theScope, "this");
+            }
+            return INTEROP.readMember(theScope, "0");
         } catch (UnsupportedMessageException | UnknownIdentifierException e) {
             if (controller != null) {
                 controller.warning(() -> "Unable to read 'this' value from method: " + getMethod() + " with currentNode: " + currentNode.getClass());

espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerConnection.java

@@ -604,10 +604,7 @@ private void processPacket(Packet packet) {
                 }
                 handleReply(packet, result);
             } catch (Throwable t) {
-                // Checkstyle: stop allow error output
-                System.out.println("[internal error]: " + t.getMessage());
-                t.printStackTrace();
-                // Checkstyle: resume allow error output
+                controller.severe("Internal error while processing packet", t);
                 PacketStream reply = new PacketStream().replyPacket().id(packet.id);
                 reply.errorCode(ErrorCodes.INTERNAL);
                 handleReply(packet, new CommandResult(reply));

espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerController.java

@@ -31,6 +31,7 @@
 import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.function.Supplier;
+import java.util.logging.Level;
 import java.util.regex.Pattern;
 
 import com.oracle.truffle.api.CallTarget;
@@ -1084,6 +1085,10 @@ public void severe(Supplier<String> supplier) {
         jdwpLogger.severe(supplier);
     }
 
+    public void severe(String message, Throwable error) {
+        jdwpLogger.log(Level.SEVERE, message, error);
+    }
+
     @Override
     public void onContextCreated(@SuppressWarnings("unused") TruffleContext con) {
 

espresso/src/com.oracle.truffle.espresso.mokapot/include/mokapot.h

@@ -69,7 +69,7 @@ typedef uint64_t julong;
 /* Usage of the JavaVM reserved fields:
  * vm type   | MOKA_RISTRETTO | MOKA_LATTE          | MOKA_AMERICANO |
  * ----------+----------------+---------------------+----------------+
- * reserved0 | NULL           | LibJavaVMIsolate* | context handle |
+ * reserved0 | NULL           | LibJavaVMIsolate*   | context handle |
  * reserved1 | MOKA_RISTRETTO | MOKA_LATTE          | MOKA_AMERICANO |
  * reserved2 | NULL           | JavaVM* (americano) | JavaVM* (latte)|
  */

espresso/src/com.oracle.truffle.espresso.mokapot/src/mokapot.c

@@ -1927,7 +1927,7 @@ jint DetachCurrentThread(JavaVM *vm) {
 
 jint GetEnv(JavaVM *vm, void **penv, jint version) {
     if ((*vm)->reserved1 != MOKA_LATTE) {
-        fprintf(stderr, "AttachCurrentThread: not a MOKA_LATTE" OS_NEWLINE_STR);
+        fprintf(stderr, "GetEnv: not a MOKA_LATTE" OS_NEWLINE_STR);
         return JNI_ERR;
     }
     JavaVM *espressoJavaVM = (*vm)->reserved2;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Klass.java

@@ -1445,12 +1445,16 @@ public final int getModifiers(EspressoContext context) {
         if (this instanceof ObjectKlass && context.advancedRedefinitionEnabled()) {
             // getKlassVersion().getModifiers() introduces a ~10%
             // perf hit on some benchmarks, so put behind a check
-            return this.getClassModifiers();
+            return getRedefinitionAwareModifiers();
         } else {
             return modifiers;
         }
     }
 
+    public int getRedefinitionAwareModifiers() {
+        return getModifiers();
+    }
+
     /**
      * Returns the modifiers for the guest Class, it takes into account inner classes which are
      * public at the JVM level, but protected/private at the Java level.

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ObjectKlass.java

@@ -1285,6 +1285,11 @@ public int getClassModifiers() {
         return getKlassVersion().getClassModifiers();
     }
 
+    @Override
+    public int getRedefinitionAwareModifiers() {
+        return getKlassVersion().getModifiers();
+    }
+
     @Override
     public Klass[] getSuperTypes() {
         return getKlassVersion().getSuperTypes();
@@ -1888,6 +1893,7 @@ public int getClassModifiers() {
             if (flags == -1) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 computedModifiers = flags = computeModifiers();
+                assert flags != -1;
             }
             // Remember to strip ACC_SUPER bit
             return flags & ~ACC_SUPER & JVM_ACC_WRITTEN_FLAGS;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/AbstractInstrumentableBytecodeNode.java

@@ -95,7 +95,7 @@ private Object getScopeSlowPath(MaterializedFrame frame) {
             localCount += method.getParameterCount();
 
             Klass[] parameters = (Klass[]) method.getParameters();
-            Utf8ConstantTable utf8Constants = getContext().getLanguage().getUtf8ConstantTable();
+            Utf8ConstantTable utf8Constants = method.getLanguage().getUtf8ConstantTable();
             int startslot = 0;
 
             if (hasReceiver) {