make debugger work better with native object wrappers

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -340,11 +340,11 @@ protected Iterable<Scope> findLocalScopes(PythonContext context, Node node, Fram
             scopes.add(s);
         }
         if (frame != null) {
-            PythonObject globals = PArguments.getGlobals(frame);
+            PythonObject globals = PArguments.getGlobalsSafe(frame);
             if (globals != null) {
                 scopes.add(Scope.newBuilder("globals()", globals).build());
             }
-            Frame generatorFrame = PArguments.getGeneratorFrame(frame);
+            Frame generatorFrame = PArguments.getGeneratorFrameSafe(frame);
             if (generatorFrame != null) {
                 for (Scope s : super.findLocalScopes(context, node, generatorFrame)) {
                     scopes.add(s);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java

@@ -91,8 +91,10 @@ public enum PythonBuiltinClassType {
     PTuple(com.oracle.graal.python.builtins.objects.tuple.PTuple.class, "tuple"),
     PythonBuiltinClass(com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass.class, "type"),
     PythonClass(com.oracle.graal.python.builtins.objects.type.PythonClass.class, "type"),
+    PythonNativeClass(com.oracle.graal.python.builtins.objects.cext.PythonNativeClass.class, "type"),
     PythonModule(com.oracle.graal.python.builtins.objects.module.PythonModule.class, "module"),
     PythonObject(com.oracle.graal.python.builtins.objects.object.PythonObject.class, "object"),
+    PythonNativeObject(com.oracle.graal.python.builtins.objects.cext.PythonNativeObject.class, "object"),
     PythonParseResult(com.oracle.graal.python.runtime.PythonParseResult.class, "code"),
     PZip(com.oracle.graal.python.builtins.objects.iterator.PZip.class, "zip"),
     PBuffer(com.oracle.graal.python.builtins.objects.memoryview.PBuffer.class, "buffer");

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonObjectNativeWrapperMR.java

@@ -41,6 +41,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETATTRIBUTE__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__SETATTR__;
 
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.graal.python.builtins.objects.bytes.PByteArray;
@@ -90,12 +91,16 @@
 
 @MessageResolution(receiverType = PythonObjectNativeWrapper.class)
 public class PythonObjectNativeWrapperMR {
+    protected static String GP_OBJECT = "gp_object";
 
     @Resolve(message = "READ")
     abstract static class ReadNode extends Node {
         @Child private ReadNativeMemberNode readNativeMemberNode;
 
         public Object access(Object object, Object key) {
+            if (key.equals(GP_OBJECT)) {
+                return ((PythonObjectNativeWrapper) object).getPythonObject();
+            }
             if (readNativeMemberNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 readNativeMemberNode = insert(ReadNativeMemberNode.create());
@@ -438,7 +443,9 @@ abstract static class KeyInfoNode extends Node {
         public int access(Object object, Object fieldName) {
             assert object instanceof PythonObjectNativeWrapper;
             int info = KeyInfo.NONE;
-            if (fieldName instanceof String && NativeMemberNames.isValid((String) fieldName)) {
+            if (fieldName.equals(GP_OBJECT)) {
+                info |= KeyInfo.READABLE;
+            } else if (fieldName instanceof String && NativeMemberNames.isValid((String) fieldName)) {
                 info |= KeyInfo.READABLE;
 
                 // TODO be more specific
@@ -457,8 +464,14 @@ public Object access(Object obj) {
 
     @Resolve(message = "KEYS")
     abstract static class PForeignKeysNode extends Node {
-        public Object access(@SuppressWarnings("unused") Object object) {
-            return null;
+        @Child Node objKeys = Message.KEYS.createNode();
+
+        public Object access(Object object) {
+            if (object instanceof PythonObjectNativeWrapper) {
+                return PythonLanguage.getContext().getEnv().asGuestValue(new String[]{GP_OBJECT});
+            } else {
+                throw UnsupportedMessageException.raise(Message.KEYS);
+            }
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PArguments.java

@@ -139,6 +139,14 @@ public static PythonObject getGlobals(Frame frame) {
         return (PythonObject) frame.getArguments()[INDEX_GLOBALS_ARGUMENT];
     }
 
+    public static PythonObject getGlobalsSafe(Frame frame) {
+        if (frame.getArguments()[INDEX_GLOBALS_ARGUMENT] instanceof PythonObject) {
+            return getGlobals(frame);
+        } else {
+            return null;
+        }
+    }
+
     public static void setPFrame(Frame frame, PFrame pFrame) {
         ((PFrame[]) frame.getArguments()[INDEX_PFRAME_ARGUMENT])[0] = pFrame;
     }
@@ -184,6 +192,14 @@ public static Frame getGeneratorFrame(Frame frame) {
         return (Frame) frame.getArguments()[INDEX_GENERATOR_FRAME];
     }
 
+    public static Frame getGeneratorFrameSafe(Frame frame) {
+        if (frame.getArguments()[INDEX_GENERATOR_FRAME] instanceof Frame) {
+            return getGeneratorFrame(frame);
+        } else {
+            return null;
+        }
+    }
+
     public static void setGeneratorFrame(Object[] arguments, Frame generatorFrame) {
         arguments[INDEX_GENERATOR_FRAME] = generatorFrame;
     }