Simplify PyTruffle_Trace_Type

Author: msimacek

graalpython/com.oracle.graal.python.cext/src/typeobject.c

@@ -6590,7 +6590,7 @@ PyType_Ready(PyTypeObject *type)
 
     // GraalPy change
     if (PyTruffle_Trace_Memory()) {
-        GraalPyTruffle_Trace_Type(type, type->tp_name != NULL);
+        GraalPyTruffle_Trace_Type(type);
     }
 
     /* GraalPy change: IMPORTANT: This is a Truffle-specific statement. Since the refcnt for the type is currently 0 and

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextTypeBuiltins.java

@@ -51,11 +51,11 @@
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyTypeObject;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Py_ssize_t;
 import static com.oracle.graal.python.builtins.objects.cext.common.CExtContext.METH_CLASS;
+import static com.oracle.graal.python.builtins.objects.cext.structs.CFields.PyTypeObject__tp_name;
 import static com.oracle.graal.python.nodes.HiddenAttr.METHOD_DEF_PTR;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.T___DOC__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.T___NAME__;
 import static com.oracle.graal.python.util.PythonUtils.EMPTY_OBJECT_ARRAY;
-import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApi7BuiltinNode;
@@ -119,7 +119,6 @@
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -247,27 +246,16 @@ static Object doIt(PythonAbstractNativeObject clazz,
         }
     }
 
-    @CApiBuiltin(ret = Int, args = {Pointer, Pointer}, call = Ignored)
-    abstract static class PyTruffle_Trace_Type extends CApiBinaryBuiltinNode {
+    @CApiBuiltin(ret = Int, args = {Pointer}, call = Ignored)
+    abstract static class PyTruffle_Trace_Type extends CApiUnaryBuiltinNode {
         private static final TruffleLogger LOGGER = CApiContext.getLogger(PyTruffle_Trace_Type.class);
 
-        @Specialization(limit = "3")
-        int trace(Object ptr, Object classNameObj,
-                        @CachedLibrary("ptr") InteropLibrary ptrLib,
-                        @CachedLibrary("classNameObj") InteropLibrary nameLib,
-                        @Cached TruffleString.SwitchEncodingNode switchEncodingNode) {
-            final TruffleString className;
-            if (nameLib.isString(classNameObj)) {
-                try {
-                    className = switchEncodingNode.execute(nameLib.asTruffleString(classNameObj), TS_ENCODING);
-                } catch (UnsupportedMessageException e) {
-                    throw CompilerDirectives.shouldNotReachHere(e);
-                }
-            } else {
-                className = null;
-            }
-            Object primitivePtr = CApiContext.asPointer(ptr, ptrLib);
-            LOGGER.fine(() -> PythonUtils.formatJString("Initializing native type %s (ptr = %s)", className, CApiContext.asHex(primitivePtr)));
+        @Specialization
+        @TruffleBoundary
+        int trace(Object ptr) {
+            LOGGER.fine(() -> PythonUtils.formatJString("Initializing native type %s (ptr = %s)",
+                            CStructAccess.ReadCharPtrNode.getUncached().read(ptr, PyTypeObject__tp_name),
+                            CApiContext.asHex(CApiContext.asPointer(ptr, InteropLibrary.getUncached()))));
             return 0;
         }
     }

mx.graalpython/mx_graalpython.py

@@ -1047,7 +1047,7 @@ def graalpytest(args):
     python_args = []
     runner_args = []
     for arg in unknown_args:
-        if arg.startswith(('--python.', '--engine.', '--llvm.', '--vm.', '--inspect', '--experimental-options')):
+        if arg.startswith(('--python.', '--engine.', '--llvm.', '--vm.', '--inspect', '--log.', '--experimental-options')):
             python_args.append(arg)
         else:
             runner_args.append(arg)